Chromium Code Reviews| Index: Source/core/fetch/ResourceFetcher.cpp |
| diff --git a/Source/core/fetch/ResourceFetcher.cpp b/Source/core/fetch/ResourceFetcher.cpp |
| index 8fdd96d46d063bc213f206260b9e155acb3e8638..2a3914e402fa4f165117942c38488ec9af9d36e0 100644 |
| --- a/Source/core/fetch/ResourceFetcher.cpp |
| +++ b/Source/core/fetch/ResourceFetcher.cpp |
| @@ -35,13 +35,13 @@ |
| #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/TracedValue.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" |
| @@ -468,8 +468,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; |
| @@ -812,7 +810,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->reportResourceTimingToWorker(*info); |
|
kinuko
2015/06/23 05:09:50
I'm wondering if we could rather make it general t
Kunihiko Sakamoto
2015/06/23 06:47:34
Yeah I tried to unify worker / document path, but
|
| } |
| } |
| context().dispatchDidFinishLoading(resource->identifier(), finishTime, encodedDataLength); |