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

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

Issue 1162033003: Oilpan: fix build after r196078. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 5 years, 6 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 | Annotate | Revision Log
« no previous file with comments | « no previous file | 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 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 private: 103 private:
104 explicit FrameHost(Page&); 104 explicit FrameHost(Page&);
105 105
106 RawPtrWillBeMember<Page> m_page; 106 RawPtrWillBeMember<Page> m_page;
107 const OwnPtrWillBeMember<TopControls> m_topControls; 107 const OwnPtrWillBeMember<TopControls> m_topControls;
108 const OwnPtrWillBeMember<PageScaleConstraintsSet> m_pageScaleConstraintsSet; 108 const OwnPtr<PageScaleConstraintsSet> m_pageScaleConstraintsSet;
109 const OwnPtr<PinchViewport> m_pinchViewport; 109 const OwnPtr<PinchViewport> m_pinchViewport;
110 const OwnPtrWillBeMember<EventHandlerRegistry> m_eventHandlerRegistry; 110 const OwnPtrWillBeMember<EventHandlerRegistry> m_eventHandlerRegistry;
111 const OwnPtrWillBeMember<ConsoleMessageStorage> m_consoleMessageStorage; 111 const OwnPtrWillBeMember<ConsoleMessageStorage> m_consoleMessageStorage;
112 112
113 AtomicString m_overrideEncoding; 113 AtomicString m_overrideEncoding;
114 int m_subframeCount; 114 int m_subframeCount;
115 }; 115 };
116 116
117 } 117 }
118 118
119 #endif // FrameHost_h 119 #endif // FrameHost_h
OLDNEW
« no previous file with comments | « no previous file | Source/core/frame/FrameHost.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698