Changeset 62916 in webkit

Timestamp:

Jul 9, 2010 1:26:09 AM (14 years ago)

Author:

eric@webkit.org

Message:

2010-07-09 Eric Seidel <​eric@webkit.org>

Reviewed by Adam Barth.

Add insertForeignElement in preparation for adding "in foreign content" support
​https://bugs.webkit.org/show_bug.cgi?id=41940

No functional changes, thus no tests.

• html/HTMLConstructionSite.cpp: (WebCore::HTMLConstructionSite::insertForeignElement): (WebCore::HTMLConstructionSite::createElement): (WebCore::HTMLConstructionSite::createHTMLElement):
• html/HTMLConstructionSite.h:

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• html/HTMLConstructionSite.cpp (modified) (2 diffs)
• html/HTMLConstructionSite.h (modified) (2 diffs)

trunk/WebCore/ChangeLog

@@ +1 @@
+2010-07-09  Eric Seidel  <eric@webkit.org>
+
+        Reviewed by Adam Barth.
+
+        Add insertForeignElement in preparation for adding "in foreign content" support
+        https://bugs.webkit.org/show_bug.cgi?id=41940
+
+        No functional changes, thus no tests.
+
+        * html/HTMLConstructionSite.cpp:
+        (WebCore::HTMLConstructionSite::insertForeignElement):
+        (WebCore::HTMLConstructionSite::createElement):
+        (WebCore::HTMLConstructionSite::createHTMLElement):
+        * html/HTMLConstructionSite.h:
+
 2010-07-09  Adam Barth  <abarth@webkit.org>
 

trunk/WebCore/html/HTMLConstructionSite.cpp

@@ -220 +220 @@
 }
 
+void HTMLConstructionSite::insertForeignElement(AtomicHTMLToken& token, const AtomicString& namespaceURI)
+{
+    ASSERT(token.type() == HTMLToken::StartTag);
+    notImplemented(); // parseError when xmlns or xmlns:xlink are wrong.
+
+    RefPtr<Element> element = attach(currentElement(), createElement(token, namespaceURI));
+    if (!token.selfClosing())
+        m_openElements.push(element);
+}
+
 void HTMLConstructionSite::insertTextNode(const String& characters)
 {
@@ -234 +244 @@
 }
 
+PassRefPtr<Element> HTMLConstructionSite::createElement(AtomicHTMLToken& token, const AtomicString& namespaceURI)
+{
+    QualifiedName tagName(nullAtom, token.name(), namespaceURI);
+    RefPtr<Element> element = m_document->createElement(tagName, true);
+    element->setAttributeMap(token.takeAtributes(), m_fragmentScriptingPermission);
+    return element.release();
+}
+
 PassRefPtr<Element> HTMLConstructionSite::createHTMLElement(AtomicHTMLToken& token)
 {
-    RefPtr<Element> element = HTMLElementFactory::createHTMLElement(QualifiedName(nullAtom, token.name(), xhtmlNamespaceURI), m_document, 0);
-    element->setAttributeMap(token.takeAtributes(), m_fragmentScriptingPermission);
+    RefPtr<Element> element = createElement(token, xhtmlNamespaceURI);
+    ASSERT(element->isHTMLElement());
     return element.release();
 }

trunk/WebCore/html/HTMLConstructionSite.h

@@ -58 +58 @@
     void insertScriptElement(AtomicHTMLToken&);
     void insertTextNode(const String&);
+    void insertForeignElement(AtomicHTMLToken&, const AtomicString& namespaceURI);
 
     void insertHTMLHtmlStartTagBeforeHTML(AtomicHTMLToken&);
@@ -111 +112 @@
     PassRefPtr<ChildType> attach(Node* parent, PassRefPtr<ChildType> prpChild);
 
+    PassRefPtr<Element> createElement(AtomicHTMLToken&, const AtomicString& namespaceURI);
+
     PassRefPtr<Element> createHTMLElementAndAttachToCurrent(AtomicHTMLToken&);
     void mergeAttributesFromTokenIntoElement(AtomicHTMLToken&, Element*);