Unreviewed, rolling out r216273.
authorryanhaddad@apple.com <ryanhaddad@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 5 May 2017 23:46:45 +0000 (23:46 +0000)
committerryanhaddad@apple.com <ryanhaddad@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 5 May 2017 23:46:45 +0000 (23:46 +0000)
This change caused an assertion failure on WK1.

Reverted changeset:

"Crash in ImageFrameCache::decodedSizeChanged() after image
load cancellation"
https://bugs.webkit.org/show_bug.cgi?id=171736
http://trac.webkit.org/changeset/216273

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@216293 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Source/WebCore/ChangeLog
Source/WebCore/loader/cache/CachedImage.cpp
Source/WebCore/platform/graphics/BitmapImage.cpp

index 25c523d..df15dbb 100644 (file)
@@ -1,3 +1,16 @@
+2017-05-05  Ryan Haddad  <ryanhaddad@apple.com>
+
+        Unreviewed, rolling out r216273.
+
+        This change caused an assertion failure on WK1.
+
+        Reverted changeset:
+
+        "Crash in ImageFrameCache::decodedSizeChanged() after image
+        load cancellation"
+        https://bugs.webkit.org/show_bug.cgi?id=171736
+        http://trac.webkit.org/changeset/216273
+
 2017-05-05  Brian Burg  <bburg@apple.com>
 
         [Cocoa] Converting from WebCore::Cookie to NSHTTPCookie always marks cookies as session cookies
index 66438f2..b0adf05 100644 (file)
@@ -360,10 +360,7 @@ inline void CachedImage::clearImage()
         m_imageObserver->remove(*this);
         m_imageObserver = nullptr;
     }
-    if (m_image) {
-        m_image->setImageObserver(nullptr);
-        m_image = nullptr;
-    }
+    m_image = nullptr;
 }
 
 void CachedImage::addIncrementalDataBuffer(SharedBuffer& data)
index 9a6ab12..0d42b44 100644 (file)
@@ -61,8 +61,7 @@ BitmapImage::BitmapImage(NativeImagePtr&& image, ImageObserver* observer)
 BitmapImage::~BitmapImage()
 {
     invalidatePlatformData();
-    clearTimer();
-    m_source.stopAsyncDecodingQueue();
+    stopAnimation();
 }
 
 void BitmapImage::updateFromSettings(const Settings& settings)