| Index: Source/core/inspector/InspectorTimelineAgent.cpp
|
| diff --git a/Source/core/inspector/InspectorTimelineAgent.cpp b/Source/core/inspector/InspectorTimelineAgent.cpp
|
| index cc4437462d941245b144632b1ba22e0bcfd911ad..d7719cc347fd662c6d5616dd2d54e0792ba3db7b 100644
|
| --- a/Source/core/inspector/InspectorTimelineAgent.cpp
|
| +++ b/Source/core/inspector/InspectorTimelineAgent.cpp
|
| @@ -356,7 +356,7 @@
|
| return;
|
| m_state->setBoolean(TimelineAgentState::startedFromProtocol, true);
|
|
|
| - if (LocalFrame* frame = inspectedFrame()) {
|
| + if (LocalFrame* frame = mainFrame()) {
|
| if (UseCounter* useCounter = UseCounter::getFrom(frame->document()))
|
| useCounter->count(UseCounter::TimelineStart);
|
| }
|
| @@ -464,7 +464,7 @@
|
|
|
| for (size_t i = 0; i < m_consoleTimelines.size(); ++i) {
|
| String message = String::format("Timeline '%s' terminated.", m_consoleTimelines[i].utf8().data());
|
| - inspectedFrame()->console().addMessage(ConsoleMessage::create(JSMessageSource, DebugMessageLevel, message));
|
| + mainFrame()->console().addMessage(ConsoleMessage::create(JSMessageSource, DebugMessageLevel, message));
|
| }
|
| m_consoleTimelines.clear();
|
|
|
| @@ -830,7 +830,7 @@
|
|
|
| RefPtrWillBeRawPtr<ConsoleMessage> consoleMessage = ConsoleMessage::create(JSMessageSource, DebugMessageLevel, message);
|
| consoleMessage->setScriptState(scriptState);
|
| - inspectedFrame()->console().addMessage(consoleMessage.release());
|
| + mainFrame()->console().addMessage(consoleMessage.release());
|
| m_consoleTimelines.append(title);
|
| if (!isStarted()) {
|
| m_state->setBoolean(TimelineAgentState::bufferEvents, true);
|
| @@ -853,7 +853,7 @@
|
| String message = String::format("Timeline '%s' was not started.", title.utf8().data());
|
| RefPtrWillBeRawPtr<ConsoleMessage> consoleMessage = ConsoleMessage::create(JSMessageSource, DebugMessageLevel, message);
|
| consoleMessage->setScriptState(scriptState);
|
| - inspectedFrame()->console().addMessage(consoleMessage.release());
|
| + mainFrame()->console().addMessage(consoleMessage.release());
|
| return;
|
| }
|
|
|
| @@ -866,12 +866,12 @@
|
| }
|
| RefPtrWillBeRawPtr<ConsoleMessage> consoleMessage = ConsoleMessage::create(JSMessageSource, DebugMessageLevel, message);
|
| consoleMessage->setScriptState(scriptState);
|
| - inspectedFrame()->console().addMessage(consoleMessage.release());
|
| + mainFrame()->console().addMessage(consoleMessage.release());
|
| }
|
|
|
| void InspectorTimelineAgent::domContentLoadedEventFired(LocalFrame* frame)
|
| {
|
| - bool isMainFrame = frame && m_pageAgent && (frame == m_pageAgent->inspectedFrame());
|
| + bool isMainFrame = frame && m_pageAgent && (frame == m_pageAgent->mainFrame());
|
| appendRecord(TimelineRecordFactory::createMarkData(isMainFrame), TimelineRecordType::MarkDOMContent, false, frame);
|
| if (isMainFrame)
|
| m_mayEmitFirstPaint = true;
|
| @@ -879,7 +879,7 @@
|
|
|
| void InspectorTimelineAgent::loadEventFired(LocalFrame* frame)
|
| {
|
| - bool isMainFrame = frame && m_pageAgent && (frame == m_pageAgent->inspectedFrame());
|
| + bool isMainFrame = frame && m_pageAgent && (frame == m_pageAgent->mainFrame());
|
| appendRecord(TimelineRecordFactory::createMarkData(isMainFrame), TimelineRecordType::MarkLoad, false, frame);
|
| }
|
|
|
| @@ -1284,11 +1284,11 @@
|
| return WTF::monotonicallyIncreasingTime() * msPerSecond;
|
| }
|
|
|
| -LocalFrame* InspectorTimelineAgent::inspectedFrame() const
|
| +LocalFrame* InspectorTimelineAgent::mainFrame() const
|
| {
|
| if (!m_pageAgent)
|
| return nullptr;
|
| - return m_pageAgent->inspectedFrame();
|
| + return m_pageAgent->mainFrame();
|
| }
|
|
|
| PassRefPtr<TimelineEvent> InspectorTimelineAgent::createRecordForEvent(const TraceEventDispatcher::TraceEvent& event, const String& type, PassRefPtr<JSONObject> data)
|
|
|