| 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 92 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 103 | 103 |
| 104 ConsoleMessageStorage& FrameHost::consoleMessageStorage() const | 104 ConsoleMessageStorage& FrameHost::consoleMessageStorage() const |
| 105 { | 105 { |
| 106 return *m_consoleMessageStorage; | 106 return *m_consoleMessageStorage; |
| 107 } | 107 } |
| 108 | 108 |
| 109 DEFINE_TRACE(FrameHost) | 109 DEFINE_TRACE(FrameHost) |
| 110 { | 110 { |
| 111 visitor->trace(m_page); | 111 visitor->trace(m_page); |
| 112 visitor->trace(m_topControls); | 112 visitor->trace(m_topControls); |
| 113 visitor->trace(m_pageScaleConstraintsSet); | |
| 114 visitor->trace(m_eventHandlerRegistry); | 113 visitor->trace(m_eventHandlerRegistry); |
| 115 visitor->trace(m_consoleMessageStorage); | 114 visitor->trace(m_consoleMessageStorage); |
| 116 } | 115 } |
| 117 | 116 |
| 118 #if ENABLE(ASSERT) | 117 #if ENABLE(ASSERT) |
| 119 void checkFrameCountConsistency(int expectedFrameCount, Frame* frame) | 118 void checkFrameCountConsistency(int expectedFrameCount, Frame* frame) |
| 120 { | 119 { |
| 121 ASSERT(expectedFrameCount >= 0); | 120 ASSERT(expectedFrameCount >= 0); |
| 122 | 121 |
| 123 int actualFrameCount = 0; | 122 int actualFrameCount = 0; |
| 124 for (; frame; frame = frame->tree().traverseNext()) | 123 for (; frame; frame = frame->tree().traverseNext()) |
| 125 ++actualFrameCount; | 124 ++actualFrameCount; |
| 126 | 125 |
| 127 ASSERT(expectedFrameCount == actualFrameCount); | 126 ASSERT(expectedFrameCount == actualFrameCount); |
| 128 } | 127 } |
| 129 #endif | 128 #endif |
| 130 | 129 |
| 131 int FrameHost::subframeCount() const | 130 int FrameHost::subframeCount() const |
| 132 { | 131 { |
| 133 #if ENABLE(ASSERT) | 132 #if ENABLE(ASSERT) |
| 134 checkFrameCountConsistency(m_subframeCount + 1, m_page->mainFrame()); | 133 checkFrameCountConsistency(m_subframeCount + 1, m_page->mainFrame()); |
| 135 #endif | 134 #endif |
| 136 return m_subframeCount; | 135 return m_subframeCount; |
| 137 } | 136 } |
| 138 | 137 |
| 139 } | 138 } |
| OLD | NEW |