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

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

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
« no previous file with comments | « no previous file | third_party/WebKit/Source/core/frame/FrameHost.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) 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 96 matching lines...) Expand 10 before | Expand all | Expand 10 after
107 107
108 void setDefaultPageScaleLimits(float minScale, float maxScale); 108 void setDefaultPageScaleLimits(float minScale, float maxScale);
109 void setUserAgentPageScaleConstraints( 109 void setUserAgentPageScaleConstraints(
110 const PageScaleConstraints& newConstraints); 110 const PageScaleConstraints& newConstraints);
111 111
112 private: 112 private:
113 explicit FrameHost(Page&); 113 explicit FrameHost(Page&);
114 114
115 const Member<Page> m_page; 115 const Member<Page> m_page;
116 const Member<BrowserControls> m_browserControls; 116 const Member<BrowserControls> m_browserControls;
117 const std::unique_ptr<PageScaleConstraintsSet> m_pageScaleConstraintsSet;
118 const Member<VisualViewport> m_visualViewport; 117 const Member<VisualViewport> m_visualViewport;
119 const Member<OverscrollController> m_overscrollController; 118 const Member<OverscrollController> m_overscrollController;
120 const Member<EventHandlerRegistry> m_eventHandlerRegistry; 119 const Member<EventHandlerRegistry> m_eventHandlerRegistry;
121 const Member<ConsoleMessageStorage> m_consoleMessageStorage; 120 const Member<ConsoleMessageStorage> m_consoleMessageStorage;
122 const Member<TopDocumentRootScrollerController> 121 const Member<TopDocumentRootScrollerController>
123 m_globalRootScrollerController; 122 m_globalRootScrollerController;
124 123
125 AtomicString m_overrideEncoding; 124 AtomicString m_overrideEncoding;
126 int m_subframeCount; 125 int m_subframeCount;
127 }; 126 };
128 127
129 } // namespace blink 128 } // namespace blink
130 129
131 #endif // FrameHost_h 130 #endif // FrameHost_h
OLDNEW
« no previous file with comments | « no previous file | third_party/WebKit/Source/core/frame/FrameHost.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698