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

Side by Side Diff: third_party/WebKit/Source/core/page/Page.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: Plumb it from detach method instead. 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 unified diff | Download patch
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 Apple Inc. All R ights Reserved. 2 * Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 Apple Inc. All R ights Reserved.
3 * Copyright (C) 2008 Torch Mobile Inc. All rights reserved. (http://www.torchmo bile.com/) 3 * Copyright (C) 2008 Torch Mobile Inc. All rights reserved. (http://www.torchmo bile.com/)
4 * 4 *
5 * This library is free software; you can redistribute it and/or 5 * This library is free software; you can redistribute it and/or
6 * modify it under the terms of the GNU Library General Public 6 * modify it under the terms of the GNU Library General Public
7 * License as published by the Free Software Foundation; either 7 * License as published by the Free Software Foundation; either
8 * version 2 of the License, or (at your option) any later version. 8 * version 2 of the License, or (at your option) any later version.
9 * This library is distributed in the hope that it will be useful, 9 * This library is distributed in the hope that it will be useful,
10 * but WITHOUT ANY WARRANTY; without even the implied warranty of 10 * but WITHOUT ANY WARRANTY; without even the implied warranty of
(...skipping 181 matching lines...) Expand 10 before | Expand all | Expand 10 after
192 } 192 }
193 193
194 void Page::setMainFrame(Frame* mainFrame) 194 void Page::setMainFrame(Frame* mainFrame)
195 { 195 {
196 // Should only be called during initialization or swaps between local and 196 // Should only be called during initialization or swaps between local and
197 // remote frames. 197 // remote frames.
198 // FIXME: Unfortunately we can't assert on this at the moment, because this 198 // FIXME: Unfortunately we can't assert on this at the moment, because this
199 // is called in the base constructor for both LocalFrame and RemoteFrame, 199 // is called in the base constructor for both LocalFrame and RemoteFrame,
200 // when the vtables for the derived classes have not yet been setup. 200 // when the vtables for the derived classes have not yet been setup.
201 m_mainFrame = mainFrame; 201 m_mainFrame = mainFrame;
202
203 if (scrollingCoordinator())
204 scrollingCoordinator()->onSetMainFrame();
205 }
206
207 void Page::willSwapMainFrame()
208 {
209 if (m_scrollingCoordinator)
210 m_scrollingCoordinator->willSwapMainFrame();
202 } 211 }
203 212
204 void Page::documentDetached(Document* document) 213 void Page::documentDetached(Document* document)
205 { 214 {
206 m_multisamplingChangedObservers.clear(); 215 m_multisamplingChangedObservers.clear();
207 m_pointerLockController->documentDetached(document); 216 m_pointerLockController->documentDetached(document);
208 m_contextMenuController->documentDetached(document); 217 m_contextMenuController->documentDetached(document);
209 if (m_validationMessageClient) 218 if (m_validationMessageClient)
210 m_validationMessageClient->documentDetached(*document); 219 m_validationMessageClient->documentDetached(*document);
211 m_originsUsingFeatures.documentDetached(*document); 220 m_originsUsingFeatures.documentDetached(*document);
(...skipping 404 matching lines...) Expand 10 before | Expand all | Expand 10 after
616 { 625 {
617 } 626 }
618 627
619 Page::PageClients::~PageClients() 628 Page::PageClients::~PageClients()
620 { 629 {
621 } 630 }
622 631
623 template class CORE_TEMPLATE_EXPORT WillBeHeapSupplement<Page>; 632 template class CORE_TEMPLATE_EXPORT WillBeHeapSupplement<Page>;
624 633
625 } // namespace blink 634 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698