Revert of Revalidate using the same Resource, attempt #3

third_party/WebKit/Source/core/fetch/ImageResource.cpp

Index: third_party/WebKit/Source/core/fetch/ImageResource.cpp
diff --git a/third_party/WebKit/Source/core/fetch/ImageResource.cpp b/third_party/WebKit/Source/core/fetch/ImageResource.cpp
index 9eb384612948b7bc2a2cdca13adcc1340b477c57..fd5471d4645e1b3c93dbedc24c80e7cfab4f37c4 100644
--- a/third_party/WebKit/Source/core/fetch/ImageResource.cpp
+++ b/third_party/WebKit/Source/core/fetch/ImageResource.cpp
@@ -297,10 +297,6 @@
     ResourceClientWalker<ImageResourceClient> w(m_clients);
     while (ImageResourceClient* c = w.next())
         c->imageChanged(this, changeRect);
-
-    ResourceClientWalker<ImageResourceClient> w2(m_finishedClients);
-    while (ImageResourceClient* c = w2.next())
-        c->imageChanged(this, changeRect);
 }
 
 void ImageResource::clear()
@@ -400,15 +396,15 @@
 {
     if (loadingMultipartContent() && m_data)
         finishOnePart();
-    Resource::responseReceived(response, handle);
     if (RuntimeEnabledFeatures::clientHintsEnabled()) {
-        m_devicePixelRatioHeaderValue = m_response.httpHeaderField("content-dpr").toFloat(&m_hasDevicePixelRatioHeaderValue);
+        m_devicePixelRatioHeaderValue = response.httpHeaderField("content-dpr").toFloat(&m_hasDevicePixelRatioHeaderValue);
         if (!m_hasDevicePixelRatioHeaderValue || m_devicePixelRatioHeaderValue <= 0.0) {
             m_devicePixelRatioHeaderValue = 1.0;
             m_hasDevicePixelRatioHeaderValue = false;
         }
 
     }
+    Resource::responseReceived(response, handle);
 }
 
 void ImageResource::decodedSizeChanged(const blink::Image* image, int delta)
@@ -441,12 +437,6 @@
             return false;
     }
 
-    ResourceClientWalker<ImageResourceClient> w2(m_finishedClients);
-    while (ImageResourceClient* c = w2.next()) {
-        if (c->willRenderImage(this))
-            return false;
-    }
-
     return true;
 }
 
@@ -465,12 +455,6 @@
     ImageAnimationPolicy newPolicy = ImageAnimationPolicyAllowed;
     ResourceClientWalker<ImageResourceClient> w(m_clients);
     while (ImageResourceClient* c = w.next()) {
-        if (c->getImageAnimationPolicy(this, newPolicy))
-            break;
-    }
-
-    ResourceClientWalker<ImageResourceClient> w2(m_finishedClients);
-    while (ImageResourceClient* c = w2.next()) {
         if (c->getImageAnimationPolicy(this, newPolicy))
             break;
     }