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

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

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
« no previous file with comments | « third_party/WebKit/Source/core/page/Page.h ('k') | no next file » | 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, 2011, 2012, 2013 Apple Inc. All 2 * Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 Apple Inc. All
3 * Rights Reserved. 3 * Rights 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 89 matching lines...) Expand 10 before | Expand all | Expand 10 after
100 m_autoscrollController(AutoscrollController::create(*this)), 100 m_autoscrollController(AutoscrollController::create(*this)),
101 m_chromeClient(pageClients.chromeClient), 101 m_chromeClient(pageClients.chromeClient),
102 m_dragCaret(DragCaret::create()), 102 m_dragCaret(DragCaret::create()),
103 m_dragController(DragController::create(this)), 103 m_dragController(DragController::create(this)),
104 m_focusController(FocusController::create(this)), 104 m_focusController(FocusController::create(this)),
105 m_contextMenuController( 105 m_contextMenuController(
106 ContextMenuController::create(this, pageClients.contextMenuClient)), 106 ContextMenuController::create(this, pageClients.contextMenuClient)),
107 m_pageScaleConstraintsSet(PageScaleConstraintsSet::create()), 107 m_pageScaleConstraintsSet(PageScaleConstraintsSet::create()),
108 m_pointerLockController(PointerLockController::create(this)), 108 m_pointerLockController(PointerLockController::create(this)),
109 m_browserControls(BrowserControls::create(*this)), 109 m_browserControls(BrowserControls::create(*this)),
110 m_consoleMessageStorage(new ConsoleMessageStorage()),
110 m_eventHandlerRegistry(new EventHandlerRegistry(*this)), 111 m_eventHandlerRegistry(new EventHandlerRegistry(*this)),
111 m_globalRootScrollerController( 112 m_globalRootScrollerController(
112 TopDocumentRootScrollerController::create(*this)), 113 TopDocumentRootScrollerController::create(*this)),
113 m_visualViewport(VisualViewport::create(*this)), 114 m_visualViewport(VisualViewport::create(*this)),
114 m_mainFrame(nullptr), 115 m_mainFrame(nullptr),
115 m_editorClient(pageClients.editorClient), 116 m_editorClient(pageClients.editorClient),
116 m_spellCheckerClient(pageClients.spellCheckerClient), 117 m_spellCheckerClient(pageClients.spellCheckerClient),
117 m_useCounter(pageClients.chromeClient && 118 m_useCounter(pageClients.chromeClient &&
118 pageClients.chromeClient->isSVGImageChromeClient() 119 pageClients.chromeClient->isSVGImageChromeClient()
119 ? UseCounter::SVGImageContext 120 ? UseCounter::SVGImageContext
(...skipping 50 matching lines...) Expand 10 before | Expand all | Expand 10 after
170 } 171 }
171 172
172 BrowserControls& Page::browserControls() { 173 BrowserControls& Page::browserControls() {
173 return *m_browserControls; 174 return *m_browserControls;
174 } 175 }
175 176
176 const BrowserControls& Page::browserControls() const { 177 const BrowserControls& Page::browserControls() const {
177 return *m_browserControls; 178 return *m_browserControls;
178 } 179 }
179 180
181 ConsoleMessageStorage& Page::consoleMessageStorage() {
182 return *m_consoleMessageStorage;
183 }
184
185 const ConsoleMessageStorage& Page::consoleMessageStorage() const {
186 return *m_consoleMessageStorage;
187 }
188
180 EventHandlerRegistry& Page::eventHandlerRegistry() { 189 EventHandlerRegistry& Page::eventHandlerRegistry() {
181 return *m_eventHandlerRegistry; 190 return *m_eventHandlerRegistry;
182 } 191 }
183 192
184 const EventHandlerRegistry& Page::eventHandlerRegistry() const { 193 const EventHandlerRegistry& Page::eventHandlerRegistry() const {
185 return *m_eventHandlerRegistry; 194 return *m_eventHandlerRegistry;
186 } 195 }
187 196
188 TopDocumentRootScrollerController& Page::globalRootScrollerController() const { 197 TopDocumentRootScrollerController& Page::globalRootScrollerController() const {
189 return *m_globalRootScrollerController; 198 return *m_globalRootScrollerController;
(...skipping 378 matching lines...) Expand 10 before | Expand all | Expand 10 after
568 visitor->trace(m_animator); 577 visitor->trace(m_animator);
569 visitor->trace(m_autoscrollController); 578 visitor->trace(m_autoscrollController);
570 visitor->trace(m_chromeClient); 579 visitor->trace(m_chromeClient);
571 visitor->trace(m_dragCaret); 580 visitor->trace(m_dragCaret);
572 visitor->trace(m_dragController); 581 visitor->trace(m_dragController);
573 visitor->trace(m_focusController); 582 visitor->trace(m_focusController);
574 visitor->trace(m_contextMenuController); 583 visitor->trace(m_contextMenuController);
575 visitor->trace(m_pointerLockController); 584 visitor->trace(m_pointerLockController);
576 visitor->trace(m_scrollingCoordinator); 585 visitor->trace(m_scrollingCoordinator);
577 visitor->trace(m_browserControls); 586 visitor->trace(m_browserControls);
587 visitor->trace(m_consoleMessageStorage);
578 visitor->trace(m_eventHandlerRegistry); 588 visitor->trace(m_eventHandlerRegistry);
579 visitor->trace(m_globalRootScrollerController); 589 visitor->trace(m_globalRootScrollerController);
580 visitor->trace(m_visualViewport); 590 visitor->trace(m_visualViewport);
581 visitor->trace(m_mainFrame); 591 visitor->trace(m_mainFrame);
582 visitor->trace(m_validationMessageClient); 592 visitor->trace(m_validationMessageClient);
583 visitor->trace(m_useCounter); 593 visitor->trace(m_useCounter);
584 visitor->trace(m_frameHost); 594 visitor->trace(m_frameHost);
585 Supplementable<Page>::trace(visitor); 595 Supplementable<Page>::trace(visitor);
586 PageVisibilityNotifier::trace(visitor); 596 PageVisibilityNotifier::trace(visitor);
587 } 597 }
(...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after
622 : chromeClient(nullptr), 632 : chromeClient(nullptr),
623 contextMenuClient(nullptr), 633 contextMenuClient(nullptr),
624 editorClient(nullptr), 634 editorClient(nullptr),
625 spellCheckerClient(nullptr) {} 635 spellCheckerClient(nullptr) {}
626 636
627 Page::PageClients::~PageClients() {} 637 Page::PageClients::~PageClients() {}
628 638
629 template class CORE_TEMPLATE_EXPORT Supplement<Page>; 639 template class CORE_TEMPLATE_EXPORT Supplement<Page>;
630 640
631 } // namespace blink 641 } // namespace blink
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/core/page/Page.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698