Commit 3f3f93fd authored by ariya@webkit.org's avatar ariya@webkit.org

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):

git-svn-id: http://svn.webkit.org/repository/webkit/trunk@44605 268f45cc-cd09-0410-ab3c-d52691b4dbfc
parent 8d13a0ed
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>
Rubber-stamped by Ariya Hidayat.
......@@ -217,9 +217,7 @@ void ImageDecoderQt::reset()
m_failed = false;
m_imageList.clear();
m_pixmapCache.clear();
m_sizeAvailable = false;
m_loopCount = cAnimationNone;
m_size = IntSize(-1, -1);
}
void ImageDecoderQt::setData(const IncomingData &data, bool allDataReceived)
......@@ -247,8 +245,8 @@ void ImageDecoderQt::setData(const IncomingData &data, bool allDataReceived)
case ReadContext::ReadComplete:
// 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()) {
if (readContext.reader()->loopCount() != -1)
......@@ -265,8 +263,8 @@ void ImageDecoderQt::setData(const IncomingData &data, bool allDataReceived)
bool ImageDecoderQt::isSizeAvailable() const
{
if (debugImageDecoderQt)
qDebug() << " ImageDecoderQt::isSizeAvailable() returns" << m_sizeAvailable;
return m_sizeAvailable;
qDebug() << " ImageDecoderQt::isSizeAvailable() returns" << ImageDecoder::isSizeAvailable();
return ImageDecoder::isSizeAvailable();
}
int ImageDecoderQt::frameCount() const
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment