Changeset 126892 in webkit

Timestamp:

Aug 28, 2012, 10:48:38 AM (14 years ago)

Author:

hclam@chromium.org

Message:

Report frame bytes by platform ImageDecoder
​https://bugs.webkit.org/show_bug.cgi?id=94241

Reviewed by James Robinson.

Decoded frame bytes should be reported by the platform ImageSource and
ImageDecoder. BitmapImage used to guess system memory used by a frame
but this is no longer true if a frame is backed by an accelerated
surface or defer-decoded.

Adds ImageSource::frameBytesAtIndex and ImageDecoder::frameBytesAtIndex
such that platform can report memory usage correctly.

No new tests. Refactoring without change of behavior.
Tested on Chromium port with pixel tests without any crash or failure.

• platform/graphics/BitmapImage.cpp:

(WebCore::BitmapImage::destroyDecodedData):
(WebCore::BitmapImage::destroyDecodedDataIfNecessary):
(WebCore::BitmapImage::destroyMetadataAndNotify):
(WebCore::BitmapImage::cacheFrame):
(WebCore::BitmapImage::dataChanged):

• platform/graphics/BitmapImage.h:

(WebCore::FrameData::FrameData):
(FrameData):
(BitmapImage):

• platform/graphics/ImageSource.cpp:

(WebCore::ImageSource::frameBytesAtIndex):
(WebCore):

• platform/graphics/ImageSource.h:
• platform/graphics/cg/ImageSourceCG.cpp:

(WebCore::ImageSource::frameBytesAtIndex):
(WebCore):

• platform/image-decoders/ImageDecoder.cpp:

(WebCore::ImageDecoder::frameBytesAtIndex):
(WebCore):

• platform/image-decoders/ImageDecoder.h:

