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

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

Issue 2771983002: Remove Page::m_frameHost (Closed)
Patch Set: Rebase Created 3 years, 8 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 | « no previous file | third_party/WebKit/Source/core/page/Page.cpp » ('j') | 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, 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 41 matching lines...) Expand 10 before | Expand all | Expand 10 after
52 class ClientRectList; 52 class ClientRectList;
53 class ContextMenuClient; 53 class ContextMenuClient;
54 class ContextMenuController; 54 class ContextMenuController;
55 class Document; 55 class Document;
56 class DragCaret; 56 class DragCaret;
57 class DragController; 57 class DragController;
58 class EditorClient; 58 class EditorClient;
59 class EventHandlerRegistry; 59 class EventHandlerRegistry;
60 class FocusController; 60 class FocusController;
61 class Frame; 61 class Frame;
62 class FrameHost;
63 class OverscrollController; 62 class OverscrollController;
64 struct PageScaleConstraints; 63 struct PageScaleConstraints;
65 class PageScaleConstraintsSet; 64 class PageScaleConstraintsSet;
66 class PluginData; 65 class PluginData;
67 class PointerLockController; 66 class PointerLockController;
68 class ScopedPageSuspender; 67 class ScopedPageSuspender;
69 class ScrollingCoordinator; 68 class ScrollingCoordinator;
70 class Settings; 69 class Settings;
71 class ConsoleMessageStorage; 70 class ConsoleMessageStorage;
72 class SpellCheckerClient; 71 class SpellCheckerClient;
(...skipping 47 matching lines...) Expand 10 before | Expand all | Expand 10 after
120 119
121 // Return the current set of full-fledged, ordinary pages. 120 // Return the current set of full-fledged, ordinary pages.
122 // Each created and owned by a WebView. 121 // Each created and owned by a WebView.
123 // 122 //
124 // This set does not include Pages created for other, internal purposes 123 // This set does not include Pages created for other, internal purposes
125 // (SVGImages, inspector overlays, page popups etc.) 124 // (SVGImages, inspector overlays, page popups etc.)
126 static PageSet& ordinaryPages(); 125 static PageSet& ordinaryPages();
127 126
128 static void platformColorsChanged(); 127 static void platformColorsChanged();
129 128
130 // TODO(sashab): Remove this.
131 FrameHost& frameHost() const { return *m_frameHost; }
132
133 void setNeedsRecalcStyleInAllFrames(); 129 void setNeedsRecalcStyleInAllFrames();
134 void updateAcceleratedCompositingSettings(); 130 void updateAcceleratedCompositingSettings();
135 131
136 ViewportDescription viewportDescription() const; 132 ViewportDescription viewportDescription() const;
137 133
138 static void refreshPlugins(); 134 static void refreshPlugins();
139 PluginData* pluginData(SecurityOrigin* mainFrameOrigin) const; 135 PluginData* pluginData(SecurityOrigin* mainFrameOrigin) const;
140 136
141 EditorClient& editorClient() const { return *m_editorClient; } 137 EditorClient& editorClient() const { return *m_editorClient; }
142 SpellCheckerClient& spellCheckerClient() const { 138 SpellCheckerClient& spellCheckerClient() const {
(...skipping 210 matching lines...) Expand 10 before | Expand all | Expand 10 after
353 349
354 PageVisibilityState m_visibilityState; 350 PageVisibilityState m_visibilityState;
355 351
356 bool m_isCursorVisible; 352 bool m_isCursorVisible;
357 353
358 #if DCHECK_IS_ON() 354 #if DCHECK_IS_ON()
359 bool m_isPainting = false; 355 bool m_isPainting = false;
360 #endif 356 #endif
361 357
362 int m_subframeCount; 358 int m_subframeCount;
363
364 // A pointer to all the interfaces provided to in-process Frames for this
365 // Page.
366 // FIXME: Most of the members of Page should move onto FrameHost.
367 Member<FrameHost> m_frameHost;
368 }; 359 };
369 360
370 extern template class CORE_EXTERN_TEMPLATE_EXPORT Supplement<Page>; 361 extern template class CORE_EXTERN_TEMPLATE_EXPORT Supplement<Page>;
371 362
372 } // namespace blink 363 } // namespace blink
373 364
374 #endif // Page_h 365 #endif // Page_h
OLDNEW
« no previous file with comments | « no previous file | third_party/WebKit/Source/core/page/Page.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698