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

Side by Side Diff: Source/core/page/Page.cpp

Issue 46163008: Revert "Re-land deferred compositing updates with fixed assumptions" (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 7 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 | Annotate | Revision Log
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 211 matching lines...) Expand 10 before | Expand all | Expand 10 after
222 ScrollingCoordinator* Page::scrollingCoordinator() 222 ScrollingCoordinator* Page::scrollingCoordinator()
223 { 223 {
224 if (!m_scrollingCoordinator && m_settings->scrollingCoordinatorEnabled()) 224 if (!m_scrollingCoordinator && m_settings->scrollingCoordinatorEnabled())
225 m_scrollingCoordinator = ScrollingCoordinator::create(this); 225 m_scrollingCoordinator = ScrollingCoordinator::create(this);
226 226
227 return m_scrollingCoordinator.get(); 227 return m_scrollingCoordinator.get();
228 } 228 }
229 229
230 String Page::mainThreadScrollingReasonsAsText() 230 String Page::mainThreadScrollingReasonsAsText()
231 { 231 {
232 if (Document* document = m_mainFrame->document())
233 document->updateLayout();
234
232 if (ScrollingCoordinator* scrollingCoordinator = this->scrollingCoordinator( )) 235 if (ScrollingCoordinator* scrollingCoordinator = this->scrollingCoordinator( ))
233 return scrollingCoordinator->mainThreadScrollingReasonsAsText(); 236 return scrollingCoordinator->mainThreadScrollingReasonsAsText();
234 237
235 return String(); 238 return String();
236 } 239 }
237 240
238 PassRefPtr<ClientRectList> Page::nonFastScrollableRects(const Frame* frame) 241 PassRefPtr<ClientRectList> Page::nonFastScrollableRects(const Frame* frame)
239 { 242 {
240 if (Document* document = m_mainFrame->document()) 243 if (Document* document = m_mainFrame->document())
241 document->updateLayout(); 244 document->updateLayout();
(...skipping 372 matching lines...) Expand 10 before | Expand all | Expand 10 after
614 , inspectorClient(0) 617 , inspectorClient(0)
615 , backForwardClient(0) 618 , backForwardClient(0)
616 { 619 {
617 } 620 }
618 621
619 Page::PageClients::~PageClients() 622 Page::PageClients::~PageClients()
620 { 623 {
621 } 624 }
622 625
623 } // namespace WebCore 626 } // namespace WebCore
OLDNEW
« no previous file with comments | « Source/core/inspector/InspectorLayerTreeAgent.cpp ('k') | Source/core/page/scrolling/ScrollingCoordinator.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698