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 1d711cb31da6bb8da232d4b21a31b29fb9ba14e7..a84b71892cac14c505bd9e08314d7d05e9c0933a 100644 |
--- a/third_party/WebKit/Source/core/frame/LocalFrame.cpp |
+++ b/third_party/WebKit/Source/core/frame/LocalFrame.cpp |
@@ -362,10 +362,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,7 +491,7 @@ void LocalFrame::printNavigationWarning(const String& message) { |
} |
WindowProxyManagerBase* LocalFrame::getWindowProxyManager() const { |
- return m_script->getWindowProxyManager(); |
+ return m_script; |
} |
bool LocalFrame::shouldClose() { |
@@ -523,7 +519,7 @@ LocalDOMWindow* LocalFrame::domWindow() const { |
void LocalFrame::setDOMWindow(LocalDOMWindow* domWindow) { |
if (domWindow) |
- script().clearWindowProxy(); |
+ script().clearForNavigation(); |
if (this->domWindow()) |
this->domWindow()->reset(); |
@@ -884,7 +880,7 @@ inline LocalFrame::LocalFrame(FrameLoaderClient* client, |
client->frameBlameContext())), |
m_loader(this), |
m_navigationScheduler(NavigationScheduler::create(this)), |
- m_script(ScriptController::create(this)), |
+ m_script(ScriptController::create(*this)), |
m_editor(Editor::create(*this)), |
m_spellChecker(SpellChecker::create(*this)), |
m_selection(FrameSelection::create(*this)), |