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

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

Issue 1127023002: Oilpan: address ScrollableArea-induced build breakage from r194957. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 5 years, 7 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 | « Source/core/frame/FrameHost.h ('k') | Source/core/frame/PinchViewport.h » ('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 86 matching lines...) Expand 10 before | Expand all | Expand 10 after
97 97
98 ConsoleMessageStorage& FrameHost::consoleMessageStorage() const 98 ConsoleMessageStorage& FrameHost::consoleMessageStorage() const
99 { 99 {
100 return *m_consoleMessageStorage; 100 return *m_consoleMessageStorage;
101 } 101 }
102 102
103 DEFINE_TRACE(FrameHost) 103 DEFINE_TRACE(FrameHost)
104 { 104 {
105 visitor->trace(m_page); 105 visitor->trace(m_page);
106 visitor->trace(m_topControls); 106 visitor->trace(m_topControls);
107 visitor->trace(m_pinchViewport);
108 visitor->trace(m_eventHandlerRegistry); 107 visitor->trace(m_eventHandlerRegistry);
109 visitor->trace(m_consoleMessageStorage); 108 visitor->trace(m_consoleMessageStorage);
110 } 109 }
111 110
112 #if ENABLE(ASSERT) 111 #if ENABLE(ASSERT)
113 void checkFrameCountConsistency(int expectedFrameCount, Frame* frame) 112 void checkFrameCountConsistency(int expectedFrameCount, Frame* frame)
114 { 113 {
115 ASSERT(expectedFrameCount >= 0); 114 ASSERT(expectedFrameCount >= 0);
116 115
117 int actualFrameCount = 0; 116 int actualFrameCount = 0;
118 for (; frame; frame = frame->tree().traverseNext()) 117 for (; frame; frame = frame->tree().traverseNext())
119 ++actualFrameCount; 118 ++actualFrameCount;
120 119
121 ASSERT(expectedFrameCount == actualFrameCount); 120 ASSERT(expectedFrameCount == actualFrameCount);
122 } 121 }
123 #endif 122 #endif
124 123
125 int FrameHost::subframeCount() const 124 int FrameHost::subframeCount() const
126 { 125 {
127 #if ENABLE(ASSERT) 126 #if ENABLE(ASSERT)
128 checkFrameCountConsistency(m_subframeCount + 1, m_page->mainFrame()); 127 checkFrameCountConsistency(m_subframeCount + 1, m_page->mainFrame());
129 #endif 128 #endif
130 return m_subframeCount; 129 return m_subframeCount;
131 } 130 }
132 131
133 } 132 }
OLDNEW
« no previous file with comments | « Source/core/frame/FrameHost.h ('k') | Source/core/frame/PinchViewport.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698