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

Unified Diff: third_party/WebKit/Source/core/fetch/ResourceLoader.cpp

Issue 1410153009: DevTools: Make network events continuous on Timeline (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: 4 landing Created 5 years, 1 month 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
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..a49167eb212d8cff484e90f882778faf87ca4569 100644
--- a/third_party/WebKit/Source/core/fetch/ResourceLoader.cpp
+++ b/third_party/WebKit/Source/core/fetch/ResourceLoader.cpp
@@ -31,12 +31,14 @@
#include "core/fetch/ResourceLoader.h"
#include "core/fetch/CSSStyleSheetResource.h"
+#include "core/fetch/InspectorFetchTraceEvents.h"
#include "core/fetch/Resource.h"
#include "core/fetch/ResourceFetcher.h"
#include "core/fetch/ResourcePtr.h"
#include "platform/Logging.h"
#include "platform/SharedBuffer.h"
#include "platform/ThreadedDataReceiver.h"
+#include "platform/TraceEvent.h"
#include "platform/exported/WrappedResourceRequest.h"
#include "platform/exported/WrappedResourceResponse.h"
#include "platform/network/ResourceError.h"
@@ -314,6 +316,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 +395,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 +417,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 +441,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());

Powered by Google App Engine
This is Rietveld 408576698