webkitgtk-2.4.11webkitgtk-2.4.11

1 files changed, 11 insertions, 18 deletions

diff --git a/Source/WebCore/html/HTMLTemplateElement.cpp b/Source/WebCore/html/HTMLTemplateElement.cpp
index 2e1edb236..17e4c0807 100644
--- a/Source/WebCore/html/HTMLTemplateElement.cpp
+++ b/Source/WebCore/html/HTMLTemplateElement.cpp
@@ -55,35 +55,28 @@ HTMLTemplateElement::~HTMLTemplateElement()
         m_content->clearHost();
 }
 
-Ref<HTMLTemplateElement> HTMLTemplateElement::create(const QualifiedName& tagName, Document& document)
+PassRefPtr<HTMLTemplateElement> HTMLTemplateElement::create(const QualifiedName& tagName, Document& document)
 {
-    return adoptRef(*new HTMLTemplateElement(tagName, document));
+    return adoptRef(new HTMLTemplateElement(tagName, document));
 }
 
 DocumentFragment* HTMLTemplateElement::content() const
 {
     if (!m_content)
-        m_content = TemplateContentDocumentFragment::create(document().ensureTemplateDocument(), this);
+        m_content = TemplateContentDocumentFragment::create(*document().ensureTemplateDocument(), this);
 
     return m_content.get();
 }
 
-Ref<Node> HTMLTemplateElement::cloneNodeInternal(Document& targetDocument, CloningOperation type)
+PassRefPtr<Node> HTMLTemplateElement::cloneNode(bool deep)
 {
-    RefPtr<Node> clone;
-    switch (type) {
-    case CloningOperation::OnlySelf:
-        return cloneElementWithoutChildren(targetDocument);
-    case CloningOperation::SelfWithTemplateContent:
-        clone = cloneElementWithoutChildren(targetDocument);
-        break;
-    case CloningOperation::Everything:
-        clone = cloneElementWithChildren(targetDocument);
-        break;
-    }
+    if (!deep)
+        return cloneElementWithoutChildren();
+
+    RefPtr<Node> clone = cloneElementWithChildren();
     if (m_content)
-        content()->cloneChildNodes(*downcast<HTMLTemplateElement>(clone.get())->content());
-    return clone.releaseNonNull();
+        content()->cloneChildNodes(toHTMLTemplateElement(clone.get())->content());
+    return clone.release();
 }
 
 void HTMLTemplateElement::didMoveToNewDocument(Document* oldDocument)
@@ -91,7 +84,7 @@ void HTMLTemplateElement::didMoveToNewDocument(Document* oldDocument)
     HTMLElement::didMoveToNewDocument(oldDocument);
     if (!m_content)
         return;
-    document().ensureTemplateDocument().adoptIfNeeded(m_content.get());
+    document().ensureTemplateDocument()->adoptIfNeeded(m_content.get());
 }
 
 } // namespace WebCore