[Qt][WK2] WebKitTestRunner should use 480x360 sized view for W3C SVG tests

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

Patch by Szilard Ledan <Ledan-Muntean.Szilard@stud.u-szeged.hu> on 2012-02-15
Reviewed by Simon Hausmann.

Resize the web view programatically because the declarative property binding
does not work. Seems like our qml environment is not initialized fully but it
needs more investigation.

* WebKitTestRunner/qt/PlatformWebViewQt.cpp:
(WTR::WrapperWindow::handleStatusChanged):
(WTR::PlatformWebView::resizeTo):

git-svn-id: http://svn.webkit.org/repository/webkit/trunk@107868 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/platform/qt-5.0-wk2/Skipped b/LayoutTests/platform/qt-5.0-wk2/Skipped
index 2190e9e..5552d79 100644 (file)
--- a/LayoutTests/platform/qt-5.0-wk2/Skipped
+++ b/LayoutTests/platform/qt-5.0-wk2/Skipped
@@ -402,11 +402,6 @@ fast/block/float/float-in-float-hit-testing.html
 fast/dynamic/012.html
 platform/qt/plugins/qt-qwidget-plugin.html
 
-# [Qt][WK2] WebKitTestRunner should use 480x360 sized view for W3C SVG tests
-# https://bugs.webkit.org/show_bug.cgi?id=76546
-svg/W3C-SVG-1.1
-svg/W3C-SVG-1.1-SE
-
 # [Qt][WK2]REGRESSION(r105461): It made 8 tests fail
 # https://bugs.webkit.org/show_bug.cgi?id=76699
 fast/block/margin-collapse/056.html

diff --git a/Tools/ChangeLog b/Tools/ChangeLog
index f85eee7..12114b3 100644 (file)
--- a/Tools/ChangeLog
+++ b/Tools/ChangeLog
@@ -1,3 +1,18 @@
+2012-02-15  Szilard Ledan  <Ledan-Muntean.Szilard@stud.u-szeged.hu>
+
+        [Qt][WK2] WebKitTestRunner should use 480x360 sized view for W3C SVG tests
+        https://bugs.webkit.org/show_bug.cgi?id=76546
+
+        Reviewed by Simon Hausmann.
+
+        Resize the web view programatically because the declarative property binding
+        does not work. Seems like our qml environment is not initialized fully but it
+        needs more investigation.
+
+        * WebKitTestRunner/qt/PlatformWebViewQt.cpp:
+        (WTR::WrapperWindow::handleStatusChanged):
+        (WTR::PlatformWebView::resizeTo):
+
 2012-02-15  Dirk Pranke  <dpranke@chromium.org>
 
         webkitpy: add a worker_args concept to start_worker()

diff --git a/Tools/WebKitTestRunner/qt/PlatformWebViewQt.cpp b/Tools/WebKitTestRunner/qt/PlatformWebViewQt.cpp
index 1c3cf69..e93691c 100644 (file)
--- a/Tools/WebKitTestRunner/qt/PlatformWebViewQt.cpp
+++ b/Tools/WebKitTestRunner/qt/PlatformWebViewQt.cpp
@@ -55,10 +55,14 @@ private slots:
             return;
 
         setGeometry(0, 0, 800, 600);
+        m_view->setX(0);
+        m_view->setY(0);
+        m_view->setWidth(800);
+        m_view->setHeight(600);
+
         setResizeMode(QQuickView::SizeRootObjectToView);
 
         m_view->setParentItem(rootObject());
-        QDeclarativeProperty::write(m_view, "anchors.fill", qVariantFromValue(rootObject()));
 
         QWindowSystemInterface::handleWindowActivated(this);
         m_view->page()->setFocus(true);
@@ -88,6 +92,8 @@ PlatformWebView::~PlatformWebView()
 void PlatformWebView::resizeTo(unsigned width, unsigned height)
 {
     m_window->resize(width, height);
+    m_view->setWidth(width);
+    m_view->setHeight(height);
 }
 
 WKPageRef PlatformWebView::page()