Phase II Step 3: Reload LoFi/placeholder images via new ImageResource

third_party/WebKit/Source/core/fetch/ResourceFetcher.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) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All
     rights reserved.
     Copyright (C) 2009 Torch Mobile Inc. http://www.torchmobile.com/
 
     This library is free software; you can redistribute it and/or
     modify it under the terms of the GNU Library General Public
@@ skipping 1152 matching lines @@
       info->addFinalTransferSize(encodedDataLength == -1 ? 0
                                                          : encodedDataLength);
       if (resource->options().requestInitiatorContext == DocumentContext)
         context().addResourceTiming(*info);
       resource->reportResourceTimingToClients(*info);
     }
   }
   context().dispatchDidFinishLoading(resource->identifier(), finishTime,
                                      encodedDataLength);
   if (finishReason == DidFinishLoading)
-    resource->finish(finishTime);
+    resource->finish(finishTime, this);
   context().didLoadResource(resource);
-
-  if (resource->isImage() &&
-      toImageResource(resource)->shouldReloadBrokenPlaceholder()) {
-    toImageResource(resource)->reloadIfLoFiOrPlaceholder(this);
-  }
 }
 
 void ResourceFetcher::didFailLoading(Resource* resource,
                                      const ResourceError& error) {
   network_instrumentation::endResourceLoad(
       resource->identifier(), network_instrumentation::RequestOutcome::Fail);
   removeResourceLoader(resource->loader());
   m_resourceTimingInfoMap.take(const_cast<Resource*>(resource));
   bool isInternalRequest = resource->options().initiatorInfo.name ==
                            FetchInitiatorTypeNames::internal;
   context().dispatchDidFail(resource->identifier(), error, isInternalRequest);
-  resource->error(error);
+  resource->error(error, this);
   context().didLoadResource(resource);
-
-  if (resource->isImage() &&
-      toImageResource(resource)->shouldReloadBrokenPlaceholder()) {
-    toImageResource(resource)->reloadIfLoFiOrPlaceholder(this);
-  }
 }
 
 void ResourceFetcher::didReceiveResponse(
     Resource* resource,
     const ResourceResponse& response,
     std::unique_ptr<WebDataConsumerHandle> handle) {
   if (response.wasFetchedViaServiceWorker()) {
     if (resource->options().corsEnabled == IsCORSEnabled &&
         response.wasFallbackRequiredByServiceWorker()) {
       ResourceRequest request = resource->lastResourceRequest();
@@ skipping 228 matching lines @@
                                 resourcePriority.intraPriorityValue);
     network_instrumentation::resourcePrioritySet(resource->identifier(),
                                                  resourceLoadPriority);
     context().dispatchDidChangeResourcePriority(
         resource->identifier(), resourceLoadPriority,
         resourcePriority.intraPriorityValue);
   }
 }
 
 void ResourceFetcher::reloadLoFiImages() {
-  for (const auto& documentResource : m_documentResources) {
+  for (auto& documentResource : m_documentResources) {
     Resource* resource = documentResource.value.get();
     if (resource && resource->isImage()) {
       ImageResource* imageResource = toImageResource(resource);
-      imageResource->reloadIfLoFiOrPlaceholder(this);
+      ImageResource* newImageResource =
+          imageResource->reloadIfLoFiOrPlaceholder(this);
+      if (newImageResource)
+        documentResource.value = newImageResource;
     }
   }
 }
 
 void ResourceFetcher::logPreloadStats(ClearPreloadsPolicy policy) {
   if (!m_preloads)
     return;
   unsigned scripts = 0;
   unsigned scriptMisses = 0;
   unsigned stylesheets = 0;
@@ skipping 194 matching lines @@
   visitor->trace(m_context);
   visitor->trace(m_archive);
   visitor->trace(m_loaders);
   visitor->trace(m_nonBlockingLoaders);
   visitor->trace(m_documentResources);
   visitor->trace(m_preloads);
   visitor->trace(m_resourceTimingInfoMap);
 }
 
 }  // namespace blink