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

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

Issue 1365503006: Oilpan: fix build after r350813. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 2 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 | 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) 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 87 matching lines...) Expand 10 before | Expand all | Expand 10 after
98 static const int maxNumberOfFrames = 1000; 98 static const int maxNumberOfFrames = 1000;
99 void incrementSubframeCount() { ++m_subframeCount; } 99 void incrementSubframeCount() { ++m_subframeCount; }
100 void decrementSubframeCount() { ASSERT(m_subframeCount); --m_subframeCount; } 100 void decrementSubframeCount() { ASSERT(m_subframeCount); --m_subframeCount; }
101 int subframeCount() const; 101 int subframeCount() const;
102 102
103 void setDefaultPageScaleLimits(float minScale, float maxScale); 103 void setDefaultPageScaleLimits(float minScale, float maxScale);
104 void setUserAgentPageScaleConstraints(PageScaleConstraints newConstraints); 104 void setUserAgentPageScaleConstraints(PageScaleConstraints newConstraints);
105 105
106 WebFrameHostScheduler* frameHostScheduler() const { return m_frameHostSchedu ler.get(); } 106 WebFrameHostScheduler* frameHostScheduler() const { return m_frameHostSchedu ler.get(); }
107 107
108
109 private: 108 private:
110 explicit FrameHost(Page&); 109 explicit FrameHost(Page&);
111 110
112 RawPtrWillBeMember<Page> m_page; 111 RawPtrWillBeMember<Page> m_page;
113 const OwnPtrWillBeMember<TopControls> m_topControls; 112 const OwnPtrWillBeMember<TopControls> m_topControls;
114 const OwnPtr<PageScaleConstraintsSet> m_pageScaleConstraintsSet; 113 const OwnPtr<PageScaleConstraintsSet> m_pageScaleConstraintsSet;
115 const OwnPtrWillBeMember<VisualViewport> m_visualViewport; 114 const OwnPtrWillBeMember<VisualViewport> m_visualViewport;
116 const OwnPtrWillBeMember<EventHandlerRegistry> m_eventHandlerRegistry; 115 const OwnPtrWillBeMember<EventHandlerRegistry> m_eventHandlerRegistry;
117 const OwnPtrWillBeMember<ConsoleMessageStorage> m_consoleMessageStorage; 116 const OwnPtrWillBeMember<ConsoleMessageStorage> m_consoleMessageStorage;
118 const OwnPtrWillBeMember<WebFrameHostScheduler> m_frameHostScheduler; 117 const OwnPtr<WebFrameHostScheduler> m_frameHostScheduler;
119 118
120 AtomicString m_overrideEncoding; 119 AtomicString m_overrideEncoding;
121 int m_subframeCount; 120 int m_subframeCount;
122 }; 121 };
123 122
124 } 123 }
125 124
126 #endif // FrameHost_h 125 #endif // FrameHost_h
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698