(ImageDecoder):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/graphics/BitmapImage.cpp (modified) (8 diffs)
• platform/graphics/BitmapImage.h (modified) (3 diffs)
• platform/graphics/ImageSource.cpp (modified) (1 diff)
• platform/graphics/ImageSource.h (modified) (1 diff)
• platform/graphics/cg/ImageSourceCG.cpp (modified) (1 diff)
• platform/image-decoders/ImageDecoder.cpp (modified) (1 diff)
• platform/image-decoders/ImageDecoder.h (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-08-28  Alpha Lam  <hclam@chromium.org>
+
+        Report frame bytes by platform ImageDecoder
+        https://bugs.webkit.org/show_bug.cgi?id=94241
+
+        Reviewed by James Robinson.
+
+        Decoded frame bytes should be reported by the platform ImageSource and
+        ImageDecoder. BitmapImage used to guess system memory used by a frame
+        but this is no longer true if a frame is backed by an accelerated
+        surface or defer-decoded.
+
+        Adds ImageSource::frameBytesAtIndex and ImageDecoder::frameBytesAtIndex
+        such that platform can report memory usage correctly.
+
+        No new tests. Refactoring without change of behavior.
+        Tested on Chromium port with pixel tests without any crash or failure.
+
+        * platform/graphics/BitmapImage.cpp:
+        (WebCore::BitmapImage::destroyDecodedData):
+        (WebCore::BitmapImage::destroyDecodedDataIfNecessary):
+        (WebCore::BitmapImage::destroyMetadataAndNotify):
+        (WebCore::BitmapImage::cacheFrame):
+        (WebCore::BitmapImage::dataChanged):
+        * platform/graphics/BitmapImage.h:
+        (WebCore::FrameData::FrameData):
+        (FrameData):
+        (BitmapImage):
+        * platform/graphics/ImageSource.cpp:
+        (WebCore::ImageSource::frameBytesAtIndex):
+        (WebCore):
+        * platform/graphics/ImageSource.h:
+        * platform/graphics/cg/ImageSourceCG.cpp:
+        (WebCore::ImageSource::frameBytesAtIndex):
+        (WebCore):
+        * platform/image-decoders/ImageDecoder.cpp:
+        (WebCore::ImageDecoder::frameBytesAtIndex):
+        (WebCore):
+        * platform/image-decoders/ImageDecoder.h:
+        (ImageDecoder):
+
 2012-08-28  Gustavo Noronha Silva  <gns@gnome.org>
 

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

@@ -39 +39 @@
 namespace WebCore {
 
-static int frameBytes(const IntSize& frameSize)
-{
-    return frameSize.width() * frameSize.height() * 4;
-}
-
 BitmapImage::BitmapImage(ImageObserver* observer)
     : Image(observer)
@@ -86 +81 @@
 void BitmapImage::destroyDecodedData(bool destroyAll)
 {
-    int framesCleared = 0;
+    unsigned frameBytesCleared = 0;
     const size_t clearBeforeFrame = destroyAll ? m_frames.size() : m_currentFrame;
     for (size_t i = 0; i < clearBeforeFrame; ++i) {
@@ -92 +87 @@
         // save the memory for the framebuffer data), so we don't need to clear
         // the metadata.
+        unsigned frameBytes = m_frames[i].m_frameBytes;
         if (m_frames[i].clear(false))
-          ++framesCleared;
-    }
-
-    destroyMetadataAndNotify(framesCleared);
+            frameBytesCleared += frameBytes;
+    }
+
+    destroyMetadataAndNotify(frameBytesCleared);
 
     m_source.clear(destroyAll, clearBeforeFrame, data(), m_allDataReceived);
@@ -107 +103 @@
     // to one frame at a time.
     static const unsigned cLargeAnimationCutoff = 5242880;
-    if (m_frames.size() * frameBytes(m_size) > cLargeAnimationCutoff)
+    unsigned allFrameBytes = 0;
+    for (size_t i = 0; i < m_frames.size(); ++i)
+        allFrameBytes += m_frames[i].m_frameBytes;
+
+    if (allFrameBytes > cLargeAnimationCutoff)
         destroyDecodedData(destroyAll);
 }
 
-void BitmapImage::destroyMetadataAndNotify(int framesCleared)
+void BitmapImage::destroyMetadataAndNotify(unsigned frameBytesCleared)
 {
     m_isSolidColor = false;
@@ -117 +117 @@
     invalidatePlatformData();
 
-    int deltaBytes = framesCleared * -frameBytes(m_size);
-    m_decodedSize += deltaBytes;
-    if (framesCleared > 0) {
-        deltaBytes -= m_decodedPropertiesSize;
+    ASSERT(m_decodedSize >= frameBytesCleared);
+    m_decodedSize -= frameBytesCleared;
+    if (frameBytesCleared > 0) {
+        frameBytesCleared += m_decodedPropertiesSize;
         m_decodedPropertiesSize = 0;
     }
-    if (deltaBytes && imageObserver())
-        imageObserver()->decodedSizeChanged(this, deltaBytes);
+    if (frameBytesCleared && imageObserver())
+        imageObserver()->decodedSizeChanged(this, -safeCast<int>(frameBytesCleared));
 }
 
@@ -145 +145 @@
         m_frames[index].m_duration = m_source.frameDurationAtIndex(index);
     m_frames[index].m_hasAlpha = m_source.frameHasAlphaAtIndex(index);
+    m_frames[index].m_frameBytes = m_source.frameBytesAtIndex(index);
 
     const IntSize frameSize(index ? m_source.frameSizeAtIndex(index) : m_size);
@@ -150 +151 @@
         m_hasUniformFrameSize = false;
     if (m_frames[index].m_frame) {
-        int deltaBytes = frameBytes(frameSize);
+        int deltaBytes = safeCast<int>(m_frames[index].m_frameBytes);
         m_decodedSize += deltaBytes;
         // The fully-decoded frame will subsume the partially decoded data used
@@ -237 +238 @@
     // frame affected by appending new data here. Thus we have to clear all the
     // incomplete frames to be safe.
-    int framesCleared = 0;
+    unsigned frameBytesCleared = 0;
     for (size_t i = 0; i < m_frames.size(); ++i) {
         // NOTE: Don't call frameIsCompleteAtIndex() here, that will try to
         // decode any uncached (i.e. never-decoded or
         // cleared-on-a-previous-pass) frames!
+        unsigned frameBytes = m_frames[i].m_frameBytes;
         if (m_frames[i].m_haveMetadata && !m_frames[i].m_isComplete)
-            framesCleared += (m_frames[i].clear(true) ? 1 : 0);
-    }
-    destroyMetadataAndNotify(framesCleared);
+            frameBytesCleared += (m_frames[i].clear(true) ? frameBytes : 0);
+    }
+    destroyMetadataAndNotify(frameBytesCleared);
     
     // Feed all the data we've seen so far to the image decoder.

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

@@ -76 +76 @@
         , m_isComplete(false)
         , m_hasAlpha(true) 
+        , m_frameBytes(0)
     {
     }
@@ -94 +95 @@
     bool m_isComplete : 1;
     bool m_hasAlpha : 1;
+    unsigned m_frameBytes;
 };
 
@@ -235 +237 @@
     // Generally called by destroyDecodedData(), destroys whole-image metadata
     // and notifies observers that the memory footprint has (hopefully)
-    // decreased by |framesCleared| times the size (in bytes) of a frame.
-    void destroyMetadataAndNotify(int framesCleared);
+    // decreased by |frameBytesCleared|.
+    void destroyMetadataAndNotify(unsigned frameBytesCleared);
 
     // Whether or not size is available yet.    

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

@@ -199 +199 @@
 }
 
