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

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

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
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2006, 2007, 2008, 2009, 2010, 2013 Apple Inc. All rights 2 * Copyright (C) 2006, 2007, 2008, 2009, 2010, 2013 Apple Inc. All rights
3 * reserved. 3 * 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 50 matching lines...) Expand 10 before | Expand all | Expand 10 after
61 class Frame; 61 class Frame;
62 class FrameHost; 62 class FrameHost;
63 struct PageScaleConstraints; 63 struct PageScaleConstraints;
64 class PageScaleConstraintsSet; 64 class PageScaleConstraintsSet;
65 class PluginData; 65 class PluginData;
66 class PointerLockController; 66 class PointerLockController;
67 class ScopedPageSuspender; 67 class ScopedPageSuspender;
68 class ScrollingCoordinator; 68 class ScrollingCoordinator;
69 class Settings; 69 class Settings;
70 class SpellCheckerClient; 70 class SpellCheckerClient;
71 class TopDocumentRootScrollerController;
71 class ValidationMessageClient; 72 class ValidationMessageClient;
72 class VisualViewport; 73 class VisualViewport;
73 class WebLayerTreeView; 74 class WebLayerTreeView;
74 75
75 typedef uint64_t LinkHash; 76 typedef uint64_t LinkHash;
76 77
77 float deviceScaleFactorDeprecated(LocalFrame*); 78 float deviceScaleFactorDeprecated(LocalFrame*);
78 79
79 class CORE_EXPORT Page final : public GarbageCollectedFinalized<Page>, 80 class CORE_EXPORT Page final : public GarbageCollectedFinalized<Page>,
80 public Supplementable<Page>, 81 public Supplementable<Page>,
(...skipping 106 matching lines...) Expand 10 before | Expand all | Expand 10 after
187 188
188 PageScaleConstraintsSet& pageScaleConstraintsSet(); 189 PageScaleConstraintsSet& pageScaleConstraintsSet();
189 const PageScaleConstraintsSet& pageScaleConstraintsSet() const; 190 const PageScaleConstraintsSet& pageScaleConstraintsSet() const;
190 191
191 BrowserControls& browserControls(); 192 BrowserControls& browserControls();
192 const BrowserControls& browserControls() const; 193 const BrowserControls& browserControls() const;
193 194
194 EventHandlerRegistry& eventHandlerRegistry(); 195 EventHandlerRegistry& eventHandlerRegistry();
195 const EventHandlerRegistry& eventHandlerRegistry() const; 196 const EventHandlerRegistry& eventHandlerRegistry() const;
196 197
198 TopDocumentRootScrollerController& globalRootScrollerController() const;
199
197 VisualViewport& visualViewport(); 200 VisualViewport& visualViewport();
198 const VisualViewport& visualViewport() const; 201 const VisualViewport& visualViewport() const;
199 202
200 void setTabKeyCyclesThroughElements(bool b) { 203 void setTabKeyCyclesThroughElements(bool b) {
201 m_tabKeyCyclesThroughElements = b; 204 m_tabKeyCyclesThroughElements = b;
202 } 205 }
203 bool tabKeyCyclesThroughElements() const { 206 bool tabKeyCyclesThroughElements() const {
204 return m_tabKeyCyclesThroughElements; 207 return m_tabKeyCyclesThroughElements;
205 } 208 }
206 209
(...skipping 70 matching lines...) Expand 10 before | Expand all | Expand 10 after
277 Member<ChromeClient> m_chromeClient; 280 Member<ChromeClient> m_chromeClient;
278 const Member<DragCaret> m_dragCaret; 281 const Member<DragCaret> m_dragCaret;
279 const Member<DragController> m_dragController; 282 const Member<DragController> m_dragController;
280 const Member<FocusController> m_focusController; 283 const Member<FocusController> m_focusController;
281 const Member<ContextMenuController> m_contextMenuController; 284 const Member<ContextMenuController> m_contextMenuController;
282 const std::unique_ptr<PageScaleConstraintsSet> m_pageScaleConstraintsSet; 285 const std::unique_ptr<PageScaleConstraintsSet> m_pageScaleConstraintsSet;
283 const Member<PointerLockController> m_pointerLockController; 286 const Member<PointerLockController> m_pointerLockController;
284 Member<ScrollingCoordinator> m_scrollingCoordinator; 287 Member<ScrollingCoordinator> m_scrollingCoordinator;
285 const Member<BrowserControls> m_browserControls; 288 const Member<BrowserControls> m_browserControls;
286 const Member<EventHandlerRegistry> m_eventHandlerRegistry; 289 const Member<EventHandlerRegistry> m_eventHandlerRegistry;
290 const Member<TopDocumentRootScrollerController>
291 m_globalRootScrollerController;
287 const Member<VisualViewport> m_visualViewport; 292 const Member<VisualViewport> m_visualViewport;
288 293
289 // Typically, the main frame and Page should both be owned by the embedder, 294 // Typically, the main frame and Page should both be owned by the embedder,
290 // which must call Page::willBeDestroyed() prior to destroying Page. This 295 // which must call Page::willBeDestroyed() prior to destroying Page. This
291 // call detaches the main frame and clears this pointer, thus ensuring that 296 // call detaches the main frame and clears this pointer, thus ensuring that
292 // this field only references a live main frame. 297 // this field only references a live main frame.
293 // 298 //
294 // However, there are several locations (InspectorOverlay, SVGImage, and 299 // However, there are several locations (InspectorOverlay, SVGImage, and
295 // WebPagePopupImpl) which don't hold a reference to the main frame at all 300 // WebPagePopupImpl) which don't hold a reference to the main frame at all
296 // after creating it. These are still safe because they always create a 301 // after creating it. These are still safe because they always create a
(...skipping 38 matching lines...) Expand 10 before | Expand all | Expand 10 after
335 // Page. 340 // Page.
336 // FIXME: Most of the members of Page should move onto FrameHost. 341 // FIXME: Most of the members of Page should move onto FrameHost.
337 Member<FrameHost> m_frameHost; 342 Member<FrameHost> m_frameHost;
338 }; 343 };
339 344
340 extern template class CORE_EXTERN_TEMPLATE_EXPORT Supplement<Page>; 345 extern template class CORE_EXTERN_TEMPLATE_EXPORT Supplement<Page>;
341 346
342 } // namespace blink 347 } // namespace blink
343 348
344 #endif // Page_h 349 #endif // Page_h
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/core/frame/FrameHost.cpp ('k') | third_party/WebKit/Source/core/page/Page.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698