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

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: Bug fixed Created 4 years 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 24 matching lines...) Expand all
35 #include "core/frame/FrameConsole.h" 35 #include "core/frame/FrameConsole.h"
36 #include "core/frame/FrameHost.h" 36 #include "core/frame/FrameHost.h"
37 #include "core/frame/FrameView.h" 37 #include "core/frame/FrameView.h"
38 #include "core/frame/RemoteFrame.h" 38 #include "core/frame/RemoteFrame.h"
39 #include "core/frame/RemoteFrameView.h" 39 #include "core/frame/RemoteFrameView.h"
40 #include "core/frame/Settings.h" 40 #include "core/frame/Settings.h"
41 #include "core/frame/VisualViewport.h" 41 #include "core/frame/VisualViewport.h"
42 #include "core/html/HTMLMediaElement.h" 42 #include "core/html/HTMLMediaElement.h"
43 #include "core/inspector/ConsoleMessageStorage.h" 43 #include "core/inspector/ConsoleMessageStorage.h"
44 #include "core/inspector/InspectorInstrumentation.h" 44 #include "core/inspector/InspectorInstrumentation.h"
45 #include "core/layout/LayoutView.h"
pdr. 2016/12/13 05:51:16 Nit: Is this needed anymore?
yigu 2016/12/14 21:07:27 Done.
45 #include "core/layout/TextAutosizer.h" 46 #include "core/layout/TextAutosizer.h"
46 #include "core/page/AutoscrollController.h" 47 #include "core/page/AutoscrollController.h"
47 #include "core/page/ChromeClient.h" 48 #include "core/page/ChromeClient.h"
48 #include "core/page/ContextMenuController.h" 49 #include "core/page/ContextMenuController.h"
49 #include "core/page/DragController.h" 50 #include "core/page/DragController.h"
50 #include "core/page/FocusController.h" 51 #include "core/page/FocusController.h"
51 #include "core/page/PointerLockController.h" 52 #include "core/page/PointerLockController.h"
52 #include "core/page/ScopedPageSuspender.h" 53 #include "core/page/ScopedPageSuspender.h"
53 #include "core/page/ValidationMessageClient.h" 54 #include "core/page/ValidationMessageClient.h"
54 #include "core/page/scrolling/ScrollingCoordinator.h" 55 #include "core/page/scrolling/ScrollingCoordinator.h"
(...skipping 102 matching lines...) Expand 10 before | Expand all | Expand 10 after
157 : ViewportDescription(); 158 : ViewportDescription();
158 } 159 }
159 160
160 ScrollingCoordinator* Page::scrollingCoordinator() { 161 ScrollingCoordinator* Page::scrollingCoordinator() {
161 if (!m_scrollingCoordinator && m_settings->acceleratedCompositingEnabled()) 162 if (!m_scrollingCoordinator && m_settings->acceleratedCompositingEnabled())
162 m_scrollingCoordinator = ScrollingCoordinator::create(this); 163 m_scrollingCoordinator = ScrollingCoordinator::create(this);
163 164
164 return m_scrollingCoordinator.get(); 165 return m_scrollingCoordinator.get();
165 } 166 }
166 167
167 String Page::mainThreadScrollingReasonsAsText() { 168 String Page::mainThreadScrollingReasonsAsText(const Frame& frame) {
168 if (ScrollingCoordinator* scrollingCoordinator = this->scrollingCoordinator()) 169 if (ScrollingCoordinator* scrollingCoordinator = this->scrollingCoordinator())
169 return scrollingCoordinator->mainThreadScrollingReasonsAsText(); 170 return scrollingCoordinator->mainThreadScrollingReasonsAsText(&frame);
170 171
171 return String(); 172 return String();
172 } 173 }
173 174
174 ClientRectList* Page::nonFastScrollableRects(const LocalFrame* frame) { 175 ClientRectList* Page::nonFastScrollableRects(const LocalFrame* frame) {
175 if (ScrollingCoordinator* scrollingCoordinator = 176 if (ScrollingCoordinator* scrollingCoordinator =
176 this->scrollingCoordinator()) { 177 this->scrollingCoordinator()) {
177 // Hits in compositing/iframes/iframe-composited-scrolling.html 178 // Hits in compositing/iframes/iframe-composited-scrolling.html
178 DisableCompositingQueryAsserts disabler; 179 DisableCompositingQueryAsserts disabler;
179 scrollingCoordinator->updateAfterCompositingChangeIfNeeded(); 180 scrollingCoordinator->updateAfterCompositingChangeIfNeeded();
(...skipping 359 matching lines...) Expand 10 before | Expand all | Expand 10 after
539 : chromeClient(nullptr), 540 : chromeClient(nullptr),
540 contextMenuClient(nullptr), 541 contextMenuClient(nullptr),
541 editorClient(nullptr), 542 editorClient(nullptr),
542 spellCheckerClient(nullptr) {} 543 spellCheckerClient(nullptr) {}
543 544
544 Page::PageClients::~PageClients() {} 545 Page::PageClients::~PageClients() {}
545 546
546 template class CORE_TEMPLATE_EXPORT Supplement<Page>; 547 template class CORE_TEMPLATE_EXPORT Supplement<Page>;
547 548
548 } // namespace blink 549 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698