| Index: third_party/WebKit/Source/core/fetch/ResourceLoader.cpp
|
| diff --git a/third_party/WebKit/Source/core/fetch/ResourceLoader.cpp b/third_party/WebKit/Source/core/fetch/ResourceLoader.cpp
|
| index a549bf6f92b6c0378965ddbf3d9873d8d4a42c01..4bb7288df93a47b1d633c885e40616f76bd954e0 100644
|
| --- a/third_party/WebKit/Source/core/fetch/ResourceLoader.cpp
|
| +++ b/third_party/WebKit/Source/core/fetch/ResourceLoader.cpp
|
| @@ -34,6 +34,7 @@
|
| #include "core/fetch/Resource.h"
|
| #include "core/fetch/ResourceFetcher.h"
|
| #include "core/fetch/ResourcePtr.h"
|
| +#include "core/inspector/InspectorTraceEvents.h"
|
| #include "platform/Logging.h"
|
| #include "platform/SharedBuffer.h"
|
| #include "platform/ThreadedDataReceiver.h"
|
| @@ -314,6 +315,7 @@ void ResourceLoader::didReceiveResponse(WebURLLoader*, const WebURLResponse& res
|
| m_connectionState = ConnectionStateReceivedResponse;
|
|
|
| const ResourceResponse& resourceResponse = response.toResourceResponse();
|
| + TRACE_EVENT1("devtools.timeline", "ResourceReceiveResponse", "data", InspectorReceiveResponseEvent::data(m_resource->identifier(), resourceResponse));
|
|
|
| if (responseNeedsAccessControlCheck()) {
|
| if (response.wasFetchedViaServiceWorker()) {
|
| @@ -392,6 +394,7 @@ void ResourceLoader::didReceiveData(WebURLLoader*, const char* data, int length,
|
| {
|
| ASSERT(m_state != Terminated);
|
| RELEASE_ASSERT(m_connectionState == ConnectionStateReceivedResponse || m_connectionState == ConnectionStateReceivingData);
|
| + TRACE_EVENT1("devtools.timeline", "ResourceReceivedData", "data", InspectorReceiveDataEvent::data(m_resource->identifier(), encodedDataLength));
|
| m_connectionState = ConnectionStateReceivingData;
|
|
|
| // It is possible to receive data on uninitialized resources if it had an error status code, and we are running a nested message
|
| @@ -413,6 +416,7 @@ void ResourceLoader::didReceiveData(WebURLLoader*, const char* data, int length,
|
| void ResourceLoader::didFinishLoading(WebURLLoader*, double finishTime, int64_t encodedDataLength)
|
| {
|
| RELEASE_ASSERT(m_connectionState == ConnectionStateReceivedResponse || m_connectionState == ConnectionStateReceivingData);
|
| + TRACE_EVENT1("devtools.timeline", "ResourceFinish", "data", InspectorResourceFinishEvent::data(m_resource->identifier(), finishTime, false));
|
| m_connectionState = ConnectionStateFinishedLoading;
|
| if (m_state != Initialized)
|
| return;
|
| @@ -436,6 +440,7 @@ void ResourceLoader::didFinishLoading(WebURLLoader*, double finishTime, int64_t
|
|
|
| void ResourceLoader::didFail(WebURLLoader*, const WebURLError& error)
|
| {
|
| + TRACE_EVENT1("devtools.timeline", "ResourceFinish", "data", InspectorResourceFinishEvent::data(m_resource->identifier(), 0, true));
|
| m_connectionState = ConnectionStateFailed;
|
| ASSERT(m_state != Terminated);
|
| WTF_LOG(ResourceLoading, "Failed to load '%s'.\n", m_resource->url().string().latin1().data());
|
|
|