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

Unified Diff: third_party/WebKit/Source/web/WebFrame.cpp

Issue 1459023002: Compositor Animation Timelines: Fix frame swapping tests in WebFrameTest.cpp (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 1 month 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 | « third_party/WebKit/Source/core/page/scrolling/ScrollingCoordinator.cpp ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: third_party/WebKit/Source/web/WebFrame.cpp
diff --git a/third_party/WebKit/Source/web/WebFrame.cpp b/third_party/WebKit/Source/web/WebFrame.cpp
index 5479891ff3c8cfbf84a641131ada03b3a44981ef..f20483340d86e280234b494bd148408021b12811 100644
--- a/third_party/WebKit/Source/web/WebFrame.cpp
+++ b/third_party/WebKit/Source/web/WebFrame.cpp
@@ -90,6 +90,9 @@ bool WebFrame::swap(WebFrame* frame)
oldFrame->windowProxyManager()->clearForNavigation();
oldFrame->windowProxyManager()->releaseGlobals(globals);
+ if (oldFrame->isMainFrame())
+ oldFrame->page()->willSwapMainFrame(toCoreFrame(frame));
+
// Although the Document in this frame is now unloaded, many resources
// associated with the frame itself have not yet been freed yet.
oldFrame->detach(FrameDetachType::Swap);
aelias_OOO_until_Jul13 2015/11/19 01:19:58 Please plumb it from this detach() method instead.
loyso (OOO) 2015/11/19 03:55:00 Done.
loyso (OOO) 2015/11/19 03:59:32 p.s. WebFrame::detach is already called from Page:
« no previous file with comments | « third_party/WebKit/Source/core/page/scrolling/ScrollingCoordinator.cpp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698