Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(971)

Unified Diff: Source/core/frame/Frame.cpp

Issue 1187483004: Simplify WindowProxy handoff in WebFrame::swap(). (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Moo Created 5 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « Source/core/frame/Frame.h ('k') | Source/web/WebFrame.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/frame/Frame.cpp
diff --git a/Source/core/frame/Frame.cpp b/Source/core/frame/Frame.cpp
index 58e7d90971df8449c3d2bdc69ce2da5e12fe01c1..127d4ac26f229b0d97a73ef2a34aa5cec3f4dc15 100644
--- a/Source/core/frame/Frame.cpp
+++ b/Source/core/frame/Frame.cpp
@@ -158,15 +158,10 @@ ChromeClient& Frame::chromeClient() const
return emptyChromeClient();
}
-void Frame::prepareSwapFrom(Frame* old)
-{
- WindowProxyManager* oldManager = old->windowProxyManager();
- oldManager->clearForNavigation();
-}
-
void Frame::finishSwapFrom(Frame* old)
{
WindowProxyManager* oldManager = old->windowProxyManager();
+ oldManager->clearForNavigation();
windowProxyManager()->takeGlobalFrom(oldManager);
}
« no previous file with comments | « Source/core/frame/Frame.h ('k') | Source/web/WebFrame.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698