Changeset 223777 in webkit for trunk/Source/JavaScriptCore/runtime/JSModuleLoader.cpp

Timestamp:

Oct 20, 2017, 10:58:32 AM (8 years ago)

Author:

Matt Lewis

Message:

Unreviewed, rolling out r223744, r223750, and r223751.
​https://bugs.webkit.org/show_bug.cgi?id=178594

These caused consistent failures in test that existed and were
added in the patches. (Requested by mlewis13 on #webkit).

Reverted changesets:

"[JSC] ScriptFetcher should be notified directly from module
pipeline"
​https://bugs.webkit.org/show_bug.cgi?id=178340
​https://trac.webkit.org/changeset/223744

"Unreviewed, fix changed line number in test expect files"
​https://bugs.webkit.org/show_bug.cgi?id=178340
​https://trac.webkit.org/changeset/223750

"Unreviewed, follow up to reflect comments"
​https://bugs.webkit.org/show_bug.cgi?id=178340
​https://trac.webkit.org/changeset/223751

Patch by Commit Queue <​[email protected]> on 2017-10-20

File:

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

trunk/Source/JavaScriptCore/runtime/JSModuleLoader.cpp

@@ -40 +40 @@
 #include "JSModuleEnvironment.h"
 #include "JSModuleRecord.h"
-#include "JSScriptFetcher.h"
 #include "JSSourceCode.h"
 #include "ModuleAnalyzer.h"
@@ -293 +292 @@
 }
 
-static Identifier jsValueToModuleKey(ExecState* exec, JSValue value)
-{
-    if (value.isSymbol())
-        return Identifier::fromUid(jsCast<Symbol*>(value)->privateName());
-    ASSERT(value.isString());
-    return asString(value)->toIdentifier(exec);
-}
-
-JSValue JSModuleLoader::notifyCompleted(ExecState* exec, JSValue scriptFetcher, JSValue key)
-{
-    auto* fetcherWrapper = jsDynamicCast<JSScriptFetcher*>(exec->vm(), scriptFetcher);
-    if (!fetcherWrapper)
-        return jsUndefined();
-    auto* fetcher = fetcherWrapper->fetcher();
-    if (!fetcher)
-        return jsUndefined();
-
-    auto moduleKey = jsValueToModuleKey(exec, key);
-    fetcher->notifyLoadCompleted(*moduleKey.impl());
-    return jsUndefined();
-}
-
-JSValue JSModuleLoader::notifyFailed(ExecState* exec, JSValue scriptFetcher, JSValue errorValue)
-{
-    auto* fetcherWrapper = jsDynamicCast<JSScriptFetcher*>(exec->vm(), scriptFetcher);
-    if (!fetcherWrapper)
-        return jsUndefined();
-    auto* fetcher = fetcherWrapper->fetcher();
-    if (!fetcher)
-        return jsUndefined();
-    fetcher->notifyLoadFailed(exec, errorValue);
-    return jsUndefined();
-}
-
 } // namespace JSC