| 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 59a96fcbacc43add98b3f2131979416e0dbe0917..5f25871b730cf19284137b85d30a6eb761c716f8 100644
|
| --- a/third_party/WebKit/Source/core/fetch/ResourceFetcher.cpp
|
| +++ b/third_party/WebKit/Source/core/fetch/ResourceFetcher.cpp
|
| @@ -248,14 +248,17 @@ static WebURLRequest::RequestContext requestContextFromType(
|
| ResourceFetcher::ResourceFetcher(FetchContext* newContext)
|
| : m_context(newContext),
|
| m_archive(context().isMainFrame() ? nullptr : context().archive()),
|
| + // loadingTaskRunner() is null in tests that use the null fetch context.
|
| m_resourceTimingReportTimer(
|
| + context().loadingTaskRunner()
|
| + ? context().loadingTaskRunner()
|
| + : Platform::current()->currentThread()->getWebTaskRunner(),
|
| this,
|
| &ResourceFetcher::resourceTimingReportTimerFired),
|
| m_autoLoadImages(true),
|
| m_imagesEnabled(true),
|
| m_allowStaleResources(false),
|
| - m_imageFetched(false) {
|
| -}
|
| + m_imageFetched(false) {}
|
|
|
| ResourceFetcher::~ResourceFetcher() {}
|
|
|
|
|