Change Modulator functions to use ScriptState instead of LocalFrame

third_party/WebKit/Source/core/dom/Modulator.cpp

 // Copyright 2017 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "core/dom/Modulator.h"
 
 #include "bindings/core/v8/ScriptState.h"
 #include "bindings/core/v8/V8Binding.h"
 
 namespace blink {
 
 namespace {
 const char kPerContextDataKey[] = "Modulator";
+}  // namespace
 
-V8PerContextData* getPerContextData(LocalFrame* frame) {
-  ScriptState* scriptState = toScriptStateForMainWorld(frame);
+Modulator* Modulator::from(ScriptState* scriptState) {
   if (!scriptState)
     return nullptr;
-  return scriptState->perContextData();
-}
-}  // namespace
-
-Modulator* Modulator::from(LocalFrame* frame) {
-  return from(getPerContextData(frame));
-}
-
-Modulator* Modulator::from(V8PerContextData* perContextData) {
+  V8PerContextData* perContextData = scriptState->perContextData();
   if (!perContextData)
     return nullptr;
   return static_cast<Modulator*>(perContextData->getData(kPerContextDataKey));
 }
 
 Modulator::~Modulator() {}
 
-void Modulator::setModulator(LocalFrame* frame, Modulator* modulator) {
-  V8PerContextData* perContextData = getPerContextData(frame);
+void Modulator::setModulator(ScriptState* scriptState, Modulator* modulator) {
+  DCHECK(scriptState);
+  V8PerContextData* perContextData = scriptState->perContextData();
   DCHECK(perContextData);
   perContextData->addData(kPerContextDataKey, modulator);
 }
 
-void Modulator::clearModulator(LocalFrame* frame) {
-  V8PerContextData* perContextData = getPerContextData(frame);
+void Modulator::clearModulator(ScriptState* scriptState) {
+  DCHECK(scriptState);
+  V8PerContextData* perContextData = scriptState->perContextData();
   DCHECK(perContextData);
   perContextData->clearData(kPerContextDataKey);
 }
 
 KURL Modulator::resolveModuleSpecifier(const String& moduleRequest,
                                        const KURL& baseURL) {
   // Step 1. Apply the URL parser to specifier. If the result is not failure,
   // return the result.
   KURL url(KURL(), moduleRequest);
   if (url.isValid())
@@ skipping 11 matching lines @@
   // script's base URL as the base URL.
   DCHECK(baseURL.isValid());
   KURL absoluteURL(baseURL, moduleRequest);
   if (absoluteURL.isValid())
     return absoluteURL;
 
   return KURL();
 }
 
 }  // namespace blink