Move hacks for Inspector in restoreCachedResourceIfNeeded() to ResourceFetcher

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

 /*
  * (C) 1999-2003 Lars Knoll (knoll@kde.org)
  * Copyright (C) 2004, 2005, 2006, 2008 Apple Inc. All rights reserved.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
  * License as published by the Free Software Foundation; either
  * version 2 of the License, or (at your option) any later version.
  *
  * This library is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * Library General Public License for more details.
  *
  * You should have received a copy of the GNU Library General Public License
  * along with this library; see the file COPYING.LIB.  If not, write to
  * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
  * Boston, MA 02110-1301, USA.
  */
 
 #include "core/css/CSSImageValue.h"
 
 #include "core/css/CSSMarkup.h"
 #include "core/dom/Document.h"
 #include "core/fetch/FetchInitiatorTypeNames.h"
 #include "core/fetch/FetchRequest.h"
 #include "core/fetch/ImageResource.h"
 #include "core/fetch/ResourceFetcher.h"
 #include "core/frame/Settings.h"
-#include "core/loader/MixedContentChecker.h"
 #include "core/style/StyleFetchedImage.h"
 #include "core/style/StyleInvalidImage.h"
 #include "platform/CrossOriginAttributeValue.h"
 #include "platform/weborigin/KURL.h"
 #include "platform/weborigin/SecurityPolicy.h"
 
 namespace blink {
 
 CSSImageValue::CSSImageValue(const AtomicString& rawValue,
                              const KURL& url,
@@ skipping 35 matching lines @@
       m_cachedImage = StyleInvalidImage::create(url());
   }
 
   return m_cachedImage.get();
 }
 
 void CSSImageValue::restoreCachedResourceIfNeeded(
     const Document& document) const {
   if (!m_cachedImage || !document.fetcher() || m_absoluteURL.isNull())
     return;
-  if (document.fetcher()->cachedResource(KURL(ParsedURLString, m_absoluteURL)))
-    return;
 
   ImageResource* resource = m_cachedImage->cachedImage();
   if (!resource)
     return;
 
-  FetchRequest request(ResourceRequest(m_absoluteURL),
-                       m_initiatorName.isEmpty() ? FetchInitiatorTypeNames::css
-                                                 : m_initiatorName,
-                       resource->options());
-  request.mutableResourceRequest().setRequestContext(
-      WebURLRequest::RequestContextImage);
-  MixedContentChecker::shouldBlockFetch(
-      document.frame(), resource->lastResourceRequest(),
-      resource->lastResourceRequest().url(), MixedContentChecker::SendReport);
-  document.fetcher()->requestLoadStarted(
-      resource->identifier(), resource, request,
-      ResourceFetcher::ResourceLoadingFromCache);
+  document.fetcher()->emulateLoadStartedForInspector(
+      resource, KURL(ParsedURLString, m_absoluteURL),
+      WebURLRequest::RequestContextImage,
+      m_initiatorName.isEmpty() ? FetchInitiatorTypeNames::css
+                                : m_initiatorName);
 }
 
 bool CSSImageValue::hasFailedOrCanceledSubresources() const {
   if (!m_cachedImage)
     return false;
   if (Resource* cachedResource = m_cachedImage->cachedImage())
     return cachedResource->loadFailedOrCanceled();
   return true;
 }
 
@@ skipping 17 matching lines @@
 void CSSImageValue::reResolveURL(const Document& document) const {
   KURL url = document.completeURL(m_relativeURL);
   AtomicString urlString(url.getString());
   if (urlString == m_absoluteURL)
     return;
   m_absoluteURL = urlString;
   m_cachedImage.clear();
 }
 
 }  // namespace blink