| Index: third_party/WebKit/Source/core/loader/FrameFetchContext.cpp
|
| diff --git a/third_party/WebKit/Source/core/loader/FrameFetchContext.cpp b/third_party/WebKit/Source/core/loader/FrameFetchContext.cpp
|
| index 6630e9b8d804d65e8cf48e8f5442a477a32632c0..3dc981ca810b0e2735471c4d99a3a6d898bd81c9 100644
|
| --- a/third_party/WebKit/Source/core/loader/FrameFetchContext.cpp
|
| +++ b/third_party/WebKit/Source/core/loader/FrameFetchContext.cpp
|
| @@ -45,7 +45,6 @@
|
| #include "core/inspector/ConsoleMessage.h"
|
| #include "core/inspector/InspectorInstrumentation.h"
|
| #include "core/inspector/InspectorResourceAgent.h"
|
| -#include "core/inspector/InspectorTraceEvents.h"
|
| #include "core/inspector/InstrumentingAgents.h"
|
| #include "core/loader/DocumentLoader.h"
|
| #include "core/loader/FrameLoader.h"
|
| @@ -224,7 +223,6 @@ void FrameFetchContext::dispatchWillSendRequest(unsigned long identifier, Resour
|
| {
|
| frame()->loader().applyUserAgent(request);
|
| frame()->loader().client()->dispatchWillSendRequest(m_documentLoader, identifier, request, redirectResponse);
|
| - TRACE_EVENT_INSTANT1("devtools.timeline", "ResourceSendRequest", TRACE_EVENT_SCOPE_THREAD, "data", InspectorSendRequestEvent::data(identifier, frame(), request));
|
| InspectorInstrumentation::willSendRequest(frame(), identifier, ensureLoaderForNotifications(), request, redirectResponse, initiatorInfo);
|
| }
|
|
|
| @@ -241,7 +239,6 @@ void FrameFetchContext::dispatchDidReceiveResponse(unsigned long identifier, con
|
|
|
| frame()->loader().progress().incrementProgress(identifier, response);
|
| frame()->loader().client()->dispatchDidReceiveResponse(m_documentLoader, identifier, response);
|
| - TRACE_EVENT_INSTANT1("devtools.timeline", "ResourceReceiveResponse", TRACE_EVENT_SCOPE_THREAD, "data", InspectorReceiveResponseEvent::data(identifier, frame(), response));
|
| DocumentLoader* documentLoader = ensureLoaderForNotifications();
|
| InspectorInstrumentation::didReceiveResourceResponse(frame(), identifier, documentLoader, response, resourceLoader);
|
| // It is essential that inspector gets resource response BEFORE console.
|
| @@ -251,14 +248,12 @@ void FrameFetchContext::dispatchDidReceiveResponse(unsigned long identifier, con
|
| void FrameFetchContext::dispatchDidReceiveData(unsigned long identifier, const char* data, int dataLength, int encodedDataLength)
|
| {
|
| frame()->loader().progress().incrementProgress(identifier, dataLength);
|
| - TRACE_EVENT_INSTANT1("devtools.timeline", "ResourceReceivedData", TRACE_EVENT_SCOPE_THREAD, "data", InspectorReceiveDataEvent::data(identifier, frame(), encodedDataLength));
|
| InspectorInstrumentation::didReceiveData(frame(), identifier, data, dataLength, encodedDataLength);
|
| }
|
|
|
| void FrameFetchContext::dispatchDidDownloadData(unsigned long identifier, int dataLength, int encodedDataLength)
|
| {
|
| frame()->loader().progress().incrementProgress(identifier, dataLength);
|
| - TRACE_EVENT_INSTANT1("devtools.timeline", "ResourceReceivedData", TRACE_EVENT_SCOPE_THREAD, "data", InspectorReceiveDataEvent::data(identifier, frame(), encodedDataLength));
|
| InspectorInstrumentation::didReceiveData(frame(), identifier, 0, dataLength, encodedDataLength);
|
| }
|
|
|
| @@ -266,8 +261,6 @@ void FrameFetchContext::dispatchDidFinishLoading(unsigned long identifier, doubl
|
| {
|
| frame()->loader().progress().completeProgress(identifier);
|
| frame()->loader().client()->dispatchDidFinishLoading(m_documentLoader, identifier);
|
| -
|
| - TRACE_EVENT_INSTANT1("devtools.timeline", "ResourceFinish", TRACE_EVENT_SCOPE_THREAD, "data", InspectorResourceFinishEvent::data(identifier, finishTime, false));
|
| InspectorInstrumentation::didFinishLoading(frame(), identifier, finishTime, encodedDataLength);
|
| }
|
|
|
| @@ -275,7 +268,6 @@ void FrameFetchContext::dispatchDidFail(unsigned long identifier, const Resource
|
| {
|
| frame()->loader().progress().completeProgress(identifier);
|
| frame()->loader().client()->dispatchDidFinishLoading(m_documentLoader, identifier);
|
| - TRACE_EVENT_INSTANT1("devtools.timeline", "ResourceFinish", TRACE_EVENT_SCOPE_THREAD, "data", InspectorResourceFinishEvent::data(identifier, 0, true));
|
| InspectorInstrumentation::didFailLoading(frame(), identifier, error);
|
| // Notification to FrameConsole should come AFTER InspectorInstrumentation call, DevTools front-end relies on this.
|
| if (!isInternalRequest)
|
|
|