Changeset 64777 in webkit

Timestamp:

Aug 5, 2010 1:01:40 PM (14 years ago)

Author:

commit-queue@webkit.org

Message:

2010-08-05 Yong Li <​yoli@rim.com>

Reviewed by Adam Treat.

Fix the problem that down-sampling code doesn't work
for some GIF's. GIF reader can call setSize() multiple times.
We should clear the scaling maps before adding new entries.
Also add a fast path to check if the size has changed since last time.

​https://bugs.webkit.org/show_bug.cgi?id=43501

• platform/image-decoders/ImageDecoder.cpp: (WebCore::ImageDecoder::prepareScaleDataIfNecessary):
• platform/image-decoders/gif/GIFImageDecoder.cpp: (WebCore::GIFImageDecoder::setSize):

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/image-decoders/ImageDecoder.cpp (modified) (1 diff)
• platform/image-decoders/gif/GIFImageDecoder.cpp (modified) (1 diff)

trunk/WebCore/ChangeLog

@@ +1 @@
+2010-08-05  Yong Li  <yoli@rim.com>
+
+        Reviewed by Adam Treat.
+
+        Fix the problem that down-sampling code doesn't work
+        for some GIF's. GIF reader can call setSize() multiple times.
+        We should clear the scaling maps before adding new entries.
+        Also add a fast path to check if the size has changed since last time.
+
+        https://bugs.webkit.org/show_bug.cgi?id=43501
+
+        * platform/image-decoders/ImageDecoder.cpp:
+        (WebCore::ImageDecoder::prepareScaleDataIfNecessary):
+        * platform/image-decoders/gif/GIFImageDecoder.cpp:
+        (WebCore::GIFImageDecoder::setSize):
+
 2010-08-05  Ilya Tikhonovsky  <loislo@chromium.org>
 

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

@@ -220 +220 @@
 void ImageDecoder::prepareScaleDataIfNecessary()
 {
+    m_scaled = false;
+    m_scaledColumns.clear();
+    m_scaledRows.clear();
+
     int width = size().width();
     int height = size().height();
     int numPixels = height * width;
-    if (m_maxNumPixels > 0 && numPixels > m_maxNumPixels) {
-        m_scaled = true;
-        double scale = sqrt(m_maxNumPixels / (double)numPixels);
-        fillScaledValues(m_scaledColumns, scale, width);
-        fillScaledValues(m_scaledRows, scale, height);
-    } else if (m_scaled) {
-        m_scaled = false;
-        m_scaledColumns.clear();
-        m_scaledRows.clear();
-    }
+    if (m_maxNumPixels <= 0 || numPixels <= m_maxNumPixels)
+        return;
+
+    m_scaled = true;
+    double scale = sqrt(m_maxNumPixels / (double)numPixels);
+    fillScaledValues(m_scaledColumns, scale, width);
+    fillScaledValues(m_scaledRows, scale, height);
 }
 

trunk/WebCore/platform/image-decoders/gif/GIFImageDecoder.cpp

@@ -62 +62 @@
 bool GIFImageDecoder::setSize(unsigned width, unsigned height)
 {
+    if (ImageDecoder::isSizeAvailable() && size().width() == width && size().height() == height)
+        return true;
+
     if (!ImageDecoder::setSize(width, height))
         return false;