Changeset 211818 in webkit

Timestamp:

Feb 7, 2017 10:24:49 AM (7 years ago)

Author:

Yusuke Suzuki

Message:

Unreviewed, manual roll out of r211777
​https://bugs.webkit.org/show_bug.cgi?id=167457

Source/JavaScriptCore:

• jsc.cpp:

(GlobalObject::moduleLoaderImportModule):

• runtime/JSGlobalObjectFunctions.cpp:

(JSC::globalFuncImportModule):

Source/WebCore:

• bindings/js/ScriptModuleLoader.cpp:

(WebCore::ScriptModuleLoader::importModule):

LayoutTests:

Later, I'll reland it with the deterministic tests.

• inspector/controller/resources/cappuccino.js: Removed.
• inspector/controller/resources/cocoa.js: Removed.
• inspector/controller/resources/drink.js: Removed.
• inspector/controller/runtime-controller-expected.txt:
• inspector/controller/runtime-controller.html:

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/inspector/controller/resources (deleted)
• LayoutTests/inspector/controller/runtime-controller-expected.txt (modified) (2 diffs)
• LayoutTests/inspector/controller/runtime-controller.html (modified) (1 diff)
• Source/JavaScriptCore/ChangeLog (modified) (1 diff)
• Source/JavaScriptCore/jsc.cpp (modified) (1 diff)
• Source/JavaScriptCore/runtime/JSGlobalObjectFunctions.cpp (modified) (1 diff)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/bindings/js/ScriptModuleLoader.cpp (modified) (2 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2017-02-07  Yusuke Suzuki  <utatane.tea@gmail.com>
+
+        Unreviewed, manual roll out of r211777
+        https://bugs.webkit.org/show_bug.cgi?id=167457
+
+        Later, I'll reland it with the deterministic tests.
+
+        * inspector/controller/resources/cappuccino.js: Removed.
+        * inspector/controller/resources/cocoa.js: Removed.
+        * inspector/controller/resources/drink.js: Removed.
+        * inspector/controller/runtime-controller-expected.txt:
+        * inspector/controller/runtime-controller.html:
+
 2017-02-07  Antoine Quint  <graouts@apple.com>
 

trunk/LayoutTests/inspector/controller/runtime-controller-expected.txt

@@ -7 +7 @@
 CONSOLE MESSAGE: line 9: Rejection
 CONSOLE MESSAGE: line 7: %o
-CONSOLE MESSAGE: line 7: %o
-CONSOLE MESSAGE: line 9: TypeError: Module specifier does not start with "/", "./", or "../".
-CONSOLE MESSAGE: line 9: TypeError: Importing a module script failed.
-CONSOLE MESSAGE: line 6: Cocoa is Sweet.
-CONSOLE MESSAGE: line 7: %o
-CONSOLE MESSAGE: line 6: Cocoa is Sweet. Cappuccino is Awesome.
 CONSOLE MESSAGE: line 7: %o
 Tests for RuntimeManager operations.
@@ -65 +59 @@
 PASS: Exception. Should not get transformed and produce a SyntaxError.
 
--- Running test case: RuntimeManager.prototype.evaluateInInspectedWindow.ImportFromConsole
-Source: await import('')
-PASS: Transformed. Should log the value or an exception.
-Source: await import('./not-found.js')
-PASS: Transformed. Should log the value or an exception.
-Source: await import('./resources/cocoa.js').then((cocoa) => console.log(`${cocoa.name} is ${cocoa.taste}.`))
-PASS: Transformed. Should log the value or an exception.
-Source: await import('./resources/drink.js').then((ns) => console.log(`${ns.Cocoa.name} is ${ns.Cocoa.taste}. ${ns.Cappuccino.name} is ${ns.Cappuccino.taste}.`))
-PASS: Transformed. Should log the value or an exception.
-

trunk/LayoutTests/inspector/controller/runtime-controller.html

@@ -125 +125 @@
     });
 
-    suite.addTestCase({
-        name: "RuntimeManager.prototype.evaluateInInspectedWindow.ImportFromConsole",
-        description: "Test evaluating an import expression from console.",
-        test(resolve, reject) {
-            function testSource(expression) {
-                WebInspector.runtimeManager.evaluateInInspectedWindow(expression, {objectGroup: "test"}, (result, wasThrown) => {
-                    InspectorTest.log("Source: " + expression);
-                    InspectorTest.expectThat(result.isUndefined(), "Transformed. Should log the value or an exception.");
-                });
-            }
-
-            testSource("await import('')");
-            testSource("await import('./not-found.js')");
-            testSource("await import('./resources/cocoa.js').then((cocoa) => console.log(`${cocoa.name} is ${cocoa.taste}.`))");
-            testSource("await import('./resources/drink.js').then((ns) => console.log(`${ns.Cocoa.name} is ${ns.Cocoa.taste}. ${ns.Cappuccino.name} is ${ns.Cappuccino.taste}.`))");
-
-            InspectorBackend.runAfterPendingDispatches(resolve);
-        }
-    });
-
     suite.runTestCasesAndFinish();
 }

