Title: [216293] trunk/Source/WebCore
- Revision
- 216293
- Author
- ryanhad...@apple.com
- Date
- 2017-05-05 16:46:45 -0700 (Fri, 05 May 2017)
Log Message
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
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (216292 => 216293)
--- trunk/Source/WebCore/ChangeLog 2017-05-05 23:45:05 UTC (rev 216292)
+++ trunk/Source/WebCore/ChangeLog 2017-05-05 23:46:45 UTC (rev 216293)
@@ -1,3 +1,16 @@
+2017-05-05 Ryan Haddad <ryanhad...@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 <bb...@apple.com>
[Cocoa] Converting from WebCore::Cookie to NSHTTPCookie always marks cookies as session cookies
Modified: trunk/Source/WebCore/loader/cache/CachedImage.cpp (216292 => 216293)
--- trunk/Source/WebCore/loader/cache/CachedImage.cpp 2017-05-05 23:45:05 UTC (rev 216292)
+++ trunk/Source/WebCore/loader/cache/CachedImage.cpp 2017-05-05 23:46:45 UTC (rev 216293)
@@ -360,10 +360,7 @@
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)
Modified: trunk/Source/WebCore/platform/graphics/BitmapImage.cpp (216292 => 216293)
--- trunk/Source/WebCore/platform/graphics/BitmapImage.cpp 2017-05-05 23:45:05 UTC (rev 216292)
+++ trunk/Source/WebCore/platform/graphics/BitmapImage.cpp 2017-05-05 23:46:45 UTC (rev 216293)
@@ -61,8 +61,7 @@
BitmapImage::~BitmapImage()
{
invalidatePlatformData();
- clearTimer();
- m_source.stopAsyncDecodingQueue();
+ stopAnimation();
}
void BitmapImage::updateFromSettings(const Settings& settings)
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
