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

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

Issue 2876393002: Clean up duplicate Page methods (Closed)
Patch Set: Created 3 years, 7 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 149 matching lines...) Expand 10 before | Expand all | Expand 10 after
160 : ViewportDescription(); 160 : ViewportDescription();
161 } 161 }
162 162
163 ScrollingCoordinator* Page::GetScrollingCoordinator() { 163 ScrollingCoordinator* Page::GetScrollingCoordinator() {
164 if (!scrolling_coordinator_ && settings_->GetAcceleratedCompositingEnabled()) 164 if (!scrolling_coordinator_ && settings_->GetAcceleratedCompositingEnabled())
165 scrolling_coordinator_ = ScrollingCoordinator::Create(this); 165 scrolling_coordinator_ = ScrollingCoordinator::Create(this);
166 166
167 return scrolling_coordinator_.Get(); 167 return scrolling_coordinator_.Get();
168 } 168 }
169 169
170 PageScaleConstraintsSet& Page::GetPageScaleConstraintsSet() { 170 PageScaleConstraintsSet& Page::GetPageScaleConstraintsSet() const {
171 return *page_scale_constraints_set_; 171 return *page_scale_constraints_set_;
172 } 172 }
173 173
174 const PageScaleConstraintsSet& Page::GetPageScaleConstraintsSet() const { 174 BrowserControls& Page::GetBrowserControls() const {
175 return *page_scale_constraints_set_;
176 }
177
178 BrowserControls& Page::GetBrowserControls() {
179 return *browser_controls_; 175 return *browser_controls_;
180 } 176 }
181 177
182 const BrowserControls& Page::GetBrowserControls() const { 178 ConsoleMessageStorage& Page::GetConsoleMessageStorage() const {
183 return *browser_controls_;
184 }
185
186 ConsoleMessageStorage& Page::GetConsoleMessageStorage() {
187 return *console_message_storage_; 179 return *console_message_storage_;
188 } 180 }
189 181
190 const ConsoleMessageStorage& Page::GetConsoleMessageStorage() const { 182 EventHandlerRegistry& Page::GetEventHandlerRegistry() const {
191 return *console_message_storage_;
192 }
193
194 EventHandlerRegistry& Page::GetEventHandlerRegistry() {
195 return *event_handler_registry_; 183 return *event_handler_registry_;
196 } 184 }
197 185
198 const EventHandlerRegistry& Page::GetEventHandlerRegistry() const {
199 return *event_handler_registry_;
200 }
201
202 TopDocumentRootScrollerController& Page::GlobalRootScrollerController() const { 186 TopDocumentRootScrollerController& Page::GlobalRootScrollerController() const {
203 return *global_root_scroller_controller_; 187 return *global_root_scroller_controller_;
204 } 188 }
205 189
206 VisualViewport& Page::GetVisualViewport() { 190 VisualViewport& Page::GetVisualViewport() const {
207 return *visual_viewport_; 191 return *visual_viewport_;
208 } 192 }
209 193
210 const VisualViewport& Page::GetVisualViewport() const { 194 OverscrollController& Page::GetOverscrollController() const {
211 return *visual_viewport_;
212 }
213
214 OverscrollController& Page::GetOverscrollController() {
215 return *overscroll_controller_; 195 return *overscroll_controller_;
216 } 196 }
217 197
218 const OverscrollController& Page::GetOverscrollController() const {
219 return *overscroll_controller_;
220 }
221
222 ClientRectList* Page::NonFastScrollableRects(const LocalFrame* frame) { 198 ClientRectList* Page::NonFastScrollableRects(const LocalFrame* frame) {
223 DisableCompositingQueryAsserts disabler; 199 DisableCompositingQueryAsserts disabler;
224 if (ScrollingCoordinator* scrolling_coordinator = 200 if (ScrollingCoordinator* scrolling_coordinator =
225 this->GetScrollingCoordinator()) { 201 this->GetScrollingCoordinator()) {
226 // Hits in compositing/iframes/iframe-composited-scrolling.html 202 // Hits in compositing/iframes/iframe-composited-scrolling.html
227 scrolling_coordinator->UpdateAfterCompositingChangeIfNeeded(); 203 scrolling_coordinator->UpdateAfterCompositingChangeIfNeeded();
228 } 204 }
229 205
230 GraphicsLayer* layer = 206 GraphicsLayer* layer =
231 frame->View()->LayoutViewportScrollableArea()->LayerForScrolling(); 207 frame->View()->LayoutViewportScrollableArea()->LayerForScrolling();
(...skipping 441 matching lines...) Expand 10 before | Expand all | Expand 10 after
673 : chrome_client(nullptr), 649 : chrome_client(nullptr),
674 context_menu_client(nullptr), 650 context_menu_client(nullptr),
675 editor_client(nullptr), 651 editor_client(nullptr),
676 spell_checker_client(nullptr) {} 652 spell_checker_client(nullptr) {}
677 653
678 Page::PageClients::~PageClients() {} 654 Page::PageClients::~PageClients() {}
679 655
680 template class CORE_TEMPLATE_EXPORT Supplement<Page>; 656 template class CORE_TEMPLATE_EXPORT Supplement<Page>;
681 657
682 } // namespace blink 658 } // 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