<!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>[211314] 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/211314">211314</a></dd>
<dt>Author</dt> <dd>utatane.tea@gmail.com</dd>
<dt>Date</dt> <dd>2017-01-27 16:49:01 -0800 (Fri, 27 Jan 2017)</dd>
</dl>
<h3>Log Message</h3>
<pre>setTimeout / setInterval's string execution should inherit SourceOrigin correctly
https://bugs.webkit.org/show_bug.cgi?id=167097
Reviewed by Darin Adler.
Source/WebCore:
Tests: js/dom/modules/import-from-set-interval.html
js/dom/modules/import-from-set-timeout.html
* bindings/js/ScriptController.cpp:
(WebCore::ScriptController::executeScriptInWorld):
LayoutTests:
We set the default SourceOrigin for the ScriptController::executeScriptInWorld.
The default SourceOrigin has the document baseURL and CachedScriptFetcher.
setTimeout and setInterval use this interface. And it uses the default SourceOrigin
for the document (Realm of the setTimeout / setInterval). This is the expected
behavior in the dynamic import proposal.
* js/dom/modules/import-from-set-interval-expected.txt: Added.
* js/dom/modules/import-from-set-interval.html: Added.
* js/dom/modules/import-from-set-timeout-expected.txt: Added.
* js/dom/modules/import-from-set-timeout.html: 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="#trunkSourceWebCorebindingsjsScriptControllercpp">trunk/Source/WebCore/bindings/js/ScriptController.cpp</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsjsdommodulesimportfromsetintervalexpectedtxt">trunk/LayoutTests/js/dom/modules/import-from-set-interval-expected.txt</a></li>
<li><a href="#trunkLayoutTestsjsdommodulesimportfromsetintervalhtml">trunk/LayoutTests/js/dom/modules/import-from-set-interval.html</a></li>
<li><a href="#trunkLayoutTestsjsdommodulesimportfromsettimeoutexpectedtxt">trunk/LayoutTests/js/dom/modules/import-from-set-timeout-expected.txt</a></li>
<li><a href="#trunkLayoutTestsjsdommodulesimportfromsettimeouthtml">trunk/LayoutTests/js/dom/modules/import-from-set-timeout.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (211313 => 211314)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2017-01-28 00:47:30 UTC (rev 211313)
+++ trunk/LayoutTests/ChangeLog 2017-01-28 00:49:01 UTC (rev 211314)
</span><span class="lines">@@ -1,3 +1,22 @@
</span><ins>+2017-01-27 Yusuke Suzuki <utatane.tea@gmail.com>
+
+ setTimeout / setInterval's string execution should inherit SourceOrigin correctly
+ https://bugs.webkit.org/show_bug.cgi?id=167097
+
+ Reviewed by Darin Adler.
+
+ We set the default SourceOrigin for the ScriptController::executeScriptInWorld.
+ The default SourceOrigin has the document baseURL and CachedScriptFetcher.
+
+ setTimeout and setInterval use this interface. And it uses the default SourceOrigin
+ for the document (Realm of the setTimeout / setInterval). This is the expected
+ behavior in the dynamic import proposal.
+
+ * js/dom/modules/import-from-set-interval-expected.txt: Added.
+ * js/dom/modules/import-from-set-interval.html: Added.
+ * js/dom/modules/import-from-set-timeout-expected.txt: Added.
+ * js/dom/modules/import-from-set-timeout.html: Added.
+
</ins><span class="cx"> 2017-01-27 Simon Fraser <simon.fraser@apple.com>
</span><span class="cx">
</span><span class="cx"> Tweak the test to avoid one pixel of difference on some hardware.
</span></span></pre></div>
<a id="trunkLayoutTestsjsdommodulesimportfromsetintervalexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/js/dom/modules/import-from-set-interval-expected.txt (0 => 211314)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/js/dom/modules/import-from-set-interval-expected.txt (rev 0)
+++ trunk/LayoutTests/js/dom/modules/import-from-set-interval-expected.txt 2017-01-28 00:49:01 UTC (rev 211314)
</span><span class="lines">@@ -0,0 +1,15 @@
</span><ins>+Test import from setInterval.
+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+
+Module execution is confined in the module environment.
+PASS typeof cocoa is "undefined"
+PASS typeof exportedCocoa is "object"
+PASS exportedCocoa.taste() is "nice"
+PASS window.imported is true
+PASS window.passedCocoa is window.exportedCocoa
+PASS successfullyParsed is true
+
+TEST COMPLETE
+
</ins></span></pre></div>
<a id="trunkLayoutTestsjsdommodulesimportfromsetintervalhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/js/dom/modules/import-from-set-interval.html (0 => 211314)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/js/dom/modules/import-from-set-interval.html (rev 0)
+++ trunk/LayoutTests/js/dom/modules/import-from-set-interval.html 2017-01-28 00:49:01 UTC (rev 211314)
</span><span class="lines">@@ -0,0 +1,30 @@
</span><ins>+<!DOCTYPE HTML>
+<html>
+<head>
+<script src="../../../resources/js-test-pre.js"></script>
+</head>
+<body>
+<script>
+description('Test import from setInterval.');
+
+// Module will be executed asynchronously.
+window.jsTestIsAsync = true;
+window.passedCocoa = null;
+window.id = null;
+
+function loaded(cocoa)
+{
+ window.passedCocoa = cocoa;
+ shouldBeTrue(`window.imported`);
+ shouldBe(`window.passedCocoa`, `window.exportedCocoa`);
+ finishJSTest();
+}
+</script>
+<script>
+</script>
+<script src="../../../resources/js-test-post.js"></script>
+<script type="module">
+window.id = setInterval(`clearInterval(window.id);import("./resources/import-src-simple.js").then((ns) => loaded(ns.ok));`, 0);
+</script>
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkLayoutTestsjsdommodulesimportfromsettimeoutexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/js/dom/modules/import-from-set-timeout-expected.txt (0 => 211314)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/js/dom/modules/import-from-set-timeout-expected.txt (rev 0)
+++ trunk/LayoutTests/js/dom/modules/import-from-set-timeout-expected.txt 2017-01-28 00:49:01 UTC (rev 211314)
</span><span class="lines">@@ -0,0 +1,15 @@
</span><ins>+Test import from setTimeout.
+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+
+Module execution is confined in the module environment.
+PASS typeof cocoa is "undefined"
+PASS typeof exportedCocoa is "object"
+PASS exportedCocoa.taste() is "nice"
+PASS window.imported is true
+PASS window.passedCocoa is window.exportedCocoa
+PASS successfullyParsed is true
+
+TEST COMPLETE
+
</ins></span></pre></div>
<a id="trunkLayoutTestsjsdommodulesimportfromsettimeouthtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/js/dom/modules/import-from-set-timeout.html (0 => 211314)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/js/dom/modules/import-from-set-timeout.html (rev 0)
+++ trunk/LayoutTests/js/dom/modules/import-from-set-timeout.html 2017-01-28 00:49:01 UTC (rev 211314)
</span><span class="lines">@@ -0,0 +1,29 @@
</span><ins>+<!DOCTYPE HTML>
+<html>
+<head>
+<script src="../../../resources/js-test-pre.js"></script>
+</head>
+<body>
+<script>
+description('Test import from setTimeout.');
+
+// Module will be executed asynchronously.
+window.jsTestIsAsync = true;
+window.passedCocoa = null;
+
+function loaded(cocoa)
+{
+ window.passedCocoa = cocoa;
+ shouldBeTrue(`window.imported`);
+ shouldBe(`window.passedCocoa`, `window.exportedCocoa`);
+ finishJSTest();
+}
+</script>
+<script>
+</script>
+<script src="../../../resources/js-test-post.js"></script>
+<script type="module">
+setTimeout(`import("./resources/import-src-simple.js").then((ns) => loaded(ns.ok))`, 0);
+</script>
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (211313 => 211314)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2017-01-28 00:47:30 UTC (rev 211313)
+++ trunk/Source/WebCore/ChangeLog 2017-01-28 00:49:01 UTC (rev 211314)
</span><span class="lines">@@ -1,5 +1,18 @@
</span><span class="cx"> 2017-01-27 Yusuke Suzuki <utatane.tea@gmail.com>
</span><span class="cx">
</span><ins>+ setTimeout / setInterval's string execution should inherit SourceOrigin correctly
+ https://bugs.webkit.org/show_bug.cgi?id=167097
+
+ Reviewed by Darin Adler.
+
+ Tests: js/dom/modules/import-from-set-interval.html
+ js/dom/modules/import-from-set-timeout.html
+
+ * bindings/js/ScriptController.cpp:
+ (WebCore::ScriptController::executeScriptInWorld):
+
+2017-01-27 Yusuke Suzuki <utatane.tea@gmail.com>
+
</ins><span class="cx"> Merge CachedModuleScript and LoadableModuleScript
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=167500
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsjsScriptControllercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/js/ScriptController.cpp (211313 => 211314)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/js/ScriptController.cpp 2017-01-28 00:47:30 UTC (rev 211313)
+++ trunk/Source/WebCore/bindings/js/ScriptController.cpp 2017-01-28 00:49:01 UTC (rev 211314)
</span><span class="lines">@@ -649,7 +649,7 @@
</span><span class="cx"> JSValue ScriptController::executeScriptInWorld(DOMWrapperWorld& world, const String& script, bool forceUserGesture)
</span><span class="cx"> {
</span><span class="cx"> UserGestureIndicator gestureIndicator(forceUserGesture ? std::optional<ProcessingUserGestureState>(ProcessingUserGesture) : std::nullopt);
</span><del>- ScriptSourceCode sourceCode(script, m_frame.document()->url());
</del><ins>+ ScriptSourceCode sourceCode(script, m_frame.document()->url(), TextPosition(), JSC::SourceProviderSourceType::Program, CachedScriptFetcher::create(m_frame.document()->charset()));
</ins><span class="cx">
</span><span class="cx"> if (!canExecuteScripts(AboutToExecuteScript) || isPaused())
</span><span class="cx"> return { };
</span></span></pre>
</div>
</div>
</body>
</html>