| 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 55 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 66 } | 66 } |
| 67 | 67 |
| 68 OverscrollController& FrameHost::overscrollController() { | 68 OverscrollController& FrameHost::overscrollController() { |
| 69 return page().overscrollController(); | 69 return page().overscrollController(); |
| 70 } | 70 } |
| 71 | 71 |
| 72 const OverscrollController& FrameHost::overscrollController() const { | 72 const OverscrollController& FrameHost::overscrollController() const { |
| 73 return page().overscrollController(); | 73 return page().overscrollController(); |
| 74 } | 74 } |
| 75 | 75 |
| 76 ConsoleMessageStorage& FrameHost::consoleMessageStorage() { | |
| 77 return page().consoleMessageStorage(); | |
| 78 } | |
| 79 | |
| 80 const ConsoleMessageStorage& FrameHost::consoleMessageStorage() const { | |
| 81 return page().consoleMessageStorage(); | |
| 82 } | |
| 83 | |
| 84 DEFINE_TRACE(FrameHost) { | 76 DEFINE_TRACE(FrameHost) { |
| 85 visitor->trace(m_page); | 77 visitor->trace(m_page); |
| 86 } | 78 } |
| 87 | 79 |
| 88 #if DCHECK_IS_ON() | 80 #if DCHECK_IS_ON() |
| 89 void checkFrameCountConsistency(int expectedFrameCount, Frame* frame) { | 81 void checkFrameCountConsistency(int expectedFrameCount, Frame* frame) { |
| 90 ASSERT(expectedFrameCount >= 0); | 82 ASSERT(expectedFrameCount >= 0); |
| 91 | 83 |
| 92 int actualFrameCount = 0; | 84 int actualFrameCount = 0; |
| 93 for (; frame; frame = frame->tree().traverseNext()) | 85 for (; frame; frame = frame->tree().traverseNext()) |
| 94 ++actualFrameCount; | 86 ++actualFrameCount; |
| 95 | 87 |
| 96 ASSERT(expectedFrameCount == actualFrameCount); | 88 ASSERT(expectedFrameCount == actualFrameCount); |
| 97 } | 89 } |
| 98 #endif | 90 #endif |
| 99 | 91 |
| 100 int FrameHost::subframeCount() const { | 92 int FrameHost::subframeCount() const { |
| 101 #if DCHECK_IS_ON() | 93 #if DCHECK_IS_ON() |
| 102 checkFrameCountConsistency(m_subframeCount + 1, m_page->mainFrame()); | 94 checkFrameCountConsistency(m_subframeCount + 1, m_page->mainFrame()); |
| 103 #endif | 95 #endif |
| 104 return m_subframeCount; | 96 return m_subframeCount; |
| 105 } | 97 } |
| 106 | 98 |
| 107 } // namespace blink | 99 } // namespace blink |
| OLD | NEW |