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

Side by Side Diff: third_party/WebKit/Source/core/frame/FrameHost.cpp

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) 2013 Google Inc. All rights reserved. 2 * Copyright (C) 2013 Google Inc. All rights reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions are 5 * modification, are permitted provided that the following conditions are
6 * met: 6 * met:
7 * 7 *
8 * * Redistributions of source code must retain the above copyright 8 * * Redistributions of source code must retain the above copyright
9 * notice, this list of conditions and the following disclaimer. 9 * notice, this list of conditions and the following disclaimer.
10 * * Redistributions in binary form must reproduce the above 10 * * Redistributions in binary form must reproduce the above
(...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after
45 45
46 namespace blink { 46 namespace blink {
47 47
48 FrameHost* FrameHost::create(Page& page) { 48 FrameHost* FrameHost::create(Page& page) {
49 return new FrameHost(page); 49 return new FrameHost(page);
50 } 50 }
51 51
52 FrameHost::FrameHost(Page& page) 52 FrameHost::FrameHost(Page& page)
53 : m_page(&page), 53 : m_page(&page),
54 m_browserControls(BrowserControls::create(*this)), 54 m_browserControls(BrowserControls::create(*this)),
55 m_pageScaleConstraintsSet(PageScaleConstraintsSet::create()),
56 m_visualViewport(VisualViewport::create(*this)), 55 m_visualViewport(VisualViewport::create(*this)),
57 m_overscrollController( 56 m_overscrollController(
58 OverscrollController::create(*m_visualViewport, 57 OverscrollController::create(*m_visualViewport,
59 m_page->chromeClient())), 58 m_page->chromeClient())),
60 m_eventHandlerRegistry(new EventHandlerRegistry(*this)), 59 m_eventHandlerRegistry(new EventHandlerRegistry(*this)),
61 m_consoleMessageStorage(new ConsoleMessageStorage()), 60 m_consoleMessageStorage(new ConsoleMessageStorage()),
62 m_globalRootScrollerController( 61 m_globalRootScrollerController(
63 TopDocumentRootScrollerController::create(*this)), 62 TopDocumentRootScrollerController::create(*this)),
64 m_subframeCount(0) {} 63 m_subframeCount(0) {}
65 64
(...skipping 26 matching lines...) Expand all
92 91
93 VisualViewport& FrameHost::visualViewport() { 92 VisualViewport& FrameHost::visualViewport() {
94 return *m_visualViewport; 93 return *m_visualViewport;
95 } 94 }
96 95
97 const VisualViewport& FrameHost::visualViewport() const { 96 const VisualViewport& FrameHost::visualViewport() const {
98 return *m_visualViewport; 97 return *m_visualViewport;
99 } 98 }
100 99
101 PageScaleConstraintsSet& FrameHost::pageScaleConstraintsSet() { 100 PageScaleConstraintsSet& FrameHost::pageScaleConstraintsSet() {
102 return *m_pageScaleConstraintsSet; 101 return page().pageScaleConstraintsSet();
103 } 102 }
104 103
105 const PageScaleConstraintsSet& FrameHost::pageScaleConstraintsSet() const { 104 const PageScaleConstraintsSet& FrameHost::pageScaleConstraintsSet() const {
106 return *m_pageScaleConstraintsSet; 105 return page().pageScaleConstraintsSet();
107 } 106 }
108 107
109 EventHandlerRegistry& FrameHost::eventHandlerRegistry() { 108 EventHandlerRegistry& FrameHost::eventHandlerRegistry() {
110 return *m_eventHandlerRegistry; 109 return *m_eventHandlerRegistry;
111 } 110 }
112 111
113 const EventHandlerRegistry& FrameHost::eventHandlerRegistry() const { 112 const EventHandlerRegistry& FrameHost::eventHandlerRegistry() const {
114 return *m_eventHandlerRegistry; 113 return *m_eventHandlerRegistry;
115 } 114 }
116 115
(...skipping 75 matching lines...) Expand 10 before | Expand all | Expand 10 after
192 191
193 FrameView* rootView = page().deprecatedLocalMainFrame()->view(); 192 FrameView* rootView = page().deprecatedLocalMainFrame()->view();
194 193
195 if (!rootView) 194 if (!rootView)
196 return; 195 return;
197 196
198 rootView->setNeedsLayout(); 197 rootView->setNeedsLayout();
199 } 198 }
200 199
201 } // namespace blink 200 } // namespace blink
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/core/frame/FrameHost.h ('k') | third_party/WebKit/Source/core/page/Page.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698