| Index: Source/core/frame/FrameConsole.cpp
|
| diff --git a/Source/core/frame/FrameConsole.cpp b/Source/core/frame/FrameConsole.cpp
|
| index 47b57be79f864e29f4da6dc780c30843f352e030..6fd55a2c9f7f8cd84831c01c82bf30c14404f2cf 100644
|
| --- a/Source/core/frame/FrameConsole.cpp
|
| +++ b/Source/core/frame/FrameConsole.cpp
|
| @@ -52,7 +52,7 @@ int muteCount = 0;
|
| }
|
|
|
| FrameConsole::FrameConsole(LocalFrame& frame)
|
| - : m_frame(frame)
|
| + : m_frame(&frame)
|
| {
|
| }
|
|
|
| @@ -66,7 +66,7 @@ void FrameConsole::addMessage(PassRefPtrWillBeRawPtr<ConsoleMessage> prpConsoleM
|
|
|
| // FIXME: This should not need to reach for the main-frame.
|
| // Inspector code should just take the current frame and know how to walk itself.
|
| - ExecutionContext* context = m_frame.document();
|
| + ExecutionContext* context = m_frame->document();
|
| if (!context)
|
| return;
|
|
|
| @@ -87,24 +87,24 @@ void FrameConsole::addMessage(PassRefPtrWillBeRawPtr<ConsoleMessage> prpConsoleM
|
|
|
| RefPtrWillBeRawPtr<ScriptCallStack> reportedCallStack = nullptr;
|
| if (consoleMessage->source() != ConsoleAPIMessageSource) {
|
| - if (consoleMessage->callStack() && m_frame.chromeClient().shouldReportDetailedMessageForSource(messageURL))
|
| + if (consoleMessage->callStack() && m_frame->chromeClient().shouldReportDetailedMessageForSource(messageURL))
|
| reportedCallStack = consoleMessage->callStack();
|
| } else {
|
| - if (!m_frame.host() || (consoleMessage->scriptArguments() && consoleMessage->scriptArguments()->argumentCount() == 0))
|
| + if (!m_frame->host() || (consoleMessage->scriptArguments() && !consoleMessage->scriptArguments()->argumentCount()))
|
| return;
|
|
|
| MessageType type = consoleMessage->type();
|
| if (type == StartGroupMessageType || type == EndGroupMessageType || type == StartGroupCollapsedMessageType)
|
| return;
|
|
|
| - if (m_frame.chromeClient().shouldReportDetailedMessageForSource(messageURL))
|
| + if (m_frame->chromeClient().shouldReportDetailedMessageForSource(messageURL))
|
| reportedCallStack = createScriptCallStack(ScriptCallStack::maxCallStackSizeToCapture);
|
| }
|
|
|
| String stackTrace;
|
| if (reportedCallStack)
|
| stackTrace = FrameConsole::formatStackTraceString(consoleMessage->message(), reportedCallStack);
|
| - m_frame.chromeClient().addMessageToConsole(&m_frame, consoleMessage->source(), consoleMessage->level(), consoleMessage->message(), lineNumber, messageURL, stackTrace);
|
| + m_frame->chromeClient().addMessageToConsole(m_frame, consoleMessage->source(), consoleMessage->level(), consoleMessage->message(), lineNumber, messageURL, stackTrace);
|
| }
|
|
|
| void FrameConsole::reportResourceResponseReceived(DocumentLoader* loader, unsigned long requestIdentifier, const ResourceResponse& response)
|
| @@ -150,14 +150,14 @@ void FrameConsole::unmute()
|
|
|
| ConsoleMessageStorage* FrameConsole::messageStorage()
|
| {
|
| - LocalFrame* curFrame = &m_frame;
|
| + LocalFrame* curFrame = m_frame;
|
| Frame* topFrame = curFrame->tree().top();
|
| ASSERT(topFrame->isLocalFrame());
|
| LocalFrame* localTopFrame = toLocalFrame(topFrame);
|
| if (localTopFrame != curFrame)
|
| return localTopFrame->console().messageStorage();
|
| if (!m_consoleMessageStorage)
|
| - m_consoleMessageStorage = ConsoleMessageStorage::createForFrame(&m_frame);
|
| + m_consoleMessageStorage = ConsoleMessageStorage::createForFrame(m_frame);
|
| return m_consoleMessageStorage.get();
|
| }
|
|
|
| @@ -173,6 +173,7 @@ void FrameConsole::adoptWorkerMessagesAfterTermination(WorkerGlobalScopeProxy* p
|
|
|
| void FrameConsole::trace(Visitor* visitor)
|
| {
|
| + visitor->trace(m_frame);
|
| visitor->trace(m_consoleMessageStorage);
|
| }
|
|
|
|
|