Move hacks for Inspector in restoreCachedResourceIfNeeded() to ResourceFetcher

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

 /*
  * Copyright (C) 2007, 2010 Apple Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
@@ skipping 14 matching lines @@
 
 #include "core/css/CSSFontFaceSrcValue.h"
 
 #include "core/css/CSSMarkup.h"
 #include "core/css/StyleSheetContents.h"
 #include "core/dom/Document.h"
 #include "core/dom/Node.h"
 #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"
 #include "platform/fonts/FontCustomPlatformData.h"
 #include "platform/weborigin/SecurityPolicy.h"
 #include "wtf/text/StringBuilder.h"
 
 namespace blink {
 
 bool CSSFontFaceSrcValue::isSupportedFormat() const {
@@ skipping 62 matching lines @@
   }
   return m_fetched->resource();
 }
 
 void CSSFontFaceSrcValue::restoreCachedResourceIfNeeded(
     Document* document) const {
   ASSERT(m_fetched);
   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 {
   return m_isLocal == other.m_isLocal && m_format == other.m_format &&
          m_specifiedResource == other.m_specifiedResource &&
          m_absoluteResource == other.m_absoluteResource;
 }
 
 }  // namespace blink