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

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

Issue 2723493004: Move FrameHost::m_pageScaleConstraintsSet 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 40 matching lines...) Expand 10 before | Expand all | Expand 10 after
51 class ClientRectList; 51 class ClientRectList;
52 class ContextMenuClient; 52 class ContextMenuClient;
53 class ContextMenuController; 53 class ContextMenuController;
54 class Document; 54 class Document;
55 class DragCaret; 55 class DragCaret;
56 class DragController; 56 class DragController;
57 class EditorClient; 57 class EditorClient;
58 class FocusController; 58 class FocusController;
59 class Frame; 59 class Frame;
60 class FrameHost; 60 class FrameHost;
61 class PageScaleConstraintsSet;
61 class PluginData; 62 class PluginData;
62 class PointerLockController; 63 class PointerLockController;
63 class ScopedPageSuspender; 64 class ScopedPageSuspender;
64 class ScrollingCoordinator; 65 class ScrollingCoordinator;
65 class Settings; 66 class Settings;
66 class SpellCheckerClient; 67 class SpellCheckerClient;
67 class ValidationMessageClient; 68 class ValidationMessageClient;
68 class WebLayerTreeView; 69 class WebLayerTreeView;
69 70
70 typedef uint64_t LinkHash; 71 typedef uint64_t LinkHash;
(...skipping 102 matching lines...) Expand 10 before | Expand all | Expand 10 after
173 ScrollingCoordinator* scrollingCoordinator(); 174 ScrollingCoordinator* scrollingCoordinator();
174 175
175 ClientRectList* nonFastScrollableRects(const LocalFrame*); 176 ClientRectList* nonFastScrollableRects(const LocalFrame*);
176 177
177 Settings& settings() const { return *m_settings; } 178 Settings& settings() const { return *m_settings; }
178 179
179 UseCounter& useCounter() { return m_useCounter; } 180 UseCounter& useCounter() { return m_useCounter; }
180 Deprecation& deprecation() { return m_deprecation; } 181 Deprecation& deprecation() { return m_deprecation; }
181 HostsUsingFeatures& hostsUsingFeatures() { return m_hostsUsingFeatures; } 182 HostsUsingFeatures& hostsUsingFeatures() { return m_hostsUsingFeatures; }
182 183
184 PageScaleConstraintsSet& pageScaleConstraintsSet();
185 const PageScaleConstraintsSet& pageScaleConstraintsSet() const;
186
183 void setTabKeyCyclesThroughElements(bool b) { 187 void setTabKeyCyclesThroughElements(bool b) {
184 m_tabKeyCyclesThroughElements = b; 188 m_tabKeyCyclesThroughElements = b;
185 } 189 }
186 bool tabKeyCyclesThroughElements() const { 190 bool tabKeyCyclesThroughElements() const {
187 return m_tabKeyCyclesThroughElements; 191 return m_tabKeyCyclesThroughElements;
188 } 192 }
189 193
190 // Suspension is used to implement the "Optionally, pause while waiting for 194 // Suspension is used to implement the "Optionally, pause while waiting for
191 // the user to acknowledge the message" step of simple dialog processing: 195 // the user to acknowledge the message" step of simple dialog processing:
192 // https://html.spec.whatwg.org/multipage/webappapis.html#simple-dialogs 196 // https://html.spec.whatwg.org/multipage/webappapis.html#simple-dialogs
(...skipping 58 matching lines...) Expand 10 before | Expand all | Expand 10 after
251 // ScopedPageSuspender helpers. 255 // ScopedPageSuspender helpers.
252 void setSuspended(bool); 256 void setSuspended(bool);
253 257
254 Member<PageAnimator> m_animator; 258 Member<PageAnimator> m_animator;
255 const Member<AutoscrollController> m_autoscrollController; 259 const Member<AutoscrollController> m_autoscrollController;
256 Member<ChromeClient> m_chromeClient; 260 Member<ChromeClient> m_chromeClient;
257 const Member<DragCaret> m_dragCaret; 261 const Member<DragCaret> m_dragCaret;
258 const Member<DragController> m_dragController; 262 const Member<DragController> m_dragController;
259 const Member<FocusController> m_focusController; 263 const Member<FocusController> m_focusController;
260 const Member<ContextMenuController> m_contextMenuController; 264 const Member<ContextMenuController> m_contextMenuController;
265 const std::unique_ptr<PageScaleConstraintsSet> m_pageScaleConstraintsSet;
261 const Member<PointerLockController> m_pointerLockController; 266 const Member<PointerLockController> m_pointerLockController;
262 Member<ScrollingCoordinator> m_scrollingCoordinator; 267 Member<ScrollingCoordinator> m_scrollingCoordinator;
263 268
264 // Typically, the main frame and Page should both be owned by the embedder, 269 // Typically, the main frame and Page should both be owned by the embedder,
265 // which must call Page::willBeDestroyed() prior to destroying Page. This 270 // which must call Page::willBeDestroyed() prior to destroying Page. This
266 // call detaches the main frame and clears this pointer, thus ensuring that 271 // call detaches the main frame and clears this pointer, thus ensuring that
267 // this field only references a live main frame. 272 // this field only references a live main frame.
268 // 273 //
269 // However, there are several locations (InspectorOverlay, SVGImage, and 274 // However, there are several locations (InspectorOverlay, SVGImage, and
270 // WebPagePopupImpl) which don't hold a reference to the main frame at all 275 // WebPagePopupImpl) which don't hold a reference to the main frame at all
(...skipping 39 matching lines...) Expand 10 before | Expand all | Expand 10 after
310 // Page. 315 // Page.
311 // FIXME: Most of the members of Page should move onto FrameHost. 316 // FIXME: Most of the members of Page should move onto FrameHost.
312 Member<FrameHost> m_frameHost; 317 Member<FrameHost> m_frameHost;
313 }; 318 };
314 319
315 extern template class CORE_EXTERN_TEMPLATE_EXPORT Supplement<Page>; 320 extern template class CORE_EXTERN_TEMPLATE_EXPORT Supplement<Page>;
316 321
317 } // namespace blink 322 } // namespace blink
318 323
319 #endif // Page_h 324 #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