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

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

Issue 2743523002: Move FrameHost::m_globalRootScrollerController to Page (Closed)
Patch Set: Created 3 years, 9 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 36 matching lines...) Expand 10 before | Expand all | Expand 10 after
47 #include "core/layout/TextAutosizer.h" 47 #include "core/layout/TextAutosizer.h"
48 #include "core/page/AutoscrollController.h" 48 #include "core/page/AutoscrollController.h"
49 #include "core/page/ChromeClient.h" 49 #include "core/page/ChromeClient.h"
50 #include "core/page/ContextMenuController.h" 50 #include "core/page/ContextMenuController.h"
51 #include "core/page/DragController.h" 51 #include "core/page/DragController.h"
52 #include "core/page/FocusController.h" 52 #include "core/page/FocusController.h"
53 #include "core/page/PointerLockController.h" 53 #include "core/page/PointerLockController.h"
54 #include "core/page/ScopedPageSuspender.h" 54 #include "core/page/ScopedPageSuspender.h"
55 #include "core/page/ValidationMessageClient.h" 55 #include "core/page/ValidationMessageClient.h"
56 #include "core/page/scrolling/ScrollingCoordinator.h" 56 #include "core/page/scrolling/ScrollingCoordinator.h"
57 #include "core/page/scrolling/TopDocumentRootScrollerController.h"
57 #include "core/paint/PaintLayer.h" 58 #include "core/paint/PaintLayer.h"
58 #include "platform/WebFrameScheduler.h" 59 #include "platform/WebFrameScheduler.h"
59 #include "platform/graphics/GraphicsLayer.h" 60 #include "platform/graphics/GraphicsLayer.h"
60 #include "platform/loader/fetch/ResourceFetcher.h" 61 #include "platform/loader/fetch/ResourceFetcher.h"
61 #include "platform/plugins/PluginData.h" 62 #include "platform/plugins/PluginData.h"
62 #include "public/platform/Platform.h" 63 #include "public/platform/Platform.h"
63 64
64 namespace blink { 65 namespace blink {
65 66
66 // Set of all live pages; includes internal Page objects that are 67 // Set of all live pages; includes internal Page objects that are
(...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after
98 m_autoscrollController(AutoscrollController::create(*this)), 99 m_autoscrollController(AutoscrollController::create(*this)),
99 m_chromeClient(pageClients.chromeClient), 100 m_chromeClient(pageClients.chromeClient),
100 m_dragCaret(DragCaret::create()), 101 m_dragCaret(DragCaret::create()),
101 m_dragController(DragController::create(this)), 102 m_dragController(DragController::create(this)),
102 m_focusController(FocusController::create(this)), 103 m_focusController(FocusController::create(this)),
103 m_contextMenuController( 104 m_contextMenuController(
104 ContextMenuController::create(this, pageClients.contextMenuClient)), 105 ContextMenuController::create(this, pageClients.contextMenuClient)),
105 m_pageScaleConstraintsSet(PageScaleConstraintsSet::create()), 106 m_pageScaleConstraintsSet(PageScaleConstraintsSet::create()),
106 m_pointerLockController(PointerLockController::create(this)), 107 m_pointerLockController(PointerLockController::create(this)),
107 m_browserControls(BrowserControls::create(*this)), 108 m_browserControls(BrowserControls::create(*this)),
109 m_globalRootScrollerController(
110 TopDocumentRootScrollerController::create(*this)),
108 m_mainFrame(nullptr), 111 m_mainFrame(nullptr),
109 m_editorClient(pageClients.editorClient), 112 m_editorClient(pageClients.editorClient),
110 m_spellCheckerClient(pageClients.spellCheckerClient), 113 m_spellCheckerClient(pageClients.spellCheckerClient),
111 m_useCounter(pageClients.chromeClient && 114 m_useCounter(pageClients.chromeClient &&
112 pageClients.chromeClient->isSVGImageChromeClient() 115 pageClients.chromeClient->isSVGImageChromeClient()
113 ? UseCounter::SVGImageContext 116 ? UseCounter::SVGImageContext
114 : UseCounter::DefaultContext), 117 : UseCounter::DefaultContext),
115 m_openedByDOM(false), 118 m_openedByDOM(false),
116 m_tabKeyCyclesThroughElements(true), 119 m_tabKeyCyclesThroughElements(true),
117 m_suspended(false), 120 m_suspended(false),
(...skipping 46 matching lines...) Expand 10 before | Expand all | Expand 10 after
164 } 167 }
165 168
166 BrowserControls& Page::browserControls() { 169 BrowserControls& Page::browserControls() {
167 return *m_browserControls; 170 return *m_browserControls;
168 } 171 }
169 172
170 const BrowserControls& Page::browserControls() const { 173 const BrowserControls& Page::browserControls() const {
171 return *m_browserControls; 174 return *m_browserControls;
172 } 175 }
173 176
177 TopDocumentRootScrollerController& Page::globalRootScrollerController() const {
178 return *m_globalRootScrollerController;
179 }
180
174 ClientRectList* Page::nonFastScrollableRects(const LocalFrame* frame) { 181 ClientRectList* Page::nonFastScrollableRects(const LocalFrame* frame) {
175 DisableCompositingQueryAsserts disabler; 182 DisableCompositingQueryAsserts disabler;
176 if (ScrollingCoordinator* scrollingCoordinator = 183 if (ScrollingCoordinator* scrollingCoordinator =
177 this->scrollingCoordinator()) { 184 this->scrollingCoordinator()) {
178 // Hits in compositing/iframes/iframe-composited-scrolling.html 185 // Hits in compositing/iframes/iframe-composited-scrolling.html
179 scrollingCoordinator->updateAfterCompositingChangeIfNeeded(); 186 scrollingCoordinator->updateAfterCompositingChangeIfNeeded();
180 } 187 }
181 188
182 GraphicsLayer* layer = 189 GraphicsLayer* layer =
183 frame->view()->layoutViewportScrollableArea()->layerForScrolling(); 190 frame->view()->layoutViewportScrollableArea()->layerForScrolling();
(...skipping 359 matching lines...) Expand 10 before | Expand all | Expand 10 after
543 visitor->trace(m_animator); 550 visitor->trace(m_animator);
544 visitor->trace(m_autoscrollController); 551 visitor->trace(m_autoscrollController);
545 visitor->trace(m_chromeClient); 552 visitor->trace(m_chromeClient);
546 visitor->trace(m_dragCaret); 553 visitor->trace(m_dragCaret);
547 visitor->trace(m_dragController); 554 visitor->trace(m_dragController);
548 visitor->trace(m_focusController); 555 visitor->trace(m_focusController);
549 visitor->trace(m_contextMenuController); 556 visitor->trace(m_contextMenuController);
550 visitor->trace(m_pointerLockController); 557 visitor->trace(m_pointerLockController);
551 visitor->trace(m_scrollingCoordinator); 558 visitor->trace(m_scrollingCoordinator);
552 visitor->trace(m_browserControls); 559 visitor->trace(m_browserControls);
560 visitor->trace(m_globalRootScrollerController);
553 visitor->trace(m_mainFrame); 561 visitor->trace(m_mainFrame);
554 visitor->trace(m_validationMessageClient); 562 visitor->trace(m_validationMessageClient);
555 visitor->trace(m_useCounter); 563 visitor->trace(m_useCounter);
556 visitor->trace(m_frameHost); 564 visitor->trace(m_frameHost);
557 Supplementable<Page>::trace(visitor); 565 Supplementable<Page>::trace(visitor);
558 PageVisibilityNotifier::trace(visitor); 566 PageVisibilityNotifier::trace(visitor);
559 } 567 }
560 568
561 void Page::layerTreeViewInitialized(WebLayerTreeView& layerTreeView, 569 void Page::layerTreeViewInitialized(WebLayerTreeView& layerTreeView,
562 FrameView* view) { 570 FrameView* view) {
(...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after
594 : chromeClient(nullptr), 602 : chromeClient(nullptr),
595 contextMenuClient(nullptr), 603 contextMenuClient(nullptr),
596 editorClient(nullptr), 604 editorClient(nullptr),
597 spellCheckerClient(nullptr) {} 605 spellCheckerClient(nullptr) {}
598 606
599 Page::PageClients::~PageClients() {} 607 Page::PageClients::~PageClients() {}
600 608
601 template class CORE_TEMPLATE_EXPORT Supplement<Page>; 609 template class CORE_TEMPLATE_EXPORT Supplement<Page>;
602 610
603 } // namespace blink 611 } // namespace blink
OLDNEW
« third_party/WebKit/Source/core/page/Page.h ('K') | « third_party/WebKit/Source/core/page/Page.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698