webkitgtk-2.16.5HEADwebkitgtk-2.16.5master

1 files changed, 7 insertions, 5 deletions

diff --git a/Source/WebCore/platform/image-decoders/bmp/BMPImageReader.h b/Source/WebCore/platform/image-decoders/bmp/BMPImageReader.h
index b5cb96e3f..03bcac60a 100644
--- a/Source/WebCore/platform/image-decoders/bmp/BMPImageReader.h
+++ b/Source/WebCore/platform/image-decoders/bmp/BMPImageReader.h
@@ -239,16 +239,16 @@ namespace WebCore {
         // right by one.
         inline void setI(size_t colorIndex)
         {
-            setRGBA(m_colorTable[colorIndex].rgbRed, m_colorTable[colorIndex].rgbGreen, m_colorTable[colorIndex].rgbBlue, 0xff);
+            setPixel(m_colorTable[colorIndex].rgbRed, m_colorTable[colorIndex].rgbGreen, m_colorTable[colorIndex].rgbBlue, 0xff);
         }
 
         // Like setI(), but with the individual component values specified.
-        inline void setRGBA(unsigned red,
+        inline void setPixel(unsigned red,
                             unsigned green,
                             unsigned blue,
                             unsigned alpha)
         {
-            m_buffer->setRGBA(m_coord.x(), m_coord.y(), red, green, blue, alpha);
+            m_buffer->backingStore()->setPixel(m_coord.x(), m_coord.y(), red, green, blue, alpha);
             m_coord.move(1, 0);
         }
 
@@ -262,8 +262,10 @@ namespace WebCore {
                              unsigned blue,
                              unsigned alpha)
         {
-            while (m_coord.x() < endCoord)
-                setRGBA(red, green, blue, alpha);
+            if (endCoord <= m_coord.x())
+                return;
+            m_buffer->backingStore()->fillRect(IntRect(m_coord.x(), m_coord.y(), endCoord - m_coord.x(), 1), red, green, blue, alpha);
+            m_coord.setX(endCoord);
         }
 
         // Resets the relevant local variables to start drawing at the left edge