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

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

Issue 30383002: Merge 159961 "Defer the real work in updateCompositingLayers unt..." (Closed) Base URL: svn://svn.chromium.org/blink/branches/chromium/1675/
Patch Set: Created 7 years, 2 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 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 205 matching lines...) Expand 10 before | Expand all | Expand 10 after
216 ScrollingCoordinator* Page::scrollingCoordinator() 216 ScrollingCoordinator* Page::scrollingCoordinator()
217 { 217 {
218 if (!m_scrollingCoordinator && m_settings->scrollingCoordinatorEnabled()) 218 if (!m_scrollingCoordinator && m_settings->scrollingCoordinatorEnabled())
219 m_scrollingCoordinator = ScrollingCoordinator::create(this); 219 m_scrollingCoordinator = ScrollingCoordinator::create(this);
220 220
221 return m_scrollingCoordinator.get(); 221 return m_scrollingCoordinator.get();
222 } 222 }
223 223
224 String Page::mainThreadScrollingReasonsAsText() 224 String Page::mainThreadScrollingReasonsAsText()
225 { 225 {
226 if (Document* document = m_mainFrame->document())
227 document->updateLayout();
228
229 if (ScrollingCoordinator* scrollingCoordinator = this->scrollingCoordinator( )) 226 if (ScrollingCoordinator* scrollingCoordinator = this->scrollingCoordinator( ))
230 return scrollingCoordinator->mainThreadScrollingReasonsAsText(); 227 return scrollingCoordinator->mainThreadScrollingReasonsAsText();
231 228
232 return String(); 229 return String();
233 } 230 }
234 231
235 PassRefPtr<ClientRectList> Page::nonFastScrollableRects(const Frame* frame) 232 PassRefPtr<ClientRectList> Page::nonFastScrollableRects(const Frame* frame)
236 { 233 {
237 if (Document* document = m_mainFrame->document()) 234 if (Document* document = m_mainFrame->document())
238 document->updateLayout(); 235 document->updateLayout();
(...skipping 370 matching lines...) Expand 10 before | Expand all | Expand 10 after
609 , inspectorClient(0) 606 , inspectorClient(0)
610 , backForwardClient(0) 607 , backForwardClient(0)
611 { 608 {
612 } 609 }
613 610
614 Page::PageClients::~PageClients() 611 Page::PageClients::~PageClients()
615 { 612 {
616 } 613 }
617 614
618 } // namespace WebCore 615 } // namespace WebCore
OLDNEW
« no previous file with comments | « Source/core/inspector/InspectorLayerTreeAgent.cpp ('k') | Source/core/rendering/CompositedLayerMapping.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698