Merge "Ensure |m_image| is (re-)created in ImageResource::didAddClient()"

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 788cb4aa7bf8c3acfb424e6cd5bde799ec4769a6..8342c15f71c3f36554801fd58e3261ff8d10d475 100644
--- a/third_party/WebKit/Source/core/fetch/ImageResource.cpp
+++ b/third_party/WebKit/Source/core/fetch/ImageResource.cpp
@@ -117,6 +117,20 @@ void ImageResource::markClientsAndObserversFinished()
     Resource::markClientsAndObserversFinished();
 }
 
+void ImageResource::ensureImage()
+{
+    if (m_data && !m_image && !errorOccurred()) {
+        createImage();
+        m_image->setData(m_data, true);
+    }
+}
+
+void ImageResource::didAddClient(ResourceClient* client)
+{
+    ensureImage();
+    Resource::didAddClient(client);
+}
+
 void ImageResource::addObserver(ImageResourceObserver* observer)
 {
     willAddClientOrObserver();
@@ -126,10 +140,7 @@ void ImageResource::addObserver(ImageResourceObserver* observer)
     if (!m_revalidatingRequest.isNull())
         return;
 
-    if (m_data && !m_image && !errorOccurred()) {
-        createImage();
-        m_image->setData(m_data, true);
-    }
+    ensureImage();
 
     if (m_image && !m_image->isNull()) {
         observer->imageChanged(this);