Title: [87767] trunk/Source
- Revision
- 87767
- Author
- [email protected]
- Date
- 2011-05-31 18:47:23 -0700 (Tue, 31 May 2011)
Log Message
2011-05-31 Rafael Brandao <[email protected]>
Reviewed by Andreas Kling.
[Qt] tst_QWebFrame::render() failing
https://bugs.webkit.org/show_bug.cgi?id=60893
Due a problem on QPicture (http://bugreports.qt.nokia.com/browse/QTBUG-19496),
this test was calculating the final geometry incorrectly. As the order between
a translate and a draw operation could be relevant for it, but not for the
final rendered result, they were changed on ScrollbarThemeQt::paint.
* platform/qt/ScrollbarThemeQt.cpp:
(WebCore::ScrollbarThemeQt::paint):
2011-05-31 Rafael Brandao <[email protected]>
Reviewed by Andreas Kling.
[Qt] tst_QWebFrame::render() failing
https://bugs.webkit.org/show_bug.cgi?id=60893
The test was expecting the frame contents to be already loaded
before rendering it into a QPicture. Renamed the test to fit
its real purpose more accordingly.
* tests/qwebframe/tst_qwebframe.cpp:
(tst_QWebFrame::renderGeometry):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (87766 => 87767)
--- trunk/Source/WebCore/ChangeLog 2011-06-01 01:26:11 UTC (rev 87766)
+++ trunk/Source/WebCore/ChangeLog 2011-06-01 01:47:23 UTC (rev 87767)
@@ -1,3 +1,18 @@
+2011-05-31 Rafael Brandao <[email protected]>
+
+ Reviewed by Andreas Kling.
+
+ [Qt] tst_QWebFrame::render() failing
+ https://bugs.webkit.org/show_bug.cgi?id=60893
+
+ Due a problem on QPicture (http://bugreports.qt.nokia.com/browse/QTBUG-19496),
+ this test was calculating the final geometry incorrectly. As the order between
+ a translate and a draw operation could be relevant for it, but not for the
+ final rendered result, they were changed on ScrollbarThemeQt::paint.
+
+ * platform/qt/ScrollbarThemeQt.cpp:
+ (WebCore::ScrollbarThemeQt::paint):
+
2011-05-27 Adrienne Walker <[email protected]>
Reviewed by James Robinson.
Modified: trunk/Source/WebCore/platform/qt/ScrollbarThemeQt.cpp (87766 => 87767)
--- trunk/Source/WebCore/platform/qt/ScrollbarThemeQt.cpp 2011-06-01 01:26:11 UTC (rev 87766)
+++ trunk/Source/WebCore/platform/qt/ScrollbarThemeQt.cpp 2011-06-01 01:47:23 UTC (rev 87767)
@@ -163,13 +163,12 @@
else
#endif
{
- const QPoint topLeft = opt->rect.topLeft();
- p.painter->translate(topLeft);
- opt->rect.moveTo(QPoint(0, 0));
-
// The QStyle expects the background to be already filled.
p.painter->fillRect(opt->rect, opt->palette.background());
+ const QPoint topLeft = opt->rect.topLeft();
+ p.painter->translate(topLeft);
+ opt->rect.moveTo(QPoint(0, 0));
p.drawComplexControl(QStyle::CC_ScrollBar, *opt);
opt->rect.moveTo(topLeft);
}
Modified: trunk/Source/WebKit/qt/ChangeLog (87766 => 87767)
--- trunk/Source/WebKit/qt/ChangeLog 2011-06-01 01:26:11 UTC (rev 87766)
+++ trunk/Source/WebKit/qt/ChangeLog 2011-06-01 01:47:23 UTC (rev 87767)
@@ -1,3 +1,17 @@
+2011-05-31 Rafael Brandao <[email protected]>
+
+ Reviewed by Andreas Kling.
+
+ [Qt] tst_QWebFrame::render() failing
+ https://bugs.webkit.org/show_bug.cgi?id=60893
+
+ The test was expecting the frame contents to be already loaded
+ before rendering it into a QPicture. Renamed the test to fit
+ its real purpose more accordingly.
+
+ * tests/qwebframe/tst_qwebframe.cpp:
+ (tst_QWebFrame::renderGeometry):
+
2011-05-30 Caio Marcelo de Oliveira Filho <[email protected]>
Reviewed by Andreas Kling.
Modified: trunk/Source/WebKit/qt/tests/qwebframe/tst_qwebframe.cpp (87766 => 87767)
--- trunk/Source/WebKit/qt/tests/qwebframe/tst_qwebframe.cpp 2011-06-01 01:26:11 UTC (rev 87766)
+++ trunk/Source/WebKit/qt/tests/qwebframe/tst_qwebframe.cpp 2011-06-01 01:47:23 UTC (rev 87767)
@@ -637,7 +637,7 @@
void baseUrl_data();
void baseUrl();
void hasSetFocus();
- void render();
+ void renderGeometry();
void renderHints();
void scrollPosition();
void scrollToAnchor();
@@ -2881,7 +2881,7 @@
QTRY_VERIFY(m_page->mainFrame()->hasFocus());
}
-void tst_QWebFrame::render()
+void tst_QWebFrame::renderGeometry()
{
QString html("<html>" \
"<head><style>" \
@@ -2897,6 +2897,7 @@
QWebFrame *frame = frames.at(0);
QString innerHtml("<body style='margin: 0px;'><img src=''/></body>");
frame->setHtml(innerHtml);
+ waitForSignal(frame, SIGNAL(loadFinished(bool)), 200);
QPicture picture;
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
