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

third_party/WebKit/Source/core/fetch/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 99 matching lines @@
         HashCountedSet<ImageResourceObserver*>::iterator it = m_observers.begin();
         for (int i = it->value; i; i--) {
             m_finishedObservers.add(it->key);
             m_observers.remove(it);
         }
     }
 
     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();
 
     m_observers.add(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);
     }
 
     if (isLoaded()) {
         observer->imageNotifyFinished(this);
         if (m_observers.contains(observer)) {
             m_finishedObservers.add(observer);
             m_observers.remove(observer);
@@ skipping 425 matching lines @@
     if (response().wasFetchedViaServiceWorker())
         return response().serviceWorkerResponseType() != WebServiceWorkerResponseTypeOpaque;
     if (!getImage()->currentFrameHasSingleSecurityOrigin())
         return false;
     if (passesAccessControlCheck(securityOrigin))
         return true;
     return !securityOrigin->taintsCanvas(response().url());
 }
 
 } // namespace blink