| Index: Source/core/fetch/ResourceFetcher.cpp
|
| diff --git a/Source/core/fetch/ResourceFetcher.cpp b/Source/core/fetch/ResourceFetcher.cpp
|
| index 27f7aa1c4da11214ec03a1c2ae350bd25f784839..7a75de1185be46beefd34835b4b208ce18017360 100644
|
| --- a/Source/core/fetch/ResourceFetcher.cpp
|
| +++ b/Source/core/fetch/ResourceFetcher.cpp
|
| @@ -39,6 +39,7 @@
|
| #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/weborigin/KnownPorts.h"
|
| @@ -250,17 +251,23 @@ void ResourceFetcher::requestLoadStarted(Resource* resource, const FetchRequest&
|
| m_validatedURLs.add(request.resourceRequest().url());
|
| }
|
|
|
| +static PassRefPtr<TraceEvent::ConvertableToTraceFormat> urlForTraceEvent(const KURL& url)
|
| +{
|
| + RefPtr<TracedValue> value = TracedValue::create();
|
| + value->setString("url", url.string());
|
| + return value.release();
|
| +}
|
| +
|
| ResourcePtr<Resource> ResourceFetcher::requestResource(FetchRequest& request, const ResourceFactory& factory)
|
| {
|
| ASSERT(request.options().synchronousPolicy == RequestAsynchronously || factory.type() == Resource::Raw);
|
|
|
| - TRACE_EVENT0("blink", "ResourceFetcher::requestResource");
|
| -
|
| context().upgradeInsecureRequest(request);
|
| context().addClientHintsIfNecessary(request);
|
| context().addCSPHeaderIfNecessary(factory.type(), request);
|
|
|
| KURL url = request.resourceRequest().url();
|
| + TRACE_EVENT1("blink", "ResourceFetcher::requestResource", "url", urlForTraceEvent(url));
|
|
|
| WTF_LOG(ResourceLoading, "ResourceFetcher::requestResource '%s', charset '%s', priority=%d, forPreload=%u, type=%s", url.elidedString().latin1().data(), request.charset().latin1().data(), request.priority(), request.forPreload(), ResourceTypeName(factory.type()));
|
|
|
|
|