OLD | NEW |
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 91 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
102 | 102 |
103 ConsoleMessageStorage& FrameHost::consoleMessageStorage() const | 103 ConsoleMessageStorage& FrameHost::consoleMessageStorage() const |
104 { | 104 { |
105 return *m_consoleMessageStorage; | 105 return *m_consoleMessageStorage; |
106 } | 106 } |
107 | 107 |
108 DEFINE_TRACE(FrameHost) | 108 DEFINE_TRACE(FrameHost) |
109 { | 109 { |
110 visitor->trace(m_page); | 110 visitor->trace(m_page); |
111 visitor->trace(m_topControls); | 111 visitor->trace(m_topControls); |
| 112 visitor->trace(m_pinchViewport); |
112 visitor->trace(m_eventHandlerRegistry); | 113 visitor->trace(m_eventHandlerRegistry); |
113 visitor->trace(m_consoleMessageStorage); | 114 visitor->trace(m_consoleMessageStorage); |
114 } | 115 } |
115 | 116 |
116 #if ENABLE(ASSERT) | 117 #if ENABLE(ASSERT) |
117 void checkFrameCountConsistency(int expectedFrameCount, Frame* frame) | 118 void checkFrameCountConsistency(int expectedFrameCount, Frame* frame) |
118 { | 119 { |
119 ASSERT(expectedFrameCount >= 0); | 120 ASSERT(expectedFrameCount >= 0); |
120 | 121 |
121 int actualFrameCount = 0; | 122 int actualFrameCount = 0; |
(...skipping 48 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
170 | 171 |
171 FrameView* rootView = page().deprecatedLocalMainFrame()->view(); | 172 FrameView* rootView = page().deprecatedLocalMainFrame()->view(); |
172 | 173 |
173 if (!rootView) | 174 if (!rootView) |
174 return; | 175 return; |
175 | 176 |
176 rootView->setNeedsLayout(); | 177 rootView->setNeedsLayout(); |
177 } | 178 } |
178 | 179 |
179 } | 180 } |
OLD | NEW |