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

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

Issue 2531603003: Only scroll on main if the targeted frames need to scroll on main (Closed)
Patch Set: Resolve conflict Created 3 years, 12 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
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 Apple Inc. All 2 * Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 Apple Inc. All
3 * Rights Reserved. 3 * Rights Reserved.
4 * Copyright (C) 2008 Torch Mobile Inc. All rights reserved. 4 * Copyright (C) 2008 Torch Mobile Inc. All rights reserved.
5 * (http://www.torchmobile.com/) 5 * (http://www.torchmobile.com/)
6 * 6 *
7 * This library is free software; you can redistribute it and/or 7 * This library is free software; you can redistribute it and/or
8 * modify it under the terms of the GNU Library General Public 8 * modify it under the terms of the GNU Library General Public
9 * License as published by the Free Software Foundation; either 9 * License as published by the Free Software Foundation; either
10 * version 2 of the License, or (at your option) any later version. 10 * version 2 of the License, or (at your option) any later version.
(...skipping 146 matching lines...) Expand 10 before | Expand all | Expand 10 after
157 : ViewportDescription(); 157 : ViewportDescription();
158 } 158 }
159 159
160 ScrollingCoordinator* Page::scrollingCoordinator() { 160 ScrollingCoordinator* Page::scrollingCoordinator() {
161 if (!m_scrollingCoordinator && m_settings->acceleratedCompositingEnabled()) 161 if (!m_scrollingCoordinator && m_settings->acceleratedCompositingEnabled())
162 m_scrollingCoordinator = ScrollingCoordinator::create(this); 162 m_scrollingCoordinator = ScrollingCoordinator::create(this);
163 163
164 return m_scrollingCoordinator.get(); 164 return m_scrollingCoordinator.get();
165 } 165 }
166 166
167 String Page::mainThreadScrollingReasonsAsText() {
168 if (ScrollingCoordinator* scrollingCoordinator = this->scrollingCoordinator())
169 return scrollingCoordinator->mainThreadScrollingReasonsAsText();
170
171 return String();
172 }
173
174 ClientRectList* Page::nonFastScrollableRects(const LocalFrame* frame) { 167 ClientRectList* Page::nonFastScrollableRects(const LocalFrame* frame) {
175 if (ScrollingCoordinator* scrollingCoordinator = 168 if (ScrollingCoordinator* scrollingCoordinator =
176 this->scrollingCoordinator()) { 169 this->scrollingCoordinator()) {
177 // Hits in compositing/iframes/iframe-composited-scrolling.html 170 // Hits in compositing/iframes/iframe-composited-scrolling.html
178 DisableCompositingQueryAsserts disabler; 171 DisableCompositingQueryAsserts disabler;
179 scrollingCoordinator->updateAfterCompositingChangeIfNeeded(); 172 scrollingCoordinator->updateAfterCompositingChangeIfNeeded();
180 } 173 }
181 174
182 if (!frame->view()->layerForScrolling()) 175 if (!frame->view()->layerForScrolling())
183 return ClientRectList::create(); 176 return ClientRectList::create();
(...skipping 355 matching lines...) Expand 10 before | Expand all | Expand 10 after
539 : chromeClient(nullptr), 532 : chromeClient(nullptr),
540 contextMenuClient(nullptr), 533 contextMenuClient(nullptr),
541 editorClient(nullptr), 534 editorClient(nullptr),
542 spellCheckerClient(nullptr) {} 535 spellCheckerClient(nullptr) {}
543 536
544 Page::PageClients::~PageClients() {} 537 Page::PageClients::~PageClients() {}
545 538
546 template class CORE_TEMPLATE_EXPORT Supplement<Page>; 539 template class CORE_TEMPLATE_EXPORT Supplement<Page>;
547 540
548 } // namespace blink 541 } // namespace blink
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/core/page/Page.h ('k') | third_party/WebKit/Source/core/page/scrolling/ScrollingCoordinator.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698