Change Modulator functions to use ScriptState instead of LocalFrame

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

Index: third_party/WebKit/Source/core/dom/Modulator.cpp
diff --git a/third_party/WebKit/Source/core/dom/Modulator.cpp b/third_party/WebKit/Source/core/dom/Modulator.cpp
index 8350bcc85d1a7793228ec9bedffe24be699d122b..0406a7f522e16176d83f0f07e2236618def853f9 100644
--- a/third_party/WebKit/Source/core/dom/Modulator.cpp
+++ b/third_party/WebKit/Source/core/dom/Modulator.cpp
@@ -11,20 +11,12 @@ 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));
@@ -32,14 +24,16 @@ Modulator* Modulator::from(V8PerContextData* perContextData) {
 
 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);
 }