Changeset 208660 in webkit

Timestamp:

Nov 12, 2016 6:43:37 PM (7 years ago)

Author:

rniwa@webkit.org

Message:

document.currentScript should be null when running a script inside a shadow tree
​https://bugs.webkit.org/show_bug.cgi?id=164693

Reviewed by Yusuke Suzuki.

LayoutTests/imported/w3c:

Rebaselined the imported test now that there are no errors.

• web-platform-tests/shadow-dom/Document-prototype-currentScript-expected.txt:

Source/WebCore:

Fixed the bug that we were returning the old or outer script element in document.currentScript
while executing a script element inside a shadow tree. Return null instead.

New behavior matches the latest HTML5 specification:
​https://html.spec.whatwg.org/multipage/scripting.html#execute-the-script-block
where it says for the classic script type, "if the script element's root is not a shadow root, then set
the script element's node document's currentScript attribute to the script element. Otherwise, set it to null."

No new tests. imported/w3c/web-platform-tests/shadow-dom/Document-prototype-currentScript.html covers it.

• dom/CurrentScriptIncrementer.h:

(WebCore::CurrentScriptIncrementer::CurrentScriptIncrementer): Push nullptr when the script element
is inside a shadow tree.
(WebCore::CurrentScriptIncrementer::~CurrentScriptIncrementer): Changed to use an early exit.

• dom/Document.cpp:

(WebCore::Document::pushCurrentScript): Removed the assertion since the argument can now be nullptr.

Location:

trunk

Files:

• LayoutTests/imported/w3c/ChangeLog (modified) (1 diff)
• LayoutTests/imported/w3c/web-platform-tests/shadow-dom/Document-prototype-currentScript-expected.txt (modified) (1 diff)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/dom/CurrentScriptIncrementer.h (modified) (1 diff)
• Source/WebCore/dom/Document.cpp (modified) (1 diff)

trunk/LayoutTests/imported/w3c/ChangeLog

@@ +1 @@
+2016-11-12  Ryosuke Niwa  <rniwa@webkit.org>
+
+        document.currentScript should be null when running a script inside a shadow tree
+        https://bugs.webkit.org/show_bug.cgi?id=164693
+
+        Reviewed by Yusuke Suzuki.
+
+        Rebaselined the imported test now that there are no errors.
+
+        * web-platform-tests/shadow-dom/Document-prototype-currentScript-expected.txt:
+
 2016-11-11  Brady Eidson  <beidson@apple.com>
 

trunk/LayoutTests/imported/w3c/web-platform-tests/shadow-dom/Document-prototype-currentScript-expected.txt

@@ -1 @@
-CONSOLE MESSAGE: line 2422: Error: assert_equals: expected null but got Element node <script id="outerScriptElement">
-
-var outerScriptElement ...
-CONSOLE MESSAGE: line 2422: Error: assert_equals: expected null but got Element node <script id="outerScriptElement">
-
-var outerScriptElement ...
-
-Harness Error (FAIL), message = Error: assert_equals: expected null but got Element node <script id="outerScriptElement">
-
-var outerScriptElement ...
 
 PASS document.currentScript must not to be set to a script element in a shadow tree in open mode 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2016-11-12  Ryosuke Niwa  <rniwa@webkit.org>
+
+        document.currentScript should be null when running a script inside a shadow tree
+        https://bugs.webkit.org/show_bug.cgi?id=164693
+
+        Reviewed by Yusuke Suzuki.
+
+        Fixed the bug that we were returning the old or outer script element in document.currentScript
+        while executing a script element inside a shadow tree. Return null instead.
+
+        New behavior matches the latest HTML5 specification:
+        https://html.spec.whatwg.org/multipage/scripting.html#execute-the-script-block
+        where it says for the classic script type, "if the script element's root is not a shadow root, then set
+        the script element's node document's currentScript attribute to the script element. Otherwise, set it to null."
+
+        No new tests. imported/w3c/web-platform-tests/shadow-dom/Document-prototype-currentScript.html covers it.
+
+        * dom/CurrentScriptIncrementer.h:
+        (WebCore::CurrentScriptIncrementer::CurrentScriptIncrementer): Push nullptr when the script element
+        is inside a shadow tree.
+        (WebCore::CurrentScriptIncrementer::~CurrentScriptIncrementer): Changed to use an early exit.
+        * dom/Document.cpp:
+        (WebCore::Document::pushCurrentScript): Removed the assertion since the argument can now be nullptr.
+
 2016-11-12  Darin Adler  <darin@apple.com>
 

trunk/Source/WebCore/dom/CurrentScriptIncrementer.h

@@ -39 +39 @@
     CurrentScriptIncrementer(Document& document, Element& element)
         : m_document(document)
-        , m_isHTMLScriptElementOutsideShadowTree(is<HTMLScriptElement>(element) && !element.isInShadowTree())
+        , m_isHTMLScriptElement(is<HTMLScriptElement>(element))
     {
-        if (m_isHTMLScriptElementOutsideShadowTree)
-            m_document.pushCurrentScript(&downcast<HTMLScriptElement>(element));
+        if (!m_isHTMLScriptElement)
+            return;
+        auto& scriptElement = downcast<HTMLScriptElement>(element);
+        m_document.pushCurrentScript(scriptElement.isInShadowTree() ? nullptr : &scriptElement);
     }
 
     ~CurrentScriptIncrementer()
     {
-        if (m_isHTMLScriptElementOutsideShadowTree)
-            m_document.popCurrentScript();
+        if (!m_isHTMLScriptElement)
+            return;
+        m_document.popCurrentScript();
     }
 
 private:
     Document& m_document;
-    bool m_isHTMLScriptElementOutsideShadowTree;
+    bool m_isHTMLScriptElement;
 };
 

trunk/Source/WebCore/dom/Document.cpp

@@ -4785 +4785 @@
 void Document::pushCurrentScript(HTMLScriptElement* newCurrentScript)
 {
-    ASSERT(newCurrentScript);
     m_currentScriptStack.append(newCurrentScript);
 }