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

Unified Diff: third_party/WebKit/Source/core/testing/DummyModulator.cpp

Issue 2850673002: Move a RegisterModuleScript() call to ModuleScript::Create() (Closed)
Patch Set: Fix tests Created 3 years, 8 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « third_party/WebKit/Source/core/testing/DummyModulator.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: third_party/WebKit/Source/core/testing/DummyModulator.cpp
diff --git a/third_party/WebKit/Source/core/testing/DummyModulator.cpp b/third_party/WebKit/Source/core/testing/DummyModulator.cpp
index 3978fc079990615fbeb5b8ace61665d766dafff6..59644811f77d48711558033ad11ba61ea64a70f5 100644
--- a/third_party/WebKit/Source/core/testing/DummyModulator.cpp
+++ b/third_party/WebKit/Source/core/testing/DummyModulator.cpp
@@ -5,14 +5,36 @@
#include "core/testing/DummyModulator.h"
#include "bindings/core/v8/ScriptValue.h"
+#include "core/dom/ScriptModuleResolver.h"
namespace blink {
-DummyModulator::DummyModulator() {}
+namespace {
+
+class EmptyScriptModuleResolver final : public ScriptModuleResolver {
+ public:
+ EmptyScriptModuleResolver() {}
+
+ // We ignore RegisterModuleScript() calls caused by
+ // ModuleScript::CreateForTest().
+ void RegisterModuleScript(ModuleScript*) override {}
+
+ ScriptModule Resolve(const String& specifier,
+ const ScriptModule& referrer,
+ ExceptionState&) override {
+ NOTREACHED();
+ return ScriptModule();
+ }
+};
+
+} // namespace
+
+DummyModulator::DummyModulator() : resolver_(new EmptyScriptModuleResolver()) {}
DummyModulator::~DummyModulator() {}
DEFINE_TRACE(DummyModulator) {
+ visitor->Trace(resolver_);
Modulator::Trace(visitor);
}
@@ -27,8 +49,7 @@ SecurityOrigin* DummyModulator::GetSecurityOrigin() {
}
ScriptModuleResolver* DummyModulator::GetScriptModuleResolver() {
- NOTREACHED();
- return nullptr;
+ return resolver_.Get();
}
WebTaskRunner* DummyModulator::TaskRunner() {
« no previous file with comments | « third_party/WebKit/Source/core/testing/DummyModulator.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698