Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(638)

Side by Side Diff: third_party/WebKit/Source/core/dom/ModulatorImpl.cpp

Issue 2839563002: [ES6 modules] Return previous error when an instantiation is reattempt. (Closed)
Patch Set: Created 3 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 // Copyright 2017 The Chromium Authors. All rights reserved. 1 // Copyright 2017 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "core/dom/ModulatorImpl.h" 5 #include "core/dom/ModulatorImpl.h"
6 6
7 #include "core/dom/Document.h" 7 #include "core/dom/Document.h"
8 #include "core/dom/ExecutionContext.h" 8 #include "core/dom/ExecutionContext.h"
9 #include "core/dom/ModuleMap.h" 9 #include "core/dom/ModuleMap.h"
10 #include "core/dom/ModuleScript.h" 10 #include "core/dom/ModuleScript.h"
(...skipping 110 matching lines...) Expand 10 before | Expand all | Expand 10 after
121 ScriptState::Scope scope(script_state_.Get()); 121 ScriptState::Scope scope(script_state_.Get());
122 return ScriptModule::Compile(script_state_->GetIsolate(), script_source, 122 return ScriptModule::Compile(script_state_->GetIsolate(), script_source,
123 url_str, access_control_status); 123 url_str, access_control_status);
124 } 124 }
125 125
126 ScriptValue ModulatorImpl::InstantiateModule(ScriptModule script_module) { 126 ScriptValue ModulatorImpl::InstantiateModule(ScriptModule script_module) {
127 ScriptState::Scope scope(script_state_.Get()); 127 ScriptState::Scope scope(script_state_.Get());
128 return script_module.Instantiate(script_state_.Get()); 128 return script_module.Instantiate(script_state_.Get());
129 } 129 }
130 130
131 ScriptValue ModulatorImpl::GetInstantiationError(
132 const ModuleScript* module_script) {
133 ScriptState::Scope scope(script_state_.Get());
134 return ScriptValue(
135 script_state_.Get(),
136 module_script->CreateInstantiationError(script_state_->GetIsolate()));
137 }
138
131 Vector<String> ModulatorImpl::ModuleRequestsFromScriptModule( 139 Vector<String> ModulatorImpl::ModuleRequestsFromScriptModule(
132 ScriptModule script_module) { 140 ScriptModule script_module) {
133 ScriptState::Scope scope(script_state_.Get()); 141 ScriptState::Scope scope(script_state_.Get());
134 return script_module.ModuleRequests(script_state_.Get()); 142 return script_module.ModuleRequests(script_state_.Get());
135 } 143 }
136 144
137 inline ExecutionContext* ModulatorImpl::GetExecutionContext() const { 145 inline ExecutionContext* ModulatorImpl::GetExecutionContext() const {
138 return ExecutionContext::From(script_state_.Get()); 146 return ExecutionContext::From(script_state_.Get());
139 } 147 }
140 148
141 DEFINE_TRACE(ModulatorImpl) { 149 DEFINE_TRACE(ModulatorImpl) {
142 Modulator::Trace(visitor); 150 Modulator::Trace(visitor);
143 visitor->Trace(fetcher_); 151 visitor->Trace(fetcher_);
144 visitor->Trace(map_); 152 visitor->Trace(map_);
145 visitor->Trace(loader_registry_); 153 visitor->Trace(loader_registry_);
146 visitor->Trace(tree_linker_registry_); 154 visitor->Trace(tree_linker_registry_);
147 visitor->Trace(script_module_resolver_); 155 visitor->Trace(script_module_resolver_);
148 } 156 }
149 157
150 DEFINE_TRACE_WRAPPERS(ModulatorImpl) { 158 DEFINE_TRACE_WRAPPERS(ModulatorImpl) {
151 visitor->TraceWrappers(map_); 159 visitor->TraceWrappers(map_);
152 } 160 }
153 161
154 } // namespace blink 162 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698