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

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

Issue 1410153009: DevTools: Make network events continuous on Timeline (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: move events to a separate file 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/ResourceFetcher.cpp
diff --git a/third_party/WebKit/Source/core/fetch/ResourceFetcher.cpp b/third_party/WebKit/Source/core/fetch/ResourceFetcher.cpp
index 9066f8141d813477d92c978ba9e0f0449964fa98..83e38a38866bd36d00b2edbbe045fe34c113d3cc 100644
--- a/third_party/WebKit/Source/core/fetch/ResourceFetcher.cpp
+++ b/third_party/WebKit/Source/core/fetch/ResourceFetcher.cpp
@@ -34,6 +34,7 @@
#include "core/fetch/MemoryCache.h"
#include "core/fetch/ResourceLoader.h"
#include "core/fetch/ResourceLoaderSet.h"
+#include "core/fetch/TraceEventArguments.h"
#include "core/fetch/UniqueIdentifier.h"
#include "platform/Logging.h"
#include "platform/RuntimeEnabledFeatures.h"
@@ -67,7 +68,7 @@ enum SriResourceIntegrityMismatchEvent {
SriResourceIntegrityMismatchEventCount
};
-}
+} // namespace
static void RecordSriResourceIntegrityMismatchEvent(SriResourceIntegrityMismatchEvent event)
{
@@ -338,6 +339,9 @@ void ResourceFetcher::moveCachedNonBlockingResourceToBlocking(Resource* resource
ResourcePtr<Resource> ResourceFetcher::requestResource(FetchRequest& request, const ResourceFactory& factory, const SubstituteData& substituteData)
{
ASSERT(request.options().synchronousPolicy == RequestAsynchronously || factory.type() == Resource::Raw || factory.type() == Resource::XSLStyleSheet);
+ unsigned long identifier = createUniqueIdentifier();
+ TRACE_EVENT1("devtools.timeline", "ResourceSendRequest",
+ "data", InspectorSendRequestEvent::data(identifier, request.resourceRequest()));
context().upgradeInsecureRequest(request);
context().addClientHintsIfNecessary(request);
@@ -407,7 +411,7 @@ ResourcePtr<Resource> ResourceFetcher::requestResource(FetchRequest& request, co
m_deadStatsRecorder.update(policy);
if (policy != Use)
- resource->setIdentifier(createUniqueIdentifier());
+ resource->setIdentifier(identifier);
if (!request.forPreload() || policy != Use) {
ResourceLoadPriority priority = loadPriority(factory.type(), request, ResourcePriority::NotVisible);

Powered by Google App Engine
This is Rietveld 408576698