<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[208660] trunk</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/208660">208660</a></dd>
<dt>Author</dt> <dd>rniwa@webkit.org</dd>
<dt>Date</dt> <dd>2016-11-12 18:43:37 -0800 (Sat, 12 Nov 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>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.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsimportedw3cChangeLog">trunk/LayoutTests/imported/w3c/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsimportedw3cwebplatformtestsshadowdomDocumentprototypecurrentScriptexpectedtxt">trunk/LayoutTests/imported/w3c/web-platform-tests/shadow-dom/Document-prototype-currentScript-expected.txt</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoredomCurrentScriptIncrementerh">trunk/Source/WebCore/dom/CurrentScriptIncrementer.h</a></li>
<li><a href="#trunkSourceWebCoredomDocumentcpp">trunk/Source/WebCore/dom/Document.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsimportedw3cChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/imported/w3c/ChangeLog (208659 => 208660)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/imported/w3c/ChangeLog 2016-11-12 22:31:17 UTC (rev 208659)
+++ trunk/LayoutTests/imported/w3c/ChangeLog 2016-11-13 02:43:37 UTC (rev 208660)
</span><span class="lines">@@ -1,3 +1,14 @@
</span><ins>+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:
+
</ins><span class="cx"> 2016-11-11 Brady Eidson <beidson@apple.com>
</span><span class="cx">
</span><span class="cx"> IndexedDB 2.0: "close pending flag" and firing blocked events all need fixing.
</span></span></pre></div>
<a id="trunkLayoutTestsimportedw3cwebplatformtestsshadowdomDocumentprototypecurrentScriptexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/imported/w3c/web-platform-tests/shadow-dom/Document-prototype-currentScript-expected.txt (208659 => 208660)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/imported/w3c/web-platform-tests/shadow-dom/Document-prototype-currentScript-expected.txt 2016-11-12 22:31:17 UTC (rev 208659)
+++ trunk/LayoutTests/imported/w3c/web-platform-tests/shadow-dom/Document-prototype-currentScript-expected.txt 2016-11-13 02:43:37 UTC (rev 208660)
</span><span class="lines">@@ -1,14 +1,4 @@
</span><del>-CONSOLE MESSAGE: line 2422: Error: assert_equals: expected null but got Element node <script id="outerScriptElement">
</del><span class="cx">
</span><del>-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 ...
-
</del><span class="cx"> PASS document.currentScript must not to be set to a script element in a shadow tree in open mode
</span><span class="cx"> PASS document.currentScript must not to be set to a script element in a shadow tree in closed mode
</span><span class="cx"> PASS document.currentScript must be set to a script element that loads an external script in a document tree
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (208659 => 208660)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-11-12 22:31:17 UTC (rev 208659)
+++ trunk/Source/WebCore/ChangeLog 2016-11-13 02:43:37 UTC (rev 208660)
</span><span class="lines">@@ -1,3 +1,27 @@
</span><ins>+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.
+
</ins><span class="cx"> 2016-11-12 Darin Adler <darin@apple.com>
</span><span class="cx">
</span><span class="cx"> Remove a few assorted uses of ExceptionCode
</span></span></pre></div>
<a id="trunkSourceWebCoredomCurrentScriptIncrementerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/CurrentScriptIncrementer.h (208659 => 208660)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/CurrentScriptIncrementer.h 2016-11-12 22:31:17 UTC (rev 208659)
+++ trunk/Source/WebCore/dom/CurrentScriptIncrementer.h 2016-11-13 02:43:37 UTC (rev 208660)
</span><span class="lines">@@ -38,21 +38,24 @@
</span><span class="cx"> public:
</span><span class="cx"> CurrentScriptIncrementer(Document& document, Element& element)
</span><span class="cx"> : m_document(document)
</span><del>- , m_isHTMLScriptElementOutsideShadowTree(is<HTMLScriptElement>(element) && !element.isInShadowTree())
</del><ins>+ , m_isHTMLScriptElement(is<HTMLScriptElement>(element))
</ins><span class="cx"> {
</span><del>- if (m_isHTMLScriptElementOutsideShadowTree)
- m_document.pushCurrentScript(&downcast<HTMLScriptElement>(element));
</del><ins>+ if (!m_isHTMLScriptElement)
+ return;
+ auto& scriptElement = downcast<HTMLScriptElement>(element);
+ m_document.pushCurrentScript(scriptElement.isInShadowTree() ? nullptr : &scriptElement);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> ~CurrentScriptIncrementer()
</span><span class="cx"> {
</span><del>- if (m_isHTMLScriptElementOutsideShadowTree)
- m_document.popCurrentScript();
</del><ins>+ if (!m_isHTMLScriptElement)
+ return;
+ m_document.popCurrentScript();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> Document& m_document;
</span><del>- bool m_isHTMLScriptElementOutsideShadowTree;
</del><ins>+ bool m_isHTMLScriptElement;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span></span></pre></div>
<a id="trunkSourceWebCoredomDocumentcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/Document.cpp (208659 => 208660)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/Document.cpp 2016-11-12 22:31:17 UTC (rev 208659)
+++ trunk/Source/WebCore/dom/Document.cpp 2016-11-13 02:43:37 UTC (rev 208660)
</span><span class="lines">@@ -4784,7 +4784,6 @@
</span><span class="cx">
</span><span class="cx"> void Document::pushCurrentScript(HTMLScriptElement* newCurrentScript)
</span><span class="cx"> {
</span><del>- ASSERT(newCurrentScript);
</del><span class="cx"> m_currentScriptStack.append(newCurrentScript);
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>