Do not reload in ImageResource::fetch()

third_party/WebKit/Source/core/loader/resource/ImageResource.cpp

 /*
     Copyright (C) 1998 Lars Knoll (knoll@mpi-hd.mpg.de)
     Copyright (C) 2001 Dirk Mueller (mueller@kde.org)
     Copyright (C) 2002 Waldo Bastian (bastian@kde.org)
     Copyright (C) 2006 Samuel Weinig (sam.weinig@gmail.com)
     Copyright (C) 2004, 2005, 2006, 2007 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
@@ skipping 153 matching lines @@
           request.isSpeculativePreload()
               ? SecurityViolationReportingPolicy::SuppressReporting
               : SecurityViolationReportingPolicy::Report,
           request.getOriginRestriction());
       if (blockReason == ResourceRequestBlockedReason::None)
         fetcher->context().sendImagePing(requestURL);
     }
     return nullptr;
   }
 
-  ImageResource* resource = toImageResource(
+  return toImageResource(
       fetcher->requestResource(request, ImageResourceFactory(request)));
-  if (resource &&
-      request.placeholderImageRequestType() != FetchRequest::AllowPlaceholder &&
-      resource->shouldShowPlaceholder()) {
-    // If the image is a placeholder, but this fetch doesn't allow a
-    // placeholder, then load the original image. Note that the cache is not
-    // bypassed here - it should be fine to use a cached copy if possible.
-    resource->reloadIfLoFiOrPlaceholderImage(
-        fetcher, kReloadAlwaysWithExistingCachePolicy);
-  }
-  return resource;
+}
+
+bool ImageResource::canReuse(const FetchRequest& request) const {
+  // If the image is a placeholder, but this fetch doesn't allow a
+  // placeholder, then do not reuse this resource.
+  if (request.placeholderImageRequestType() != FetchRequest::AllowPlaceholder &&
+      m_placeholderOption != PlaceholderOption::DoNotReloadPlaceholder)
+    return false;
+  return true;
 }
 
 ImageResource* ImageResource::create(const ResourceRequest& request) {
   return new ImageResource(request, ResourceLoaderOptions(),
                            ImageResourceContent::create(), false);
 }
 
 ImageResource::ImageResource(const ResourceRequest& resourceRequest,
                              const ResourceLoaderOptions& options,
                              ImageResourceContent* content,
@@ skipping 285 matching lines @@
       !isLoFiImage(*this))
     return;
 
   // Prevent clients and observers from being notified of completion while the
   // reload is being scheduled, so that e.g. canceling an existing load in
   // progress doesn't cause clients and observers to be notified of completion
   // prematurely.
   DCHECK(!m_isSchedulingReload);
   m_isSchedulingReload = true;
 
-  if (policy != kReloadAlwaysWithExistingCachePolicy)
-    setCachePolicyBypassingCache();
+  setCachePolicyBypassingCache();
 
   setPreviewsStateNoTransform();
 
   if (m_placeholderOption != PlaceholderOption::DoNotReloadPlaceholder)
     clearRangeRequestHeader();
   m_placeholderOption = PlaceholderOption::DoNotReloadPlaceholder;
 
   if (isLoading()) {
     loader()->cancel();
     // Canceling the loader causes error() to be called, which in turn calls
@@ skipping 92 matching lines @@
     //    reloading in Step 3 due to notifyObservers()'s
     //    schedulingReloadOrShouldReloadBrokenPlaceholder() check.
     // 3. reloadIfLoFiOrPlaceholderImage() is called via ResourceFetcher
     //    (a) via didFinishLoading() called in decodeError(), or
     //    (b) after returning ImageResource::updateImage().
     decodeError(allDataReceived);
   }
 }
 
 }  // namespace blink