| 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..558b0f738b814c496bc749749f2ec119e981c1d2 100644
|
| --- a/third_party/WebKit/Source/core/fetch/ResourceFetcher.cpp
|
| +++ b/third_party/WebKit/Source/core/fetch/ResourceFetcher.cpp
|
| @@ -31,6 +31,7 @@
|
| #include "core/fetch/CrossOriginAccessControl.h"
|
| #include "core/fetch/FetchContext.h"
|
| #include "core/fetch/FetchInitiatorTypeNames.h"
|
| +#include "core/fetch/InspectorFetchTraceEvents.h"
|
| #include "core/fetch/MemoryCache.h"
|
| #include "core/fetch/ResourceLoader.h"
|
| #include "core/fetch/ResourceLoaderSet.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);
|
|
|