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

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

Issue 2734873003: Move FrameHost::m_browserControls to Page (Closed)
Patch Set: Rebased to 1 off origin/master 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 90 matching lines...) Expand 10 before | Expand all | Expand 10 after
101 void decrementSubframeCount() { 101 void decrementSubframeCount() {
102 ASSERT(m_subframeCount); 102 ASSERT(m_subframeCount);
103 --m_subframeCount; 103 --m_subframeCount;
104 } 104 }
105 int subframeCount() const; 105 int subframeCount() const;
106 106
107 private: 107 private:
108 explicit FrameHost(Page&); 108 explicit FrameHost(Page&);
109 109
110 const Member<Page> m_page; 110 const Member<Page> m_page;
111 const Member<BrowserControls> m_browserControls;
112 const Member<VisualViewport> m_visualViewport; 111 const Member<VisualViewport> m_visualViewport;
113 const Member<OverscrollController> m_overscrollController; 112 const Member<OverscrollController> m_overscrollController;
114 const Member<EventHandlerRegistry> m_eventHandlerRegistry; 113 const Member<EventHandlerRegistry> m_eventHandlerRegistry;
115 const Member<ConsoleMessageStorage> m_consoleMessageStorage; 114 const Member<ConsoleMessageStorage> m_consoleMessageStorage;
116 const Member<TopDocumentRootScrollerController> 115 const Member<TopDocumentRootScrollerController>
117 m_globalRootScrollerController; 116 m_globalRootScrollerController;
118 117
119 AtomicString m_overrideEncoding; 118 AtomicString m_overrideEncoding;
120 int m_subframeCount; 119 int m_subframeCount;
121 }; 120 };
122 121
123 } // namespace blink 122 } // namespace blink
124 123
125 #endif // FrameHost_h 124 #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