Index: Source/core/fetch/ResourceFetcher.cpp |
diff --git a/Source/core/fetch/ResourceFetcher.cpp b/Source/core/fetch/ResourceFetcher.cpp |
index 27f7aa1c4da11214ec03a1c2ae350bd25f784839..a891d99cbb509b713c6e41e074356b2166bb8b72 100644 |
--- a/Source/core/fetch/ResourceFetcher.cpp |
+++ b/Source/core/fetch/ResourceFetcher.cpp |
@@ -35,12 +35,12 @@ |
#include "core/fetch/ResourceLoader.h" |
#include "core/fetch/ResourceLoaderSet.h" |
#include "core/fetch/UniqueIdentifier.h" |
-#include "core/timing/ResourceTimingInfo.h" |
#include "platform/Logging.h" |
#include "platform/RuntimeEnabledFeatures.h" |
#include "platform/TraceEvent.h" |
#include "platform/mhtml/ArchiveResource.h" |
#include "platform/mhtml/ArchiveResourceCollection.h" |
+#include "platform/network/ResourceTimingInfo.h" |
#include "platform/weborigin/KnownPorts.h" |
#include "platform/weborigin/SecurityOrigin.h" |
#include "platform/weborigin/SecurityPolicy.h" |
@@ -461,8 +461,6 @@ ResourcePtr<Resource> ResourceFetcher::createResourceForLoading(FetchRequest& re |
void ResourceFetcher::storeResourceTimingInitiatorInformation(Resource* resource) |
{ |
- if (resource->options().requestInitiatorContext != DocumentContext) |
- return; |
if (resource->options().initiatorInfo.name == FetchInitiatorTypeNames::internal) |
return; |
@@ -805,7 +803,10 @@ void ResourceFetcher::didFinishLoading(Resource* resource, double finishTime, in |
OwnPtr<ResourceTimingInfo> info = it->value.release(); |
m_resourceTimingInfoMap.remove(it); |
populateResourceTiming(info.get(), resource, false); |
- context().addResourceTiming(*info); |
+ if (resource->options().requestInitiatorContext == DocumentContext) |
+ context().addResourceTiming(*info); |
+ else |
+ resource->reportResourceTiming(*info); |
} |
} |
context().dispatchDidFinishLoading(resource->identifier(), finishTime, encodedDataLength); |