<!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>[200327] 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/200327">200327</a></dd>
<dt>Author</dt> <dd>rniwa@webkit.org</dd>
<dt>Date</dt> <dd>2016-05-02 11:19:44 -0700 (Mon, 02 May 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>document.currentScript must be null when we're executing a script inside a shadow tree
https://bugs.webkit.org/show_bug.cgi?id=157245
Reviewed by Darin Adler.
Source/WebCore:
Fix the bug by not setting currentScript as spec'ed in HTML5 specification:
https://html.spec.whatwg.org/multipage/dom.html#dom-document-currentscript
https://html.spec.whatwg.org/multipage/scripting.html#execute-the-script-block
as of 3dc763829ca1598427b588cf08830c1e2af5a05c
New behavior matches that of Google Chrome Canary.
Test: fast/shadow-dom/Document-prototype-currentScript.html
* dom/CurrentScriptIncrementer.h:
(WebCore::CurrentScriptIncrementer::CurrentScriptIncrementer):
(WebCore::CurrentScriptIncrementer::~CurrentScriptIncrementer):
* dom/ScriptElement.cpp:
(WebCore::ScriptElement::executeScript):
LayoutTests:
Add a W3C style testharness.js test.
* fast/shadow-dom/Document-prototype-currentScript-expected.txt: Added.
* fast/shadow-dom/Document-prototype-currentScript.html: Added.
* fast/shadow-dom/resources/Document-prototype-currentScript-helper.js: Added.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</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="#trunkSourceWebCoredomScriptElementcpp">trunk/Source/WebCore/dom/ScriptElement.cpp</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsfastshadowdomDocumentprototypecurrentScriptexpectedtxt">trunk/LayoutTests/fast/shadow-dom/Document-prototype-currentScript-expected.txt</a></li>
<li><a href="#trunkLayoutTestsfastshadowdomDocumentprototypecurrentScripthtml">trunk/LayoutTests/fast/shadow-dom/Document-prototype-currentScript.html</a></li>
<li><a href="#trunkLayoutTestsfastshadowdomresourcesDocumentprototypecurrentScripthelperjs">trunk/LayoutTests/fast/shadow-dom/resources/Document-prototype-currentScript-helper.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (200326 => 200327)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2016-05-02 18:05:46 UTC (rev 200326)
+++ trunk/LayoutTests/ChangeLog 2016-05-02 18:19:44 UTC (rev 200327)
</span><span class="lines">@@ -1,3 +1,16 @@
</span><ins>+2016-05-01 Ryosuke Niwa <rniwa@webkit.org>
+
+ document.currentScript must be null when we're executing a script inside a shadow tree
+ https://bugs.webkit.org/show_bug.cgi?id=157245
+
+ Reviewed by Darin Adler.
+
+ Add a W3C style testharness.js test.
+
+ * fast/shadow-dom/Document-prototype-currentScript-expected.txt: Added.
+ * fast/shadow-dom/Document-prototype-currentScript.html: Added.
+ * fast/shadow-dom/resources/Document-prototype-currentScript-helper.js: Added.
+
</ins><span class="cx"> 2016-04-29 Alex Christensen <achristensen@webkit.org>
</span><span class="cx">
</span><span class="cx"> Do not reuse cache entries with conditional headers
</span></span></pre></div>
<a id="trunkLayoutTestsfastshadowdomDocumentprototypecurrentScriptexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/shadow-dom/Document-prototype-currentScript-expected.txt (0 => 200327)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/shadow-dom/Document-prototype-currentScript-expected.txt (rev 0)
+++ trunk/LayoutTests/fast/shadow-dom/Document-prototype-currentScript-expected.txt 2016-05-02 18:19:44 UTC (rev 200327)
</span><span class="lines">@@ -0,0 +1,10 @@
</span><ins>+
+PASS document.currentScript must not to be set to a script element in a shadow tree in open mode
+PASS document.currentScript must not to be set to a script element in a shadow tree in closed mode
+PASS document.currentScript must be set to a script element that loads an external script in a document tree
+PASS document.currentScript must be set to a script element that loads an external script in a document tree
+PASS document.currentScript must not be set to a script element that loads an external script in an open shadow tree
+PASS document.currentScript must not be set to a script element that loads an external script in a closed shadow tree
+PASS document.currentScript must be set to a script element that loads an external script that was in an open shadow tree and then removed
+PASS document.currentScript must be set to a script element that loads an external script that was in a closed shadow tree and then removed
+
</ins></span></pre></div>
<a id="trunkLayoutTestsfastshadowdomDocumentprototypecurrentScripthtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/shadow-dom/Document-prototype-currentScript.html (0 => 200327)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/shadow-dom/Document-prototype-currentScript.html (rev 0)
+++ trunk/LayoutTests/fast/shadow-dom/Document-prototype-currentScript.html 2016-05-02 18:19:44 UTC (rev 200327)
</span><span class="lines">@@ -0,0 +1,100 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<head>
+<title>DOM and Shadow DOM: Document.prototype.adoptNode</title>
+<meta name="author" title="Ryosuke Niwa" href="mailto:rniwa@webkit.org">
+<meta name="assert" content="If the script element is in a document, then set the script element's node document's currentScript attribute to the script element.">
+<link rel="help" href="https://html.spec.whatwg.org/multipage/scripting.html#execute-the-script-block">
+<script src="../../resources/testharness.js"></script>
+<script src="../../resources/testharnessreport.js"></script>
+<link rel='stylesheet' href='../../resources/testharness.css'>
+</head>
+<body>
+<div id="log"></div>
+<script id="outerScriptElement">
+
+var outerScriptElement = document.currentScript;
+
+function testInlineScript(mode)
+{
+ test(function () {
+ var host = document.createElement('div');
+ var shadowRoot = host.attachShadow({mode: mode});
+ var scriptElement = document.createElement('script');
+ scriptElement.textContent = 'assert_equals(document.currentScript, outerScriptElement)';
+ shadowRoot.appendChild(scriptElement);
+
+ assert_equals(document.currentScript, outerScriptElement,
+ 'document.currentScript must be set to the currently excusing script element in a document tree before executing a script in a shadow tree');
+ document.body.appendChild(host);
+ assert_equals(document.currentScript, outerScriptElement,
+ 'document.currentScript must be set to the currently excusing script element in a document tree after executing a script in a shadow tree');
+
+ }, 'document.currentScript must not to be set to a script element in a shadow tree in ' + mode + ' mode');
+}
+
+testInlineScript('open');
+testInlineScript('closed');
+
+var executeExternalScript = null;
+var testedScriptElement = null;
+function executeNextTest()
+{
+ var testCase = asyncScriptTests.shift();
+ var mode = testCase.mode;
+ var remove = testCase.mode;
+ if (!testCase)
+ return;
+
+ testCase.test.step(function () {
+ testedScriptElement = document.createElement('script');
+ testedScriptElement.src = 'resources/Document-prototype-currentScript-helper.js';
+
+ if (mode !== null) {
+ var host = document.createElement('div');
+ var shadowRoot = host.attachShadow({mode: mode});
+ shadowRoot.appendChild(testedScriptElement);
+ document.body.appendChild(host);
+ } else {
+ document.body.appendChild(testedScriptElement);
+ }
+
+ if (testCase.remove)
+ testedScriptElement.parentNode.removeChild(testedScriptElement);
+ });
+
+ executeExternalScript = function () {
+ testCase.test.step(function () {
+ assert_equals(document.currentScript, testCase.expected());
+ });
+ testCase.test.done();
+ setTimeout(executeNextTest, 1);
+ }
+}
+
+var asyncScriptTests = [
+ {
+ test: async_test('document.currentScript must be set to a script element that loads an external script in a document tree'),
+ mode: null, remove: false, expected: function () { return testedScriptElement; }},
+ {
+ test: async_test('document.currentScript must be set to a script element that loads an external script in a document tree'),
+ mode: null, remove: true, expected: function () { return testedScriptElement; }},
+ {
+ test: async_test('document.currentScript must not be set to a script element that loads an external script in an open shadow tree'),
+ mode: 'open', remove: false, expected: function () { return null; }},
+ {
+ test: async_test('document.currentScript must not be set to a script element that loads an external script in a closed shadow tree'),
+ mode: 'closed', remove: false, expected: function () { return null; }},
+ {
+ test: async_test('document.currentScript must be set to a script element that loads an external script that was in an open shadow tree and then removed'),
+ mode: 'open', remove: true, expected: function () { return testedScriptElement; }},
+ {
+ test: async_test('document.currentScript must be set to a script element that loads an external script that was in a closed shadow tree and then removed'),
+ mode: 'closed', remove: true, expected: function () { return testedScriptElement; }},
+];
+
+executeNextTest();
+
+</script>
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkLayoutTestsfastshadowdomresourcesDocumentprototypecurrentScripthelperjs"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/shadow-dom/resources/Document-prototype-currentScript-helper.js (0 => 200327)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/shadow-dom/resources/Document-prototype-currentScript-helper.js (rev 0)
+++ trunk/LayoutTests/fast/shadow-dom/resources/Document-prototype-currentScript-helper.js 2016-05-02 18:19:44 UTC (rev 200327)
</span><span class="lines">@@ -0,0 +1 @@
</span><ins>+executeExternalScript();
</ins></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (200326 => 200327)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-05-02 18:05:46 UTC (rev 200326)
+++ trunk/Source/WebCore/ChangeLog 2016-05-02 18:19:44 UTC (rev 200327)
</span><span class="lines">@@ -1,3 +1,25 @@
</span><ins>+2016-05-01 Ryosuke Niwa <rniwa@webkit.org>
+
+ document.currentScript must be null when we're executing a script inside a shadow tree
+ https://bugs.webkit.org/show_bug.cgi?id=157245
+
+ Reviewed by Darin Adler.
+
+ Fix the bug by not setting currentScript as spec'ed in HTML5 specification:
+ https://html.spec.whatwg.org/multipage/dom.html#dom-document-currentscript
+ https://html.spec.whatwg.org/multipage/scripting.html#execute-the-script-block
+ as of 3dc763829ca1598427b588cf08830c1e2af5a05c
+
+ New behavior matches that of Google Chrome Canary.
+
+ Test: fast/shadow-dom/Document-prototype-currentScript.html
+
+ * dom/CurrentScriptIncrementer.h:
+ (WebCore::CurrentScriptIncrementer::CurrentScriptIncrementer):
+ (WebCore::CurrentScriptIncrementer::~CurrentScriptIncrementer):
+ * dom/ScriptElement.cpp:
+ (WebCore::ScriptElement::executeScript):
+
</ins><span class="cx"> 2016-04-29 Alex Christensen <achristensen@webkit.org>
</span><span class="cx">
</span><span class="cx"> Do not reuse cache entries with conditional headers
</span></span></pre></div>
<a id="trunkSourceWebCoredomCurrentScriptIncrementerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/CurrentScriptIncrementer.h (200326 => 200327)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/CurrentScriptIncrementer.h 2016-05-02 18:05:46 UTC (rev 200326)
+++ trunk/Source/WebCore/dom/CurrentScriptIncrementer.h 2016-05-02 18:19:44 UTC (rev 200327)
</span><span class="lines">@@ -37,23 +37,23 @@
</span><span class="cx"> class CurrentScriptIncrementer {
</span><span class="cx"> WTF_MAKE_NONCOPYABLE(CurrentScriptIncrementer);
</span><span class="cx"> public:
</span><del>- CurrentScriptIncrementer(Document& document, Element* element)
</del><ins>+ CurrentScriptIncrementer(Document& document, Element& element)
</ins><span class="cx"> : m_document(document)
</span><del>- , m_isHTMLScriptElement(is<HTMLScriptElement>(*element))
</del><ins>+ , m_isHTMLScriptElementOutsideShadowTree(is<HTMLScriptElement>(element) && !element.isInShadowTree())
</ins><span class="cx"> {
</span><del>- if (m_isHTMLScriptElement)
- m_document.pushCurrentScript(downcast<HTMLScriptElement>(element));
</del><ins>+ if (m_isHTMLScriptElementOutsideShadowTree)
+ m_document.pushCurrentScript(&downcast<HTMLScriptElement>(element));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> ~CurrentScriptIncrementer()
</span><span class="cx"> {
</span><del>- if (m_isHTMLScriptElement)
</del><ins>+ if (m_isHTMLScriptElementOutsideShadowTree)
</ins><span class="cx"> m_document.popCurrentScript();
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> Document& m_document;
</span><del>- bool m_isHTMLScriptElement;
</del><ins>+ bool m_isHTMLScriptElementOutsideShadowTree;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoredomScriptElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/ScriptElement.cpp (200326 => 200327)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/ScriptElement.cpp 2016-05-02 18:05:46 UTC (rev 200326)
+++ trunk/Source/WebCore/dom/ScriptElement.cpp 2016-05-02 18:19:44 UTC (rev 200327)
</span><span class="lines">@@ -312,7 +312,7 @@
</span><span class="cx"> Ref<Document> document(m_element.document());
</span><span class="cx"> if (Frame* frame = document->frame()) {
</span><span class="cx"> IgnoreDestructiveWriteCountIncrementer ignoreDesctructiveWriteCountIncrementer(m_isExternalScript ? document.ptr() : nullptr);
</span><del>- CurrentScriptIncrementer currentScriptIncrementer(document, &m_element);
</del><ins>+ CurrentScriptIncrementer currentScriptIncrementer(document, m_element);
</ins><span class="cx">
</span><span class="cx"> // Create a script from the script element node, using the script
</span><span class="cx"> // block's source and the script block's type.
</span></span></pre>
</div>
</div>
</body>
</html>