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

Unified Diff: Source/core/frame/FrameConsole.cpp

Issue 645693003: [DevTools] Console Message Storage moved from top local frame to frame host (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Rebased Created 6 years, 2 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | Source/core/frame/FrameHost.h » ('j') | Source/core/frame/LocalFrame.cpp » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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();
}
void FrameConsole::clearMessages()
« no previous file with comments | « no previous file | Source/core/frame/FrameHost.h » ('j') | Source/core/frame/LocalFrame.cpp » ('J')

Powered by Google App Engine
This is Rietveld 408576698