Index: third_party/WebKit/Source/bindings/core/v8/ScriptController.cpp |
diff --git a/third_party/WebKit/Source/bindings/core/v8/ScriptController.cpp b/third_party/WebKit/Source/bindings/core/v8/ScriptController.cpp |
index e204731d86922df51a5b495101d914d156f7a56e..1f94c6f472547851aa03ba867ae0b6e9965d2ec7 100644 |
--- a/third_party/WebKit/Source/bindings/core/v8/ScriptController.cpp |
+++ b/third_party/WebKit/Source/bindings/core/v8/ScriptController.cpp |
@@ -79,7 +79,7 @@ |
namespace blink { |
ScriptController::ScriptController(LocalFrame* frame) |
- : m_windowProxyManager(WindowProxyManager::create(*frame)) {} |
+ : m_windowProxyManager(LocalWindowProxyManager::create(*frame)) {} |
DEFINE_TRACE(ScriptController) { |
visitor->trace(m_windowProxyManager); |
@@ -209,8 +209,8 @@ void ScriptController::executeScriptInMainWorld( |
InspectorUpdateCountersEvent::data()); |
} |
-WindowProxy* ScriptController::windowProxy(DOMWrapperWorld& world) { |
- WindowProxy* windowProxy = m_windowProxyManager->windowProxy(world); |
+LocalWindowProxy* ScriptController::windowProxy(DOMWrapperWorld& world) { |
+ LocalWindowProxy* windowProxy = m_windowProxyManager->windowProxy(world); |
windowProxy->initializeIfNeeded(); |
return windowProxy; |
} |
@@ -441,7 +441,7 @@ void ScriptController::executeScriptInIsolatedWorld( |
RefPtr<DOMWrapperWorld> world = |
DOMWrapperWorld::ensureIsolatedWorld(isolate(), worldID, extensionGroup); |
- WindowProxy* isolatedWorldWindowProxy = windowProxy(*world); |
+ LocalWindowProxy* isolatedWorldWindowProxy = windowProxy(*world); |
ScriptState* scriptState = isolatedWorldWindowProxy->getScriptState(); |
if (!scriptState->contextIsValid()) |
return; |