Changeset 210573 in webkit for trunk/Source/JavaScriptCore/runtime/JSModuleLoader.h

Timestamp:

Jan 10, 2017, 6:26:47 PM (8 years ago)

Author:

Yusuke Suzuki

Message:

Implement JSSourceCode to propagate SourceCode in module pipeline
​https://bugs.webkit.org/show_bug.cgi?id=166861

Reviewed by Saam Barati.

Source/JavaScriptCore:

Instead of propagating source code string, we propagate JSSourceCode
cell in the module pipeline. This allows us to attach a metadata
to the propagated source code string. In particular, it propagates
SourceOrigin through the module pipeline.

And it also fixes JSC shell to use Module source type for module source code.

• CMakeLists.txt:
• JavaScriptCore.xcodeproj/project.pbxproj:
• builtins/ModuleLoaderPrototype.js:

(fulfillFetch):
(requestFetch):

• jsc.cpp:

(GlobalObject::moduleLoaderFetch):
(runWithScripts):

• llint/LLIntData.cpp:

(JSC::LLInt::Data::performAssertions):

• llint/LowLevelInterpreter.asm:
• runtime/Completion.cpp:

(JSC::loadAndEvaluateModule):
(JSC::loadModule):

• runtime/JSModuleLoader.cpp:

(JSC::JSModuleLoader::provide):

• runtime/JSModuleLoader.h:
• runtime/JSSourceCode.cpp: Added.

(JSC::JSSourceCode::destroy):

• runtime/JSSourceCode.h: Added.

(JSC::JSSourceCode::createStructure):
(JSC::JSSourceCode::create):
(JSC::JSSourceCode::sourceCode):
(JSC::JSSourceCode::JSSourceCode):

• runtime/JSType.h:
• runtime/ModuleLoaderPrototype.cpp:

(JSC::moduleLoaderPrototypeParseModule):

• runtime/VM.cpp:

(JSC::VM::VM):

• runtime/VM.h:

Source/WebCore:

Now SourceOrigin is correctly propagated through the module pipeline.
So the error reported by http/tests/security/contentSecurityPolicy/module-eval-blocked-expected.html
is updated.

• ForwardingHeaders/runtime/JSSourceCode.h: Added.
• bindings/js/JSDOMPromise.h:

(WebCore::DeferredPromise::resolveWithCallback):

• bindings/js/ScriptModuleLoader.cpp:

(WebCore::ScriptModuleLoader::notifyFinished):

LayoutTests:

• http/tests/security/contentSecurityPolicy/module-eval-blocked-expected.txt:

File:

• trunk/Source/JavaScriptCore/runtime/JSModuleLoader.h (modified) (2 diffs)

trunk/Source/JavaScriptCore/runtime/JSModuleLoader.h

@@ -33 +33 @@
 class JSInternalPromise;
 class JSModuleNamespaceObject;
+class SourceCode;
 
 class JSModuleLoader : public JSNonFinalObject {
@@ -63 +64 @@
 
     // APIs to control the module loader.
-    JSValue provide(ExecState*, JSValue key, Status, const String&);
+    JSValue provide(ExecState*, JSValue key, Status, const SourceCode&);
     JSInternalPromise* loadAndEvaluateModule(ExecState*, JSValue moduleName, JSValue referrer, JSValue initiator);
     JSInternalPromise* loadModule(ExecState*, JSValue moduleName, JSValue referrer, JSValue initiator);