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

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

Issue 2730573003: Moved FrameHost::m_visualViewport to Page (Closed)
Patch Set: Fixed some compile errors on mac and android 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 51 matching lines...) Expand 10 before | Expand all | Expand 10 after
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 ValidationMessageClient; 71 class ValidationMessageClient;
72 class VisualViewport;
72 class WebLayerTreeView; 73 class WebLayerTreeView;
73 74
74 typedef uint64_t LinkHash; 75 typedef uint64_t LinkHash;
75 76
76 float deviceScaleFactorDeprecated(LocalFrame*); 77 float deviceScaleFactorDeprecated(LocalFrame*);
77 78
78 class CORE_EXPORT Page final : public GarbageCollectedFinalized<Page>, 79 class CORE_EXPORT Page final : public GarbageCollectedFinalized<Page>,
79 public Supplementable<Page>, 80 public Supplementable<Page>,
80 public PageVisibilityNotifier, 81 public PageVisibilityNotifier,
81 public SettingsDelegate { 82 public SettingsDelegate {
(...skipping 104 matching lines...) Expand 10 before | Expand all | Expand 10 after
186 187
187 PageScaleConstraintsSet& pageScaleConstraintsSet(); 188 PageScaleConstraintsSet& pageScaleConstraintsSet();
188 const PageScaleConstraintsSet& pageScaleConstraintsSet() const; 189 const PageScaleConstraintsSet& pageScaleConstraintsSet() const;
189 190
190 BrowserControls& browserControls(); 191 BrowserControls& browserControls();
191 const BrowserControls& browserControls() const; 192 const BrowserControls& browserControls() const;
192 193
193 EventHandlerRegistry& eventHandlerRegistry(); 194 EventHandlerRegistry& eventHandlerRegistry();
194 const EventHandlerRegistry& eventHandlerRegistry() const; 195 const EventHandlerRegistry& eventHandlerRegistry() const;
195 196
197 VisualViewport& visualViewport();
198 const VisualViewport& visualViewport() const;
199
196 void setTabKeyCyclesThroughElements(bool b) { 200 void setTabKeyCyclesThroughElements(bool b) {
197 m_tabKeyCyclesThroughElements = b; 201 m_tabKeyCyclesThroughElements = b;
198 } 202 }
199 bool tabKeyCyclesThroughElements() const { 203 bool tabKeyCyclesThroughElements() const {
200 return m_tabKeyCyclesThroughElements; 204 return m_tabKeyCyclesThroughElements;
201 } 205 }
202 206
203 // Suspension is used to implement the "Optionally, pause while waiting for 207 // Suspension is used to implement the "Optionally, pause while waiting for
204 // the user to acknowledge the message" step of simple dialog processing: 208 // the user to acknowledge the message" step of simple dialog processing:
205 // https://html.spec.whatwg.org/multipage/webappapis.html#simple-dialogs 209 // https://html.spec.whatwg.org/multipage/webappapis.html#simple-dialogs
(...skipping 67 matching lines...) Expand 10 before | Expand all | Expand 10 after
273 Member<ChromeClient> m_chromeClient; 277 Member<ChromeClient> m_chromeClient;
274 const Member<DragCaret> m_dragCaret; 278 const Member<DragCaret> m_dragCaret;
275 const Member<DragController> m_dragController; 279 const Member<DragController> m_dragController;
276 const Member<FocusController> m_focusController; 280 const Member<FocusController> m_focusController;
277 const Member<ContextMenuController> m_contextMenuController; 281 const Member<ContextMenuController> m_contextMenuController;
278 const std::unique_ptr<PageScaleConstraintsSet> m_pageScaleConstraintsSet; 282 const std::unique_ptr<PageScaleConstraintsSet> m_pageScaleConstraintsSet;
279 const Member<PointerLockController> m_pointerLockController; 283 const Member<PointerLockController> m_pointerLockController;
280 Member<ScrollingCoordinator> m_scrollingCoordinator; 284 Member<ScrollingCoordinator> m_scrollingCoordinator;
281 const Member<BrowserControls> m_browserControls; 285 const Member<BrowserControls> m_browserControls;
282 const Member<EventHandlerRegistry> m_eventHandlerRegistry; 286 const Member<EventHandlerRegistry> m_eventHandlerRegistry;
287 const Member<VisualViewport> m_visualViewport;
283 288
284 // Typically, the main frame and Page should both be owned by the embedder, 289 // Typically, the main frame and Page should both be owned by the embedder,
285 // which must call Page::willBeDestroyed() prior to destroying Page. This 290 // which must call Page::willBeDestroyed() prior to destroying Page. This
286 // call detaches the main frame and clears this pointer, thus ensuring that 291 // call detaches the main frame and clears this pointer, thus ensuring that
287 // this field only references a live main frame. 292 // this field only references a live main frame.
288 // 293 //
289 // However, there are several locations (InspectorOverlay, SVGImage, and 294 // However, there are several locations (InspectorOverlay, SVGImage, and
290 // WebPagePopupImpl) which don't hold a reference to the main frame at all 295 // WebPagePopupImpl) which don't hold a reference to the main frame at all
291 // after creating it. These are still safe because they always create a 296 // after creating it. These are still safe because they always create a
292 // Frame with a FrameView. FrameView and Frame hold references to each 297 // Frame with a FrameView. FrameView and Frame hold references to each
(...skipping 37 matching lines...) Expand 10 before | Expand all | Expand 10 after
330 // Page. 335 // Page.
331 // FIXME: Most of the members of Page should move onto FrameHost. 336 // FIXME: Most of the members of Page should move onto FrameHost.
332 Member<FrameHost> m_frameHost; 337 Member<FrameHost> m_frameHost;
333 }; 338 };
334 339
335 extern template class CORE_EXTERN_TEMPLATE_EXPORT Supplement<Page>; 340 extern template class CORE_EXTERN_TEMPLATE_EXPORT Supplement<Page>;
336 341
337 } // namespace blink 342 } // namespace blink
338 343
339 #endif // Page_h 344 #endif // Page_h
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/core/loader/FrameLoader.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