Changeset 201043 in webkit

Timestamp:

May 17, 2016 2:28:57 PM (8 years ago)

Author:

Simon Fraser

Message:

BitmapImage::destroyDecodedDataIfNecessary() should only count frames with image data
​https://bugs.webkit.org/show_bug.cgi?id=157779

Reviewed by Tim Horton.

BitmapImage::destroyDecodedDataIfNecessary() throws away all frames of an image if the
decoded frame size exceeds a threshold. However, it counts all frames, whether or not
they have an image (some frames may only have metadata, but m_frameBytes still returns
height*width*4).

Fix by only count m_frameBytes for frames that have an image.

• platform/graphics/BitmapImage.cpp:

(WebCore::BitmapImage::destroyDecodedDataIfNecessary):

• platform/graphics/BitmapImage.h:

(WebCore::FrameData::FrameData):
(WebCore::FrameData::usedFrameBytes):

Location:

trunk/Source/WebCore

Files:

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

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2016-05-16  Simon Fraser  <simon.fraser@apple.com>
+
+        BitmapImage::destroyDecodedDataIfNecessary() should only count frames with image data
+        https://bugs.webkit.org/show_bug.cgi?id=157779
+
+        Reviewed by Tim Horton.
+
+        BitmapImage::destroyDecodedDataIfNecessary() throws away all frames of an image if the
+        decoded frame size exceeds a threshold. However, it counts all frames, whether or not
+        they have an image (some frames may only have metadata, but m_frameBytes still returns
+        height*width*4).
+
+        Fix by only count m_frameBytes for frames that have an image.
+
+        * platform/graphics/BitmapImage.cpp:
+        (WebCore::BitmapImage::destroyDecodedDataIfNecessary):
+        * platform/graphics/BitmapImage.h:
+        (WebCore::FrameData::FrameData):
+        (WebCore::FrameData::usedFrameBytes):
+
 2016-05-17  Dave Hyatt  <hyatt@apple.com>
 

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

@@ -158 +158 @@
     unsigned allFrameBytes = 0;
     for (size_t i = 0; i < m_frames.size(); ++i)
-        allFrameBytes += m_frames[i].m_frameBytes;
+        allFrameBytes += m_frames[i].usedFrameBytes();
 
     if (allFrameBytes > largeAnimationCutoff) {
-        LOG(Images, "BitmapImage %p destroyDecodedDataIfNecessary destryingData: allFrameBytes=%u cutoff=%u", this, allFrameBytes, largeAnimationCutoff);
+        LOG(Images, "BitmapImage %p destroyDecodedDataIfNecessary destroyingData: allFrameBytes=%u cutoff=%u", this, allFrameBytes, largeAnimationCutoff);
         destroyDecodedData(destroyAll);
     }

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

@@ -73 +73 @@
 public:
     FrameData()
-        : m_orientation(DefaultImageOrientation)
-        , m_subsamplingLevel(0)
-        , m_duration(0)
-        , m_haveMetadata(false)
+        : m_haveMetadata(false)
         , m_isComplete(false)
         , m_hasAlpha(true)
-        , m_frameBytes(0)
     {
     }
@@ -91 +87 @@
     // Returns whether there was cached image data to clear.
     bool clear(bool clearMetadata);
+    
+    unsigned usedFrameBytes() const { return m_image ? m_frameBytes : 0; }
 
     NativeImagePtr m_image;
-    ImageOrientation m_orientation;
-    SubsamplingLevel m_subsamplingLevel;
-    float m_duration;
+    ImageOrientation m_orientation { DefaultImageOrientation };
+    SubsamplingLevel m_subsamplingLevel { 0 };
+    float m_duration { 0 };
     bool m_haveMetadata : 1;
     bool m_isComplete : 1;
     bool m_hasAlpha : 1;
-    unsigned m_frameBytes;
+    unsigned m_frameBytes { 0 };
 };