Changeset 156681 in webkit

Timestamp:

Sep 30, 2013 2:54:17 PM (11 years ago)

Author:

commit-queue@webkit.org

Message:

Don't attempt to destroy decoded frame if a BitmapImage doesn't have encoded raw data.
​https://bugs.webkit.org/show_bug.cgi?id=122115

Patch by Yongjun Zhang <​yongjun_zhang@apple.com> on 2013-09-30
Reviewed by Daniel Bates.

With BitmapImage::create(PassNativeImagePtr, ImageObserver*), a BitmapImage could be created by
passing a native image. If this image is added to memory cache, we shouldn't attempt to destroy
its decoded frames since there is no encoded raw data and we won't be able to reconstruct the image again.

No new tests for now. Currently there isn't a code path to add to the memory cache a BitmapImage
that was created by adopting a native image. We'll add such a code path in a subsequent patch.

• platform/graphics/BitmapImage.cpp:

(WebCore::BitmapImage::destroyDecodedDataIfNecessary):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/graphics/BitmapImage.cpp (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-09-30  Yongjun Zhang  <yongjun_zhang@apple.com>
+
+        Don't attempt to destroy decoded frame if a BitmapImage doesn't have encoded raw data.
+        https://bugs.webkit.org/show_bug.cgi?id=122115
+
+        Reviewed by Daniel Bates.
+
+        With BitmapImage::create(PassNativeImagePtr, ImageObserver*), a BitmapImage could be created by
+        passing a native image.  If this image is added to memory cache, we shouldn't attempt to destroy
+        its decoded frames since there is no encoded raw data and we won't be able to reconstruct the image again.
+
+        No new tests for now. Currently there isn't a code path to add to the memory cache a BitmapImage
+        that was created by adopting a native image. We'll add such a code path in a subsequent patch.
+
+        * platform/graphics/BitmapImage.cpp:
+        (WebCore::BitmapImage::destroyDecodedDataIfNecessary):
+
 2013-09-30  Brady Eidson  <beidson@apple.com>
 

trunk/Source/WebCore/platform/graphics/BitmapImage.cpp

@@ -99 +99 @@
     // to one frame at a time.
     static const unsigned cLargeAnimationCutoff = 5242880;
+
+    // If we have decoded frames but there is no encoded data, we shouldn't destroy
+    // the decoded image since we won't be able to reconstruct it later.
+    if (!data() && m_frames.size())
+        return;
+
     unsigned allFrameBytes = 0;
     for (size_t i = 0; i < m_frames.size(); ++i)