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

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

Issue 2738703003: Move FrameHost::m_consoleMessageStorage 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 49 matching lines...) Expand 10 before | Expand all | Expand 10 after
60 class FocusController; 60 class FocusController;
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 ConsoleMessageStorage;
70 class SpellCheckerClient; 71 class SpellCheckerClient;
71 class TopDocumentRootScrollerController; 72 class TopDocumentRootScrollerController;
72 class ValidationMessageClient; 73 class ValidationMessageClient;
73 class VisualViewport; 74 class VisualViewport;
74 class WebLayerTreeView; 75 class WebLayerTreeView;
75 76
76 typedef uint64_t LinkHash; 77 typedef uint64_t LinkHash;
77 78
78 float deviceScaleFactorDeprecated(LocalFrame*); 79 float deviceScaleFactorDeprecated(LocalFrame*);
79 80
(...skipping 105 matching lines...) Expand 10 before | Expand all | Expand 10 after
185 UseCounter& useCounter() { return m_useCounter; } 186 UseCounter& useCounter() { return m_useCounter; }
186 Deprecation& deprecation() { return m_deprecation; } 187 Deprecation& deprecation() { return m_deprecation; }
187 HostsUsingFeatures& hostsUsingFeatures() { return m_hostsUsingFeatures; } 188 HostsUsingFeatures& hostsUsingFeatures() { return m_hostsUsingFeatures; }
188 189
189 PageScaleConstraintsSet& pageScaleConstraintsSet(); 190 PageScaleConstraintsSet& pageScaleConstraintsSet();
190 const PageScaleConstraintsSet& pageScaleConstraintsSet() const; 191 const PageScaleConstraintsSet& pageScaleConstraintsSet() const;
191 192
192 BrowserControls& browserControls(); 193 BrowserControls& browserControls();
193 const BrowserControls& browserControls() const; 194 const BrowserControls& browserControls() const;
194 195
196 ConsoleMessageStorage& consoleMessageStorage();
197 const ConsoleMessageStorage& consoleMessageStorage() const;
198
195 EventHandlerRegistry& eventHandlerRegistry(); 199 EventHandlerRegistry& eventHandlerRegistry();
196 const EventHandlerRegistry& eventHandlerRegistry() const; 200 const EventHandlerRegistry& eventHandlerRegistry() const;
197 201
198 TopDocumentRootScrollerController& globalRootScrollerController() const; 202 TopDocumentRootScrollerController& globalRootScrollerController() const;
199 203
200 VisualViewport& visualViewport(); 204 VisualViewport& visualViewport();
201 const VisualViewport& visualViewport() const; 205 const VisualViewport& visualViewport() const;
202 206
203 void setTabKeyCyclesThroughElements(bool b) { 207 void setTabKeyCyclesThroughElements(bool b) {
204 m_tabKeyCyclesThroughElements = b; 208 m_tabKeyCyclesThroughElements = b;
(...skipping 74 matching lines...) Expand 10 before | Expand all | Expand 10 after
279 const Member<AutoscrollController> m_autoscrollController; 283 const Member<AutoscrollController> m_autoscrollController;
280 Member<ChromeClient> m_chromeClient; 284 Member<ChromeClient> m_chromeClient;
281 const Member<DragCaret> m_dragCaret; 285 const Member<DragCaret> m_dragCaret;
282 const Member<DragController> m_dragController; 286 const Member<DragController> m_dragController;
283 const Member<FocusController> m_focusController; 287 const Member<FocusController> m_focusController;
284 const Member<ContextMenuController> m_contextMenuController; 288 const Member<ContextMenuController> m_contextMenuController;
285 const std::unique_ptr<PageScaleConstraintsSet> m_pageScaleConstraintsSet; 289 const std::unique_ptr<PageScaleConstraintsSet> m_pageScaleConstraintsSet;
286 const Member<PointerLockController> m_pointerLockController; 290 const Member<PointerLockController> m_pointerLockController;
287 Member<ScrollingCoordinator> m_scrollingCoordinator; 291 Member<ScrollingCoordinator> m_scrollingCoordinator;
288 const Member<BrowserControls> m_browserControls; 292 const Member<BrowserControls> m_browserControls;
293 const Member<ConsoleMessageStorage> m_consoleMessageStorage;
289 const Member<EventHandlerRegistry> m_eventHandlerRegistry; 294 const Member<EventHandlerRegistry> m_eventHandlerRegistry;
290 const Member<TopDocumentRootScrollerController> 295 const Member<TopDocumentRootScrollerController>
291 m_globalRootScrollerController; 296 m_globalRootScrollerController;
292 const Member<VisualViewport> m_visualViewport; 297 const Member<VisualViewport> m_visualViewport;
293 298
294 // Typically, the main frame and Page should both be owned by the embedder, 299 // Typically, the main frame and Page should both be owned by the embedder,
295 // which must call Page::willBeDestroyed() prior to destroying Page. This 300 // which must call Page::willBeDestroyed() prior to destroying Page. This
296 // call detaches the main frame and clears this pointer, thus ensuring that 301 // call detaches the main frame and clears this pointer, thus ensuring that
297 // this field only references a live main frame. 302 // this field only references a live main frame.
298 // 303 //
(...skipping 41 matching lines...) Expand 10 before | Expand all | Expand 10 after
340 // Page. 345 // Page.
341 // FIXME: Most of the members of Page should move onto FrameHost. 346 // FIXME: Most of the members of Page should move onto FrameHost.
342 Member<FrameHost> m_frameHost; 347 Member<FrameHost> m_frameHost;
343 }; 348 };
344 349
345 extern template class CORE_EXTERN_TEMPLATE_EXPORT Supplement<Page>; 350 extern template class CORE_EXTERN_TEMPLATE_EXPORT Supplement<Page>;
346 351
347 } // namespace blink 352 } // namespace blink
348 353
349 #endif // Page_h 354 #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