Changeset 437 for trunk/WebCore/dom/XMLTokenizer.cpp

Timestamp:

08/15/08 13:25:16 (5 months ago)

Author:

mbensi

Message:

merge with webkit revision 35774

Files:

• trunk/WebCore/dom/XMLTokenizer.cpp (modified) (15 diffs)

trunk/WebCore/dom/XMLTokenizer.cpp

@@ -43 +43 @@
-#include "HTMLTokenizer.h"
-#include "ScriptController.h"
+#include "ScriptElement.h"
-#include "ProcessingInstruction.h"
-#include "ResourceError.h"
@@ -66 +67 @@
-#if ENABLE(SVG)
-#include "SVGNames.h"
+#include "SVGScriptElement.h"
-#include "SVGStyleElement.h"
-#include "XLinkNames.h"
-#endif
-
@@ -75 +76 @@
-
-using namespace EventNames;
-using namespace HTMLNames;
-
-const int maxErrors = 25;
@@ -543 +543 @@
-
-// --------------------------------
+
+inline bool isScriptElement(Element* element)
+{
+    return element->hasTagName(HTMLNames::scriptTag)
+#if ENABLE(SVG)
+        || element->hasTagName(SVGNames::scriptTag)
+#endif
+        ;
+}
+
+inline ScriptElement* castToScriptElement(Element* element)
+{
+    ASSERT(isScriptElement(element));
+
+    if (element->hasTagName(HTMLNames::scriptTag))
+        return static_cast<HTMLScriptElement*>(element);
+
+#if ENABLE(SVG)
+    if (element->hasTagName(SVGNames::scriptTag))
+        return static_cast<SVGScriptElement*>(element);
+#endif
+
+    ASSERT_NOT_REACHED();
+    return 0;
+}
-
-XMLTokenizer::XMLTokenizer(Document* _doc, FrameView* _view)
@@ -751 +776 @@
-    return false;
-}
+
+static void eventuallyMarkAsParserCreated(Element* element)
+{
+    if (element->hasTagName(HTMLNames::scriptTag))
+        static_cast<HTMLScriptElement*>(element)->setCreatedByParser(true);
+#if ENABLE(SVG)
+    else if (element->hasTagName(SVGNames::scriptTag))
+        static_cast<SVGScriptElement*>(element)->setCreatedByParser(true);
+#endif
+    else if (element->hasTagName(HTMLNames::styleTag))
+        static_cast<HTMLStyleElement*>(element)->setCreatedByParser(true);
+#if ENABLE(SVG)
+    else if (element->hasTagName(SVGNames::styleTag))
+        static_cast<SVGStyleElement*>(element)->setCreatedByParser(true);
+#endif
+    else if (element->hasTagName(HTMLNames::linkTag))
+        static_cast<HTMLLinkElement*>(element)->setCreatedByParser(true);
+}
+
-#ifndef USE_QXMLSTREAM
-static inline String toString(const xmlChar* str, unsigned len)
@@ -866 +910 @@
-
-    newElement->beginParsingChildren();
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
-        m_scriptStartLine = lineNumber();
-
+
-    if (!m_currentNode->addChild(newElement.get())) {
-        stopParsing();
-        return;
-    }
-
+
-    setCurrentNode(newElement.get());
-    if (m_view && !newElement->attached())
@@ -912 +942 @@
-    
-    // don't load external scripts for standalone documents (for now)
-
-
-
-
-
-
-
+
-        ASSERT(!m_pendingScript);
-        
-        m_requestingScript = true;
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
-        if (!scriptHref.isEmpty()) {
-            // we have a src attribute 
-const AtomicString& charset = scriptElement->getAttribute(charsetAttr
-c
-scriptE
+String scriptCharset = scriptElement->charsetAttributeValue(
+scriptC
+e
-                m_pendingScript->addClient(this);
-
+
-                // m_pendingScript will be 0 if script was already loaded and ref() executed it
-                if (m_pendingScript)
@@ -947 +964 @@
-
-        } else {
-
-
-
-
-
+
-            m_view->frame()->loader()->executeScript(m_doc->url().string(), m_scriptStartLine, scriptCode);
-        }
-
+
-        m_requestingScript = false;
-    }
@@ -1432 +1445 @@
-{
-    ExceptionCode ec = 0;
-
-
-
-
+HTMLNames::
+HTMLNames::
+
+HTMLNames::
-    reportElement->appendChild(h3.get(), ec);
-    h3->appendChild(doc->createTextNode("This page contains the following errors:"), ec);
-    
-
+HTMLNames::
-    reportElement->appendChild(fixed.get(), ec);
-
+HTMLNames::
-    fixed->appendChild(doc->createTextNode(errorMessages), ec);
-    
-
+HTMLNames::
-    reportElement->appendChild(h3.get(), ec);
-    h3->appendChild(doc->createTextNode("Below is a rendering of the page up to the first error."), ec);
@@ -1466 +1479 @@
-    Node* documentElement = doc->documentElement();
-    if (!documentElement) {
-
+HTMLNames::
-        doc->appendChild(rootElement, ec);
-
+HTMLNames::
-        rootElement->appendChild(body, ec);
-        documentElement = body.get();
@@ -1477 +1490 @@
-        // wrap the erroneous SVG document in an xhtml document and render
-        // the combined document with error messages.
-
-
+HTMLNames::
+HTMLNames::
-        rootElement->appendChild(body, ec);
-        body->appendChild(documentElement, ec);
@@ -1490 +1503 @@
-#if ENABLE(XSLT)
-    if (doc->transformSourceDocument()) {
-
+HTMLNames::
-        reportElement->appendChild(par, ec);
-
+HTMLNames::
-        par->appendChild(doc->createTextNode("This document was created as the result of an XSL transformation. The line and column numbers given are from the transformed result."), ec);
-    }
@@ -1913 +1926 @@
-    }
-
-
-
-
-
-
-
-
-
+
+
+
-        m_scriptStartLine = lineNumber();
-
@@ -1938 +1946 @@
-
-    Node* n = m_currentNode;
-
-    // skip end of dummy element
-//     if (m_parsingFragment & n->nodeType() == Node::DOCUMENT_FRAGMENT_NODE)
-//         return;
-    
-    RefPtr<Node> parent = n->parentNode();
-    n->finishParsingChildren();
-
-    // don't load external scripts for standalone documents (for now)
-
-
-
-
-
-
-
+
-        ASSERT(!m_pendingScript);
-
-        m_requestingScript = true;
-
-
-
-
-
-
-
-
-
-
+
+
+
+
-        if (!scriptHref.isEmpty()) {
-            // we have a src attribute
-const AtomicString& charset = scriptElement->getAttribute(charsetAttr
-c
-scriptE
+String scriptCharset = scriptElement->charsetAttributeValue(
+scriptC
+e
-                m_pendingScript->addClient(this);
-
@@ -1981 +1972 @@
-
-        } else {
-
-
-
-
-
+
-            m_view->frame()->loader()->executeScript(m_doc->url().string(), m_scriptStartLine, scriptCode);
-        }
+
-        m_requestingScript = false;
-    }