diff options
| author | Simon Hausmann <simon.hausmann@nokia.com> | 2009-04-17 08:31:10 (GMT) |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@nokia.com> | 2009-04-17 08:31:10 (GMT) |
| commit | 5ed3f621255079b3688a792c1a964d6cd6cda743 (patch) | |
| tree | 69eec94d05e9756de1f1e6579a125bdab090dc54 /src/3rdparty/webkit/WebCore | |
| parent | c01ce578761aefc2c1780047aa666eb7ee96159f (diff) | |
| download | Qt-5ed3f621255079b3688a792c1a964d6cd6cda743.zip Qt-5ed3f621255079b3688a792c1a964d6cd6cda743.tar.gz Qt-5ed3f621255079b3688a792c1a964d6cd6cda743.tar.bz2 | |
Updated WebKit from /home/shausman/src/webkit/trunk to origin/qtwebkit-4.5 ( 450331808bfe11b1472c213a8cb311190355c2de )
Changes in WebKit since the last update:
++ b/WebCore/ChangeLog
2009-02-04 Simon Hausmann <simon.hausmann@nokia.com>
Unreviewed Qt build fix.
Changed ASSERT(image) to ASSERT(!image.isNull()).
* platform/graphics/qt/ImageBufferQt.cpp:
(WebCore::ImageBuffer::getImageData):
++ b/WebKit/qt/ChangeLog
2009-03-07 Adam Treat <adam.treat@torchmobile.com>
Reviewed by Cameron Zwarich.
These methods are clearly returning the wrong values as the two were
returning swapped information.
* Api/qwebpage.cpp:
(QWebPage::totalBytes):
(QWebPage::bytesReceived):
Diffstat (limited to 'src/3rdparty/webkit/WebCore')
| -rw-r--r-- | src/3rdparty/webkit/WebCore/ChangeLog | 9 | ||||
| -rw-r--r-- | src/3rdparty/webkit/WebCore/platform/graphics/qt/ImageBufferQt.cpp | 2 |
2 files changed, 10 insertions, 1 deletions
diff --git a/src/3rdparty/webkit/WebCore/ChangeLog b/src/3rdparty/webkit/WebCore/ChangeLog index 3774ea5..9be6e72 100644 --- a/src/3rdparty/webkit/WebCore/ChangeLog +++ b/src/3rdparty/webkit/WebCore/ChangeLog @@ -1,3 +1,12 @@ +2009-02-04 Simon Hausmann <simon.hausmann@nokia.com> + + Unreviewed Qt build fix. + + Changed ASSERT(image) to ASSERT(!image.isNull()). + + * platform/graphics/qt/ImageBufferQt.cpp: + (WebCore::ImageBuffer::getImageData): + 2009-02-03 Dirk Schulze <krit@webkit.org> Reviewed by Sam Weinig. diff --git a/src/3rdparty/webkit/WebCore/platform/graphics/qt/ImageBufferQt.cpp b/src/3rdparty/webkit/WebCore/platform/graphics/qt/ImageBufferQt.cpp index cea255e..d1009b5 100644 --- a/src/3rdparty/webkit/WebCore/platform/graphics/qt/ImageBufferQt.cpp +++ b/src/3rdparty/webkit/WebCore/platform/graphics/qt/ImageBufferQt.cpp @@ -114,7 +114,7 @@ PassRefPtr<ImageData> ImageBuffer::getImageData(const IntRect& rect) const QImage image = m_data.m_pixmap.toImage(); if (image.format() != QImage::Format_ARGB32) image = image.convertToFormat(QImage::Format_ARGB32); - ASSERT(image); + ASSERT(!image.isNull()); unsigned destBytesPerRow = 4 * rect.width(); unsigned char* destRows = data + desty * destBytesPerRow + destx * 4; |