-}
+unsigned ImageSource::frameBytesAtIndex(size_t index) const
+{
+    if (!m_decoder)
+        return 0;
+    return m_decoder->frameBytesAtIndex(index);
+}
+
+}

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

@@ -147 +147 @@
     ImageOrientation orientationAtIndex(size_t) const; // EXIF image orientation
 
+    // Return the number of bytes in the decoded frame. If the frame is not yet
+    // decoded then return 0.
+    unsigned frameBytesAtIndex(size_t) const;
+
 #if ENABLE(IMAGE_DECODER_DOWN_SAMPLING)
     static unsigned maxPixelsPerDecodedImage() { return s_maxPixelsPerDecodedImage; }

trunk/Source/WebCore/platform/graphics/cg/ImageSourceCG.cpp

@@ -385 +385 @@
 }
 
+unsigned ImageSource::frameBytesAtIndex(size_t index) const
+{
+    IntSize frameSize = frameSizeAtIndex(index, RespectImageOrientation);
+    return frameSize.width() * frameSize.height() * 4;
+}
+
 }
 

trunk/Source/WebCore/platform/image-decoders/ImageDecoder.cpp

@@ -287 +287 @@
 }
 
+unsigned ImageDecoder::frameBytesAtIndex(size_t index) const
+{
+    if (m_frameBufferCache.size() <= index)
+        return 0;
+    // FIXME: Use the dimension of the requested frame.
+    return m_size.area() * sizeof(ImageFrame::PixelData);
+}
+
 void ImageDecoder::prepareScaleDataIfNecessary()
 {

trunk/Source/WebCore/platform/image-decoders/ImageDecoder.h

@@ -280 +280 @@
         virtual bool frameHasAlphaAtIndex(size_t) const;
 
+        // Number of bytes in the decoded frame requested. Return 0 if not yet decoded.
+        virtual unsigned frameBytesAtIndex(size_t) const;
+
         void setIgnoreGammaAndColorProfile(bool flag) { m_ignoreGammaAndColorProfile = flag; }
         bool ignoresGammaAndColorProfile() const { return m_ignoreGammaAndColorProfile; }