Changeset 211314 in webkit

Timestamp:

Jan 27, 2017 4:49:01 PM (7 years ago)

Author:

Yusuke Suzuki

Message:

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.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/js/dom/modules/import-from-set-interval-expected.txt (added)
• LayoutTests/js/dom/modules/import-from-set-interval.html (added)
• LayoutTests/js/dom/modules/import-from-set-timeout-expected.txt (added)
• LayoutTests/js/dom/modules/import-from-set-timeout.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/bindings/js/ScriptController.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+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.
+
 2017-01-27  Simon Fraser  <simon.fraser@apple.com>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+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.
+
+        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>
 

trunk/Source/WebCore/bindings/js/ScriptController.cpp

@@ -650 +650 @@
 {
     UserGestureIndicator gestureIndicator(forceUserGesture ? std::optional<ProcessingUserGestureState>(ProcessingUserGesture) : std::nullopt);
-    ScriptSourceCode sourceCode(script, m_frame.document()->url());
+    ScriptSourceCode sourceCode(script, m_frame.document()->url(), TextPosition(), JSC::SourceProviderSourceType::Program, CachedScriptFetcher::create(m_frame.document()->charset()));
 
     if (!canExecuteScripts(AboutToExecuteScript) || isPaused())