Chromium Code Reviews| 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..76ea37a93e05f924be12d43399c526d8bcf1bc94 100644 |
| --- a/third_party/WebKit/Source/core/fetch/ResourceFetcher.cpp |
| +++ b/third_party/WebKit/Source/core/fetch/ResourceFetcher.cpp |
| @@ -29,6 +29,7 @@ |
| #include "bindings/core/v8/V8DOMActivityLogger.h" |
| #include "core/fetch/CrossOriginAccessControl.h" |
| +#include "core/fetch/DevToolsTraceEvents.h" |
| #include "core/fetch/FetchContext.h" |
| #include "core/fetch/FetchInitiatorTypeNames.h" |
| #include "core/fetch/MemoryCache.h" |
| @@ -67,7 +68,7 @@ enum SriResourceIntegrityMismatchEvent { |
| SriResourceIntegrityMismatchEventCount |
| }; |
| -} |
| +} // namespace |
|
pfeldman
2015/11/13 05:25:46
double space if you are aligning w/ chromium style
alph
2015/11/13 18:46:13
Two spaces don't pass Blink presubmit check.
|
| 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); |