Chromium Code Reviews| Index: Source/core/frame/FrameConsole.cpp |
| diff --git a/Source/core/frame/FrameConsole.cpp b/Source/core/frame/FrameConsole.cpp |
| index 5db4e7ec6934efb4ac6a8f42ae613aa708a62c8c..c3e2ab9b2634a0a2ef0477c04abf128c653a7d70 100644 |
| --- a/Source/core/frame/FrameConsole.cpp |
| +++ b/Source/core/frame/FrameConsole.cpp |
| @@ -165,16 +165,8 @@ void FrameConsole::unmute() |
| ConsoleMessageStorage* FrameConsole::messageStorage() |
| { |
| - LocalFrame* curFrame = m_frame; |
| - // FIXME: Move the console's messageStorage off the main frame. |
| - Frame* topFrame = curFrame->localFrameRoot(); |
| - ASSERT(topFrame->isLocalFrame()); |
| - LocalFrame* localTopFrame = toLocalFrame(topFrame); |
| - if (localTopFrame != curFrame) |
| - return localTopFrame->console().messageStorage(); |
| - if (!m_consoleMessageStorage) |
| - m_consoleMessageStorage = ConsoleMessageStorage::createForFrame(m_frame); |
| - return m_consoleMessageStorage.get(); |
| + ASSERT(m_frame->page()); |
| + return &m_frame->page()->frameHost().consoleMessageStorage(); |
|
Charlie Reis
2014/10/15 17:09:17
nit: Can we use m_frame->host() instead of m_frame
|
| } |
| void FrameConsole::clearMessages() |