trunk/Source/JavaScriptCore/ChangeLog

@@ +1 @@
+2017-02-07  Yusuke Suzuki  <utatane.tea@gmail.com>
+
+        Unreviewed, manual roll out of r211777
+        https://bugs.webkit.org/show_bug.cgi?id=167457
+
+        * jsc.cpp:
+        (GlobalObject::moduleLoaderImportModule):
+        * runtime/JSGlobalObjectFunctions.cpp:
+        (JSC::globalFuncImportModule):
+
 2017-02-07  Yusuke Suzuki  <utatane.tea@gmail.com>
 

trunk/Source/JavaScriptCore/jsc.cpp

@@ -1552 +1552 @@
     };
 
-    if (sourceOrigin.isNull())
-        return rejectPromise(createError(exec, ASCIILiteral("Could not resolve the module specifier.")));
-
     auto referrer = sourceOrigin.string();
     auto moduleName = moduleNameValue->value(exec);

trunk/Source/JavaScriptCore/runtime/JSGlobalObjectFunctions.cpp

@@ -945 +945 @@
 
     auto sourceOrigin = exec->callerSourceOrigin();
+    if (sourceOrigin.isNull()) {
+        promise->reject(exec, createError(exec, ASCIILiteral("Could not resolve the module specifier.")));
+        return JSValue::encode(promise->promise());
+    }
+
     RELEASE_ASSERT(exec->argumentCount() == 1);
     auto* specifier = exec->uncheckedArgument(0).toString(exec);

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2017-02-07  Yusuke Suzuki  <utatane.tea@gmail.com>
+
+        Unreviewed, manual roll out of r211777
+        https://bugs.webkit.org/show_bug.cgi?id=167457
+
+        * bindings/js/ScriptModuleLoader.cpp:
+        (WebCore::ScriptModuleLoader::importModule):
+
 2017-02-07  Carlos Garcia Campos  <cgarcia@igalia.com>
 

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

@@ -219 +219 @@
     auto& globalObject = *JSC::jsCast<JSDOMGlobalObject*>(jsGlobalObject);
 
-    // If SourceOrigin and/or CachedScriptFetcher is null, we import the module with the default fetcher.
-    // SourceOrigin can be null if the source code is not coupled with the script file.
-    // The examples,
-    //     1. The code evaluated by the inspector.
-    //     2. The other unusual code execution like the evaluation through the NPAPI.
-    //     3. The code from injected bundle's script.
-    //     4. The code from extension script.
-    URL baseURL;
-    RefPtr<JSC::ScriptFetcher> scriptFetcher;
-    if (sourceOrigin.isNull()) {
-        baseURL = m_document.baseURL();
-        scriptFetcher = CachedScriptFetcher::create(m_document.charset());
-    } else {
-        baseURL = URL(URL(), sourceOrigin.string());
-        if (!baseURL.isValid())
-            return rejectPromise(state, globalObject, TypeError, ASCIILiteral("Importer module key is not a Symbol or a String."));
-
-        if (sourceOrigin.fetcher())
-            scriptFetcher = sourceOrigin.fetcher();
-        else
-            scriptFetcher = CachedScriptFetcher::create(m_document.charset());
-    }
-    ASSERT(baseURL.isValid());
-    ASSERT(scriptFetcher);
+    // FIXME: setTimeout and setInterval with "string()" should propagate SourceOrigin.
+    // https://webkit.org/b/167097
+    ASSERT_WITH_MESSAGE(!sourceOrigin.isNull(), "If SourceOrigin is null, this function is not invoked.");
+    if (!sourceOrigin.fetcher())
+        return rejectPromise(state, globalObject, TypeError, ASCIILiteral("Could not use import operator in this context."));
+
+    URL baseURL(URL(), sourceOrigin.string());
+    if (!baseURL.isValid())
+        return rejectPromise(state, globalObject, TypeError, ASCIILiteral("Importer module key is not Symbol or String."));
 
     auto specifier = moduleName->value(exec);
@@ -249 +234 @@
         return rejectPromise(state, globalObject, TypeError, result.error());
 
-    return JSC::importModule(exec, JSC::Identifier::fromString(&vm, result->string()), JSC::JSScriptFetcher::create(vm, WTFMove(scriptFetcher) ));
+    return JSC::importModule(exec, JSC::Identifier::fromString(&vm, result->string()), JSC::JSScriptFetcher::create(vm, sourceOrigin.fetcher() ));
 }