Move hacks for Inspector in restoreCachedResourceIfNeeded() to ResourceFetcher

third_party/WebKit/Source/core/css/CSSFontFaceSrcValue.cpp

Index: third_party/WebKit/Source/core/css/CSSFontFaceSrcValue.cpp
diff --git a/third_party/WebKit/Source/core/css/CSSFontFaceSrcValue.cpp b/third_party/WebKit/Source/core/css/CSSFontFaceSrcValue.cpp
index e5ec2f69019196cd13d9d2aeb3ad28d7aa118edc..dbeba86d4f7a54b39aa621a3a57d1fcf1421d8a9 100644
--- a/third_party/WebKit/Source/core/css/CSSFontFaceSrcValue.cpp
+++ b/third_party/WebKit/Source/core/css/CSSFontFaceSrcValue.cpp
@@ -32,7 +32,6 @@
 #include "core/fetch/FetchInitiatorTypeNames.h"
 #include "core/fetch/FetchRequest.h"
 #include "core/fetch/ResourceFetcher.h"
-#include "core/loader/MixedContentChecker.h"
 #include "core/loader/resource/FontResource.h"
 #include "platform/CrossOriginAttributeValue.h"
 #include "platform/fonts/FontCache.h"
@@ -115,21 +114,9 @@ void CSSFontFaceSrcValue::restoreCachedResourceIfNeeded(
   ASSERT(document && document->fetcher());
 
   const String resourceURL = document->completeURL(m_absoluteResource);
-  if (document->fetcher()->cachedResource(KURL(ParsedURLString, resourceURL)))
-    return;
-
-  FetchRequest request(ResourceRequest(resourceURL),
-                       FetchInitiatorTypeNames::css);
-  request.setContentSecurityCheck(m_shouldCheckContentSecurityPolicy);

[yhirano, 2016/12/01 10:44:23]

This statement is missing in the new code.

[hiroshige, 2016/12/02 06:17:10]

I expected m_shouldCheckContentSecurityPolicy ==
m_fetched->resource()->options().contentSecurityPolicyOption, and the flag is
set via the ResourceLoaderOptions at the line:
I added a DCHECK() to confirm this.

-  request.mutableResourceRequest().setRequestContext(
-      WebURLRequest::RequestContextFont);
-  MixedContentChecker::shouldBlockFetch(
-      document->frame(), m_fetched->resource()->lastResourceRequest(),
-      m_fetched->resource()->lastResourceRequest().url(),
-      MixedContentChecker::SendReport);
-  document->fetcher()->requestLoadStarted(
-      m_fetched->resource()->identifier(), m_fetched->resource(), request,
-      ResourceFetcher::ResourceLoadingFromCache);
+  document->fetcher()->emulateLoadStartedForInspector(
+      m_fetched->resource(), KURL(ParsedURLString, resourceURL),
+      WebURLRequest::RequestContextFont, FetchInitiatorTypeNames::css);
 }
 
 bool CSSFontFaceSrcValue::equals(const CSSFontFaceSrcValue& other) const {