Commit d0118cdf authored by Hiroshige Hayashizaki's avatar Hiroshige Hayashizaki Committed by Commit Bot

Remove ScriptModule::Status()/ErrorCompletion()

They should be no longer used in Blink, as the spec update
https://github.com/whatwg/html/pull/2991
removes the references them from the HTML spec.

Bug: 763597
Change-Id: I515b12a36a8e6f97b72ef6695a05da2f89ecfa8e
Reviewed-on: https://chromium-review.googlesource.com/802465
Commit-Queue: Hiroshige Hayashizaki <hiroshige@chromium.org>
Reviewed-by: default avatarHiroki Nakagawa <nhiroki@chromium.org>
Reviewed-by: default avatarKouhei Ueno <kouhei@chromium.org>
Cr-Commit-Position: refs/heads/master@{#525235}
parent 9aae0831
...@@ -13,25 +13,6 @@ ...@@ -13,25 +13,6 @@
namespace blink { namespace blink {
const char* ScriptModuleStateToString(ScriptModuleState state) {
switch (state) {
case ScriptModuleState::kUninstantiated:
return "uninstantiated";
case ScriptModuleState::kInstantiating:
return "instantinating";
case ScriptModuleState::kInstantiated:
return "instantiated";
case ScriptModuleState::kEvaluating:
return "evaluating";
case ScriptModuleState::kEvaluated:
return "evaluated";
case ScriptModuleState::kErrored:
return "errored";
}
NOTREACHED();
return "";
}
ScriptModule::ScriptModule() {} ScriptModule::ScriptModule() {}
ScriptModule::ScriptModule(v8::Isolate* isolate, v8::Local<v8::Module> module) ScriptModule::ScriptModule(v8::Isolate* isolate, v8::Local<v8::Module> module)
...@@ -146,25 +127,9 @@ Vector<TextPosition> ScriptModule::ModuleRequestPositions( ...@@ -146,25 +127,9 @@ Vector<TextPosition> ScriptModule::ModuleRequestPositions(
return ret; return ret;
} }
ScriptModuleState ScriptModule::Status(ScriptState* script_state) {
DCHECK(!IsNull());
v8::Local<v8::Module> module = module_->NewLocal(script_state->GetIsolate());
return module->GetStatus();
}
v8::Local<v8::Value> ScriptModule::ErrorCompletion(ScriptState* script_state) {
DCHECK(!IsNull());
DCHECK_EQ(ScriptModuleState::kErrored, Status(script_state));
v8::Local<v8::Module> module = module_->NewLocal(script_state->GetIsolate());
return module->GetException();
}
v8::Local<v8::Value> ScriptModule::V8Namespace(v8::Isolate* isolate) { v8::Local<v8::Value> ScriptModule::V8Namespace(v8::Isolate* isolate) {
DCHECK(!IsNull()); DCHECK(!IsNull());
v8::Local<v8::Module> module = module_->NewLocal(isolate); v8::Local<v8::Module> module = module_->NewLocal(isolate);
DCHECK_EQ(ScriptModuleState::kEvaluated, module->GetStatus());
return module->GetModuleNamespace(); return module->GetModuleNamespace();
} }
......
...@@ -22,12 +22,6 @@ namespace blink { ...@@ -22,12 +22,6 @@ namespace blink {
class ExceptionState; class ExceptionState;
// Correspond to TC39 ModuleRecord.[[Status]]
// TODO(kouhei): Add URL after https://github.com/tc39/ecma262/pull/916 is
// merged.
using ScriptModuleState = v8::Module::Status;
const char* ScriptModuleStateToString(ScriptModuleState);
// ScriptModule wraps a handle to a v8::Module for use in core. // ScriptModule wraps a handle to a v8::Module for use in core.
// //
// Using ScriptModules needs a ScriptState and its scope to operate in. You // Using ScriptModules needs a ScriptState and its scope to operate in. You
...@@ -62,11 +56,6 @@ class CORE_EXPORT ScriptModule final { ...@@ -62,11 +56,6 @@ class CORE_EXPORT ScriptModule final {
Vector<String> ModuleRequests(ScriptState*); Vector<String> ModuleRequests(ScriptState*);
Vector<TextPosition> ModuleRequestPositions(ScriptState*); Vector<TextPosition> ModuleRequestPositions(ScriptState*);
ScriptModuleState Status(ScriptState*);
// Returns record's [[ErrorCompletion]] field's [[Value]].
// Should only be used via ModulatorImpl::GetError()
v8::Local<v8::Value> ErrorCompletion(ScriptState*);
inline bool operator==(const blink::ScriptModule& other) const; inline bool operator==(const blink::ScriptModule& other) const;
bool operator!=(const blink::ScriptModule& other) const { bool operator!=(const blink::ScriptModule& other) const {
......
...@@ -88,8 +88,6 @@ TEST(ScriptModuleTest, compileSuccess) { ...@@ -88,8 +88,6 @@ TEST(ScriptModuleTest, compileSuccess) {
ScriptFetchOptions(), kSharableCrossOrigin, ScriptFetchOptions(), kSharableCrossOrigin,
TextPosition::MinimumPosition(), ASSERT_NO_EXCEPTION); TextPosition::MinimumPosition(), ASSERT_NO_EXCEPTION);
ASSERT_FALSE(module.IsNull()); ASSERT_FALSE(module.IsNull());
EXPECT_EQ(ScriptModuleState::kUninstantiated,
module.Status(scope.GetScriptState()));
} }
TEST(ScriptModuleTest, compileFail) { TEST(ScriptModuleTest, compileFail) {
...@@ -210,12 +208,6 @@ TEST(ScriptModuleTest, instantiateWithDeps) { ...@@ -210,12 +208,6 @@ TEST(ScriptModuleTest, instantiateWithDeps) {
ASSERT_FALSE(module.IsNull()); ASSERT_FALSE(module.IsNull());
ScriptValue exception = module.Instantiate(scope.GetScriptState()); ScriptValue exception = module.Instantiate(scope.GetScriptState());
ASSERT_TRUE(exception.IsEmpty()); ASSERT_TRUE(exception.IsEmpty());
EXPECT_EQ(ScriptModuleState::kInstantiated,
module_a.Status(scope.GetScriptState()));
EXPECT_EQ(ScriptModuleState::kInstantiated,
module_b.Status(scope.GetScriptState()));
EXPECT_EQ(ScriptModuleState::kInstantiated,
module.Status(scope.GetScriptState()));
ASSERT_EQ(2u, resolver->ResolveCount()); ASSERT_EQ(2u, resolver->ResolveCount());
EXPECT_EQ("a", resolver->Specifiers()[0]); EXPECT_EQ("a", resolver->Specifiers()[0]);
......
...@@ -76,18 +76,16 @@ ModuleScript* CreateReferrerModuleScript(Modulator* modulator, ...@@ -76,18 +76,16 @@ ModuleScript* CreateReferrerModuleScript(Modulator* modulator,
return referrer_module_script; return referrer_module_script;
} }
ModuleScript* CreateTargetModuleScript( ModuleScript* CreateTargetModuleScript(Modulator* modulator,
Modulator* modulator, V8TestingScope& scope,
V8TestingScope& scope, bool has_parse_error = false) {
ScriptModuleState state = ScriptModuleState::kInstantiated) {
ScriptModule record = ScriptModule::Compile( ScriptModule record = ScriptModule::Compile(
scope.GetIsolate(), "export const pi = 3.14;", "target.js", scope.GetIsolate(), "export const pi = 3.14;", "target.js",
ScriptFetchOptions(), kSharableCrossOrigin, ScriptFetchOptions(), kSharableCrossOrigin,
TextPosition::MinimumPosition(), ASSERT_NO_EXCEPTION); TextPosition::MinimumPosition(), ASSERT_NO_EXCEPTION);
KURL url("https://example.com/target.js"); KURL url("https://example.com/target.js");
auto* module_script = ModuleScript::CreateForTest(modulator, record, url); auto* module_script = ModuleScript::CreateForTest(modulator, record, url);
if (state != ScriptModuleState::kInstantiated) { if (has_parse_error) {
EXPECT_EQ(ScriptModuleState::kErrored, state);
v8::Local<v8::Value> error = v8::Local<v8::Value> error =
V8ThrowException::CreateError(scope.GetIsolate(), "hoge"); V8ThrowException::CreateError(scope.GetIsolate(), "hoge");
module_script->SetParseErrorAndClearRecord( module_script->SetParseErrorAndClearRecord(
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment