Changeset 44605 in webkit

Timestamp:

Jun 11, 2009 10:28:36 AM (15 years ago)

Author:

ariya@webkit.org

Message:

2009-06-11 Yongjun Zhang <​yongjun.zhang@nokia.com>

Reviewed by Ariya Hidayat.

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

[Qt] build break in ImageDecoderQt.cpp.

• platform/graphics/qt/ImageDecoderQt.cpp: (WebCore::ImageDecoderQt::reset): (WebCore::ImageDecoderQt::setData): (WebCore::ImageDecoderQt::isSizeAvailable):
• platform/image-decoders/ImageDecoder.h: (WebCore::ImageDecoder::setSize):

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/graphics/qt/ImageDecoderQt.cpp (modified) (3 diffs)

trunk/WebCore/ChangeLog

@@ +1 @@
+2009-06-11  Yongjun Zhang  <yongjun.zhang@nokia.com>
+
+        Reviewed by Ariya Hidayat.
+
+        https://bugs.webkit.org/show_bug.cgi?id=26291
+
+        [Qt] build break in ImageDecoderQt.cpp.
+
+        * platform/graphics/qt/ImageDecoderQt.cpp:
+        (WebCore::ImageDecoderQt::reset):
+        (WebCore::ImageDecoderQt::setData):
+        (WebCore::ImageDecoderQt::isSizeAvailable):
+        * platform/image-decoders/ImageDecoder.h:
+        (WebCore::ImageDecoder::setSize):
+
 2009-06-11  Simon Hausmann  <simon.hausmann@nokia.com>
 

trunk/WebCore/platform/graphics/qt/ImageDecoderQt.cpp

@@ -218 +218 @@
     m_imageList.clear();
     m_pixmapCache.clear();
-    m_sizeAvailable = false;
     m_loopCount = cAnimationNone;
-    m_size = IntSize(-1, -1);
 }
 
@@ -248 +246 @@
         // Did we read anything - try to set the size.
         if (hasFirstImageHeader()) {
-            m_sizeAvailable = true;
-            m_size = m_imageList[0].m_image.size();
+            QSize imgSize = m_imageList[0].m_image.size();
+            setSize(imgSize.width(), imgSize.height());
 
             if (readContext.reader()->supportsAnimation()) {
@@ -266 +264 @@
 {
     if (debugImageDecoderQt)
-        qDebug() << " ImageDecoderQt::isSizeAvailable() returns" << m_sizeAvailable;
-    return m_sizeAvailable;
+        qDebug() << " ImageDecoderQt::isSizeAvailable() returns" << ImageDecoder::isSizeAvailable();
+    return ImageDecoder::isSizeAvailable();
 }