Changeset 61608 in webkit

Timestamp:

Jun 22, 2010 1:14:46 AM (14 years ago)

Author:

abarth@webkit.org

Message:

2010-06-22 Adam Barth <​abarth@webkit.org>

Reviewed by Eric Seidel.

Follow the HTML5 spec more closely w.r.t. when to save the insertion point
​https://bugs.webkit.org/show_bug.cgi?id=40976

This test no longer asserts. The output is incorrect, however. I'll
fix the output in the next patch.

• fast/tokenizer/write-on-load-expected.txt: Added.
• fast/tokenizer/write-on-load.html: Added.

2010-06-22 Adam Barth <​abarth@webkit.org>

Reviewed by Eric Seidel.

Follow the HTML5 spec more closely w.r.t. when to save the insertion point
​https://bugs.webkit.org/show_bug.cgi?id=40976

The spec always increments the nesting level and saves the insertion
point at the same time. In this patch, we now do those operations
packaged as a RAII.

As a side effect, the test case below no longer ASSERTs. (The output
is wrong, but we'll get to that next.)

Test: fast/tokenizer/write-on-load.html

• html/HTML5ScriptRunner.cpp: (WebCore::NestScript::NestScript): (WebCore::NestScript::~NestScript): (WebCore::HTML5ScriptRunner::executePendingScript): (WebCore::HTML5ScriptRunner::executeScript): (WebCore::HTML5ScriptRunner::requestScript): (WebCore::HTML5ScriptRunner::runScript):
• html/HTMLInputStream.h:

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/tokenizer/write-on-load-expected.txt (added)
• LayoutTests/fast/tokenizer/write-on-load.html (added)
• WebCore/ChangeLog (modified) (1 diff)
• WebCore/html/HTML5ScriptRunner.cpp (modified) (5 diffs)
• WebCore/html/HTMLInputStream.h (modified) (2 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2010-06-22  Adam Barth  <abarth@webkit.org>
+
+        Reviewed by Eric Seidel.
+
+        Follow the HTML5 spec more closely w.r.t. when to save the insertion point
+        https://bugs.webkit.org/show_bug.cgi?id=40976
+
+        This test no longer asserts.  The output is incorrect, however.  I'll
+        fix the output in the next patch.
+
+        * fast/tokenizer/write-on-load-expected.txt: Added.
+        * fast/tokenizer/write-on-load.html: Added.
+
 2010-06-21  Julien Chaffraix  <jchaffraix@webkit.org>
 

trunk/WebCore/ChangeLog

@@ +1 @@
+2010-06-22  Adam Barth  <abarth@webkit.org>
+
+        Reviewed by Eric Seidel.
+
+        Follow the HTML5 spec more closely w.r.t. when to save the insertion point
+        https://bugs.webkit.org/show_bug.cgi?id=40976
+
+        The spec always increments the nesting level and saves the insertion
+        point at the same time.  In this patch, we now do those operations
+        packaged as a RAII.
+
+        As a side effect, the test case below no longer ASSERTs.  (The output
+        is wrong, but we'll get to that next.)
+
+        Test: fast/tokenizer/write-on-load.html
+
+        * html/HTML5ScriptRunner.cpp:
+        (WebCore::NestScript::NestScript):
+        (WebCore::NestScript::~NestScript):
+        (WebCore::HTML5ScriptRunner::executePendingScript):
+        (WebCore::HTML5ScriptRunner::executeScript):
+        (WebCore::HTML5ScriptRunner::requestScript):
+        (WebCore::HTML5ScriptRunner::runScript):
+        * html/HTMLInputStream.h:
+
 2010-06-22  Adam Barth  <abarth@webkit.org>
 

trunk/WebCore/html/HTML5ScriptRunner.cpp

@@ -44 +44 @@
 using namespace HTMLNames;
 
+class NestScript : public Noncopyable {
+public:
+    NestScript(unsigned& nestingLevel, HTMLInputStream& inputStream)
+        : m_nestingLevel(&nestingLevel)
+        , m_savedInsertionPoint(inputStream)
+    {
+        ++(*m_nestingLevel);
+    }
+
+    ~NestScript()
+    {
+        --(*m_nestingLevel);
+    }
+
+private:
+    unsigned* m_nestingLevel;
+    InsertionPointRecord m_savedInsertionPoint;
+};
+
 HTML5ScriptRunner::HTML5ScriptRunner(Document* document, HTML5ScriptRunnerHost* host)
     : m_document(document)
@@ -115 +134 @@
     RefPtr<Element> scriptElement = m_parsingBlockingScript.element.release();
     m_parsingBlockingScript = PendingScript();
-
-    m_scriptNestingLevel++;
-    if (errorOccurred)
-        scriptElement->dispatchEvent(createScriptErrorEvent());
-    else {
-        executeScript(scriptElement.get(), sourceCode);
-        scriptElement->dispatchEvent(createScriptLoadEvent());
-    }
-    m_scriptNestingLevel--;
+    {
+        NestScript nestingLevel(m_scriptNestingLevel, m_host->inputStream());
+        if (errorOccurred)
+            scriptElement->dispatchEvent(createScriptErrorEvent());
+        else {
+            executeScript(scriptElement.get(), sourceCode);
+            scriptElement->dispatchEvent(createScriptLoadEvent());
+        }
+    }
     ASSERT(!m_scriptNestingLevel);
 }
@@ -140 +159 @@
     if (!m_document->frame())
         return;
-
-    InsertionPointRecord savedInsertionPoint(m_host->inputStream());
     m_document->frame()->script()->executeScript(sourceCode);
 }
@@ -237 +254 @@
         return;
     // FIXME: We need to resolve the url relative to the element.
-    {
-        InsertionPointRecord savedInsertionPoint(m_host->inputStream());
-        if (!script->dispatchBeforeLoadEvent(srcValue))
-            return;
-    }
+    if (!script->dispatchBeforeLoadEvent(srcValue))
+        return;
     m_parsingBlockingScript.element = script;
     // This should correctly return 0 for empty or invalid srcValues.
@@ -266 +280 @@
 {
     ASSERT(!haveParsingBlockingScript());
-    m_scriptNestingLevel++;
-    // Check script type and language, current code uses ScriptElement::shouldExecuteAsJavaScript(), but that may not be HTML5 compliant.
-    notImplemented(); // event for support
-
-    if (script->hasAttribute(srcAttr)) {
-        // FIXME: Handle defer and async
-        requestScript(script);
-    } else {
-        // FIXME: We do not block inline <script> tags on stylesheets to match the
-        // old parser for now.  See https://bugs.webkit.org/show_bug.cgi?id=40047
-        ScriptSourceCode sourceCode(script->textContent(), documentURLForScriptExecution(m_document), startingLineNumber);
-        executeScript(script, sourceCode);
-    }
-    m_scriptNestingLevel--;
-}
-
-}
+    {
+        NestScript nestingLevel(m_scriptNestingLevel, m_host->inputStream());
+
+        // Check script type and language, current code uses ScriptElement::shouldExecuteAsJavaScript(), but that may not be HTML5 compliant.
+        notImplemented(); // event for support
+
+        if (script->hasAttribute(srcAttr)) {
+            // FIXME: Handle defer and async
+            requestScript(script);
+        } else {
+            // FIXME: We do not block inline <script> tags on stylesheets to match the
+            // old parser for now.  See https://bugs.webkit.org/show_bug.cgi?id=40047
+            ScriptSourceCode sourceCode(script->textContent(), documentURLForScriptExecution(m_document), startingLineNumber);
+            executeScript(script, sourceCode);
+        }
+    }
+}
+
+}

trunk/WebCore/html/HTMLInputStream.h

@@ -48 +48 @@
 // The network adds data at the end of the InputStream, which appends
 // them to the "last" string.
-class HTMLInputStream {
+class HTMLInputStream : public Noncopyable {
 public:
     HTMLInputStream()
@@ -103 +103 @@
 };
 
-class InsertionPointRecord {
+class InsertionPointRecord : public Noncopyable {
 public:
     explicit InsertionPointRecord(HTMLInputStream& inputStream)