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

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

Issue 2743523002: Move FrameHost::m_globalRootScrollerController to Page (Closed)
Patch Set: Rebase 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
« no previous file with comments | « third_party/WebKit/Source/core/page/Page.h ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 37 matching lines...) Expand 10 before | Expand all | Expand 10 after
48 #include "core/layout/TextAutosizer.h" 48 #include "core/layout/TextAutosizer.h"
49 #include "core/page/AutoscrollController.h" 49 #include "core/page/AutoscrollController.h"
50 #include "core/page/ChromeClient.h" 50 #include "core/page/ChromeClient.h"
51 #include "core/page/ContextMenuController.h" 51 #include "core/page/ContextMenuController.h"
52 #include "core/page/DragController.h" 52 #include "core/page/DragController.h"
53 #include "core/page/FocusController.h" 53 #include "core/page/FocusController.h"
54 #include "core/page/PointerLockController.h" 54 #include "core/page/PointerLockController.h"
55 #include "core/page/ScopedPageSuspender.h" 55 #include "core/page/ScopedPageSuspender.h"
56 #include "core/page/ValidationMessageClient.h" 56 #include "core/page/ValidationMessageClient.h"
57 #include "core/page/scrolling/ScrollingCoordinator.h" 57 #include "core/page/scrolling/ScrollingCoordinator.h"
58 #include "core/page/scrolling/TopDocumentRootScrollerController.h"
58 #include "core/paint/PaintLayer.h" 59 #include "core/paint/PaintLayer.h"
59 #include "platform/WebFrameScheduler.h" 60 #include "platform/WebFrameScheduler.h"
60 #include "platform/graphics/GraphicsLayer.h" 61 #include "platform/graphics/GraphicsLayer.h"
61 #include "platform/loader/fetch/ResourceFetcher.h" 62 #include "platform/loader/fetch/ResourceFetcher.h"
62 #include "platform/plugins/PluginData.h" 63 #include "platform/plugins/PluginData.h"
63 #include "public/platform/Platform.h" 64 #include "public/platform/Platform.h"
64 65
65 namespace blink { 66 namespace blink {
66 67
67 // Set of all live pages; includes internal Page objects that are 68 // Set of all live pages; includes internal Page objects that are
(...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after
100 m_chromeClient(pageClients.chromeClient), 101 m_chromeClient(pageClients.chromeClient),
101 m_dragCaret(DragCaret::create()), 102 m_dragCaret(DragCaret::create()),
102 m_dragController(DragController::create(this)), 103 m_dragController(DragController::create(this)),
103 m_focusController(FocusController::create(this)), 104 m_focusController(FocusController::create(this)),
104 m_contextMenuController( 105 m_contextMenuController(
105 ContextMenuController::create(this, pageClients.contextMenuClient)), 106 ContextMenuController::create(this, pageClients.contextMenuClient)),
106 m_pageScaleConstraintsSet(PageScaleConstraintsSet::create()), 107 m_pageScaleConstraintsSet(PageScaleConstraintsSet::create()),
107 m_pointerLockController(PointerLockController::create(this)), 108 m_pointerLockController(PointerLockController::create(this)),
108 m_browserControls(BrowserControls::create(*this)), 109 m_browserControls(BrowserControls::create(*this)),
109 m_eventHandlerRegistry(new EventHandlerRegistry(*this)), 110 m_eventHandlerRegistry(new EventHandlerRegistry(*this)),
111 m_globalRootScrollerController(
112 TopDocumentRootScrollerController::create(*this)),
110 m_visualViewport(VisualViewport::create(*this)), 113 m_visualViewport(VisualViewport::create(*this)),
111 m_mainFrame(nullptr), 114 m_mainFrame(nullptr),
112 m_editorClient(pageClients.editorClient), 115 m_editorClient(pageClients.editorClient),
113 m_spellCheckerClient(pageClients.spellCheckerClient), 116 m_spellCheckerClient(pageClients.spellCheckerClient),
114 m_useCounter(pageClients.chromeClient && 117 m_useCounter(pageClients.chromeClient &&
115 pageClients.chromeClient->isSVGImageChromeClient() 118 pageClients.chromeClient->isSVGImageChromeClient()
116 ? UseCounter::SVGImageContext 119 ? UseCounter::SVGImageContext
117 : UseCounter::DefaultContext), 120 : UseCounter::DefaultContext),
118 m_openedByDOM(false), 121 m_openedByDOM(false),
119 m_tabKeyCyclesThroughElements(true), 122 m_tabKeyCyclesThroughElements(true),
(...skipping 55 matching lines...) Expand 10 before | Expand all | Expand 10 after
175 } 178 }
176 179
177 EventHandlerRegistry& Page::eventHandlerRegistry() { 180 EventHandlerRegistry& Page::eventHandlerRegistry() {
178 return *m_eventHandlerRegistry; 181 return *m_eventHandlerRegistry;
179 } 182 }
180 183
181 const EventHandlerRegistry& Page::eventHandlerRegistry() const { 184 const EventHandlerRegistry& Page::eventHandlerRegistry() const {
182 return *m_eventHandlerRegistry; 185 return *m_eventHandlerRegistry;
183 } 186 }
184 187
188 TopDocumentRootScrollerController& Page::globalRootScrollerController() const {
189 return *m_globalRootScrollerController;
190 }
191
185 VisualViewport& Page::visualViewport() { 192 VisualViewport& Page::visualViewport() {
186 return *m_visualViewport; 193 return *m_visualViewport;
187 } 194 }
188 195
189 const VisualViewport& Page::visualViewport() const { 196 const VisualViewport& Page::visualViewport() const {
190 return *m_visualViewport; 197 return *m_visualViewport;
191 } 198 }
192 199
193 ClientRectList* Page::nonFastScrollableRects(const LocalFrame* frame) { 200 ClientRectList* Page::nonFastScrollableRects(const LocalFrame* frame) {
194 DisableCompositingQueryAsserts disabler; 201 DisableCompositingQueryAsserts disabler;
(...skipping 367 matching lines...) Expand 10 before | Expand all | Expand 10 after
562 visitor->trace(m_autoscrollController); 569 visitor->trace(m_autoscrollController);
563 visitor->trace(m_chromeClient); 570 visitor->trace(m_chromeClient);
564 visitor->trace(m_dragCaret); 571 visitor->trace(m_dragCaret);
565 visitor->trace(m_dragController); 572 visitor->trace(m_dragController);
566 visitor->trace(m_focusController); 573 visitor->trace(m_focusController);
567 visitor->trace(m_contextMenuController); 574 visitor->trace(m_contextMenuController);
568 visitor->trace(m_pointerLockController); 575 visitor->trace(m_pointerLockController);
569 visitor->trace(m_scrollingCoordinator); 576 visitor->trace(m_scrollingCoordinator);
570 visitor->trace(m_browserControls); 577 visitor->trace(m_browserControls);
571 visitor->trace(m_eventHandlerRegistry); 578 visitor->trace(m_eventHandlerRegistry);
579 visitor->trace(m_globalRootScrollerController);
572 visitor->trace(m_visualViewport); 580 visitor->trace(m_visualViewport);
573 visitor->trace(m_mainFrame); 581 visitor->trace(m_mainFrame);
574 visitor->trace(m_validationMessageClient); 582 visitor->trace(m_validationMessageClient);
575 visitor->trace(m_useCounter); 583 visitor->trace(m_useCounter);
576 visitor->trace(m_frameHost); 584 visitor->trace(m_frameHost);
577 Supplementable<Page>::trace(visitor); 585 Supplementable<Page>::trace(visitor);
578 PageVisibilityNotifier::trace(visitor); 586 PageVisibilityNotifier::trace(visitor);
579 } 587 }
580 588
581 void Page::layerTreeViewInitialized(WebLayerTreeView& layerTreeView, 589 void Page::layerTreeViewInitialized(WebLayerTreeView& layerTreeView,
(...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after
614 : chromeClient(nullptr), 622 : chromeClient(nullptr),
615 contextMenuClient(nullptr), 623 contextMenuClient(nullptr),
616 editorClient(nullptr), 624 editorClient(nullptr),
617 spellCheckerClient(nullptr) {} 625 spellCheckerClient(nullptr) {}
618 626
619 Page::PageClients::~PageClients() {} 627 Page::PageClients::~PageClients() {}
620 628
621 template class CORE_TEMPLATE_EXPORT Supplement<Page>; 629 template class CORE_TEMPLATE_EXPORT Supplement<Page>;
622 630
623 } // namespace blink 631 } // namespace blink
OLDNEW
« no previous file with comments | « 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