Index: third_party/WebKit/Source/core/frame/LocalFrame.cpp |
diff --git a/third_party/WebKit/Source/core/frame/LocalFrame.cpp b/third_party/WebKit/Source/core/frame/LocalFrame.cpp |
index b698e348d9b5176d89e108eb84b7ddabacad4367..18418682d87125e18486e78534e329b926403f40 100644 |
--- a/third_party/WebKit/Source/core/frame/LocalFrame.cpp |
+++ b/third_party/WebKit/Source/core/frame/LocalFrame.cpp |
@@ -363,10 +363,6 @@ DEFINE_TRACE(LocalFrame) { |
Supplementable<LocalFrame>::trace(visitor); |
} |
-WindowProxy* LocalFrame::windowProxy(DOMWrapperWorld& world) { |
- return m_script->windowProxy(world); |
-} |
- |
void LocalFrame::navigate(Document& originDocument, |
const KURL& url, |
bool replaceCurrentItem, |
@@ -495,10 +491,6 @@ void LocalFrame::printNavigationWarning(const String& message) { |
ConsoleMessage::create(JSMessageSource, WarningMessageLevel, message)); |
} |
-WindowProxyManagerBase* LocalFrame::getWindowProxyManager() const { |
- return m_script->getWindowProxyManager(); |
-} |
- |
bool LocalFrame::shouldClose() { |
// TODO(dcheng): This should be fixed to dispatch beforeunload events to |
// both local and remote frames. |
@@ -853,12 +845,13 @@ inline LocalFrame::LocalFrame(FrameLoaderClient* client, |
FrameOwner* owner, |
InterfaceProvider* interfaceProvider, |
InterfaceRegistry* interfaceRegistry) |
- : Frame(client, host, owner), |
+ : Frame(client, host, owner, LocalWindowProxyManager::create(*this)), |
m_frameScheduler(page()->chromeClient().createFrameScheduler( |
client->frameBlameContext())), |
m_loader(this), |
m_navigationScheduler(NavigationScheduler::create(this)), |
- m_script(ScriptController::create(this)), |
+ m_script(ScriptController::create( |
+ static_cast<LocalWindowProxyManager*>(getWindowProxyManager()))), |
m_editor(Editor::create(*this)), |
m_spellChecker(SpellChecker::create(*this)), |
m_selection(FrameSelection::create(*this)), |