[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.16-1409-g5afdf4d
hausmann at webkit.org
hausmann at webkit.org
Thu Dec 3 13:38:57 UTC 2009
The following commit has been merged in the webkit-1.1 branch:
commit 2a48d215817ca2a478af0141a330d01ab228e38e
Author: hausmann at webkit.org <hausmann at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Wed Nov 18 14:27:31 2009 +0000
[Qt] Make the QWebElement::render() test pass when pixmaps aren't 32 bit.
Patch by Paul Olav Tvete <paul.tvete at nokia.com> on 2009-11-18
Reviewed by Simon Hausmann.
* tests/qwebelement/tst_qwebelement.cpp:
(tst_QWebElement::render):
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@51111 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebKit/qt/ChangeLog b/WebKit/qt/ChangeLog
index fe1260d..cc10e42 100644
--- a/WebKit/qt/ChangeLog
+++ b/WebKit/qt/ChangeLog
@@ -1,3 +1,12 @@
+2009-11-18 Paul Olav Tvete <paul.tvete at nokia.com>
+
+ Reviewed by Simon Hausmann.
+
+ [Qt] Make the QWebElement::render() test pass when pixmaps aren't 32 bit.
+
+ * tests/qwebelement/tst_qwebelement.cpp:
+ (tst_QWebElement::render):
+
2009-11-18 Simon Hausmann <simon.hausmann at nokia.com>
Reviewed by Tor Arne Vestbø.
diff --git a/WebKit/qt/tests/qwebelement/tst_qwebelement.cpp b/WebKit/qt/tests/qwebelement/tst_qwebelement.cpp
index c7d83a1..e9dae18 100644
--- a/WebKit/qt/tests/qwebelement/tst_qwebelement.cpp
+++ b/WebKit/qt/tests/qwebelement/tst_qwebelement.cpp
@@ -995,7 +995,10 @@ void tst_QWebElement::render()
QImage testImage(resource.width(), resource.height(), QImage::Format_ARGB32);
QPainter painter0(&testImage);
painter0.fillRect(imageRect, Qt::white);
- painter0.drawImage(0, 0, resource);
+ // render() uses pixmaps internally, and pixmaps might have bit depths
+ // other than 32, giving different pixel values due to rounding.
+ QPixmap pix = QPixmap::fromImage(resource);
+ painter0.drawPixmap(0, 0, pix);
painter0.end();
QImage image1(resource.width(), resource.height(), QImage::Format_ARGB32);
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list