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

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

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 | « 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 16 matching lines...) Expand all
27 #include "core/dom/StyleChangeReason.h" 27 #include "core/dom/StyleChangeReason.h"
28 #include "core/dom/StyleEngine.h" 28 #include "core/dom/StyleEngine.h"
29 #include "core/dom/VisitedLinkState.h" 29 #include "core/dom/VisitedLinkState.h"
30 #include "core/editing/DragCaret.h" 30 #include "core/editing/DragCaret.h"
31 #include "core/editing/markers/DocumentMarkerController.h" 31 #include "core/editing/markers/DocumentMarkerController.h"
32 #include "core/events/Event.h" 32 #include "core/events/Event.h"
33 #include "core/frame/BrowserControls.h" 33 #include "core/frame/BrowserControls.h"
34 #include "core/frame/DOMTimer.h" 34 #include "core/frame/DOMTimer.h"
35 #include "core/frame/EventHandlerRegistry.h" 35 #include "core/frame/EventHandlerRegistry.h"
36 #include "core/frame/FrameConsole.h" 36 #include "core/frame/FrameConsole.h"
37 #include "core/frame/FrameHost.h"
38 #include "core/frame/FrameView.h" 37 #include "core/frame/FrameView.h"
39 #include "core/frame/PageScaleConstraints.h" 38 #include "core/frame/PageScaleConstraints.h"
40 #include "core/frame/PageScaleConstraintsSet.h" 39 #include "core/frame/PageScaleConstraintsSet.h"
41 #include "core/frame/RemoteFrame.h" 40 #include "core/frame/RemoteFrame.h"
42 #include "core/frame/RemoteFrameView.h" 41 #include "core/frame/RemoteFrameView.h"
43 #include "core/frame/Settings.h" 42 #include "core/frame/Settings.h"
44 #include "core/frame/VisualViewport.h" 43 #include "core/frame/VisualViewport.h"
45 #include "core/html/HTMLMediaElement.h" 44 #include "core/html/HTMLMediaElement.h"
46 #include "core/inspector/ConsoleMessageStorage.h" 45 #include "core/inspector/ConsoleMessageStorage.h"
47 #include "core/inspector/InspectorInstrumentation.h" 46 #include "core/inspector/InspectorInstrumentation.h"
(...skipping 73 matching lines...) Expand 10 before | Expand all | Expand 10 after
121 m_useCounter(pageClients.chromeClient && 120 m_useCounter(pageClients.chromeClient &&
122 pageClients.chromeClient->isSVGImageChromeClient() 121 pageClients.chromeClient->isSVGImageChromeClient()
123 ? UseCounter::SVGImageContext 122 ? UseCounter::SVGImageContext
124 : UseCounter::DefaultContext), 123 : UseCounter::DefaultContext),
125 m_openedByDOM(false), 124 m_openedByDOM(false),
126 m_tabKeyCyclesThroughElements(true), 125 m_tabKeyCyclesThroughElements(true),
127 m_suspended(false), 126 m_suspended(false),
128 m_deviceScaleFactor(1), 127 m_deviceScaleFactor(1),
129 m_visibilityState(PageVisibilityStateVisible), 128 m_visibilityState(PageVisibilityStateVisible),
130 m_isCursorVisible(true), 129 m_isCursorVisible(true),
131 m_subframeCount(0), 130 m_subframeCount(0) {
132 m_frameHost(FrameHost::create(*this)) {
133 ASSERT(m_editorClient); 131 ASSERT(m_editorClient);
134 132
135 ASSERT(!allPages().contains(this)); 133 ASSERT(!allPages().contains(this));
136 allPages().insert(this); 134 allPages().insert(this);
137 } 135 }
138 136
139 Page::~Page() { 137 Page::~Page() {
140 // willBeDestroyed() must be called before Page destruction. 138 // willBeDestroyed() must be called before Page destruction.
141 ASSERT(!m_mainFrame); 139 ASSERT(!m_mainFrame);
142 } 140 }
(...skipping 478 matching lines...) Expand 10 before | Expand all | Expand 10 after
621 visitor->trace(m_scrollingCoordinator); 619 visitor->trace(m_scrollingCoordinator);
622 visitor->trace(m_browserControls); 620 visitor->trace(m_browserControls);
623 visitor->trace(m_consoleMessageStorage); 621 visitor->trace(m_consoleMessageStorage);
624 visitor->trace(m_eventHandlerRegistry); 622 visitor->trace(m_eventHandlerRegistry);
625 visitor->trace(m_globalRootScrollerController); 623 visitor->trace(m_globalRootScrollerController);
626 visitor->trace(m_visualViewport); 624 visitor->trace(m_visualViewport);
627 visitor->trace(m_overscrollController); 625 visitor->trace(m_overscrollController);
628 visitor->trace(m_mainFrame); 626 visitor->trace(m_mainFrame);
629 visitor->trace(m_validationMessageClient); 627 visitor->trace(m_validationMessageClient);
630 visitor->trace(m_useCounter); 628 visitor->trace(m_useCounter);
631 visitor->trace(m_frameHost);
632 Supplementable<Page>::trace(visitor); 629 Supplementable<Page>::trace(visitor);
633 PageVisibilityNotifier::trace(visitor); 630 PageVisibilityNotifier::trace(visitor);
634 } 631 }
635 632
636 void Page::layerTreeViewInitialized(WebLayerTreeView& layerTreeView, 633 void Page::layerTreeViewInitialized(WebLayerTreeView& layerTreeView,
637 FrameView* view) { 634 FrameView* view) {
638 if (scrollingCoordinator()) 635 if (scrollingCoordinator())
639 scrollingCoordinator()->layerTreeViewInitialized(layerTreeView, view); 636 scrollingCoordinator()->layerTreeViewInitialized(layerTreeView, view);
640 } 637 }
641 638
(...skipping 30 matching lines...) Expand all
672 : chromeClient(nullptr), 669 : chromeClient(nullptr),
673 contextMenuClient(nullptr), 670 contextMenuClient(nullptr),
674 editorClient(nullptr), 671 editorClient(nullptr),
675 spellCheckerClient(nullptr) {} 672 spellCheckerClient(nullptr) {}
676 673
677 Page::PageClients::~PageClients() {} 674 Page::PageClients::~PageClients() {}
678 675
679 template class CORE_TEMPLATE_EXPORT Supplement<Page>; 676 template class CORE_TEMPLATE_EXPORT Supplement<Page>;
680 677
681 } // namespace blink 678 } // 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