Title: [108635] trunk/Tools
- Revision
- 108635
- Author
- [email protected]
- Date
- 2012-02-23 09:32:01 -0800 (Thu, 23 Feb 2012)
Log Message
Unreviewed, rolling out r108626.
http://trac.webkit.org/changeset/108626
https://bugs.webkit.org/show_bug.cgi?id=79370
broke qt-wk2 bot, somehow the workaround does not work on the
bot (Requested by Ossy on #webkit).
Patch by Sheriff Bot <[email protected]> on 2012-02-23
* WebKitTestRunner/qt/PlatformWebViewQt.cpp:
(WTR::WrapperWindow::handleStatusChanged):
(WTR::PlatformWebView::resizeTo):
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (108634 => 108635)
--- trunk/Tools/ChangeLog 2012-02-23 17:28:33 UTC (rev 108634)
+++ trunk/Tools/ChangeLog 2012-02-23 17:32:01 UTC (rev 108635)
@@ -1,3 +1,16 @@
+2012-02-23 Sheriff Bot <[email protected]>
+
+ Unreviewed, rolling out r108626.
+ http://trac.webkit.org/changeset/108626
+ https://bugs.webkit.org/show_bug.cgi?id=79370
+
+ broke qt-wk2 bot, somehow the workaround does not work on the
+ bot (Requested by Ossy on #webkit).
+
+ * WebKitTestRunner/qt/PlatformWebViewQt.cpp:
+ (WTR::WrapperWindow::handleStatusChanged):
+ (WTR::PlatformWebView::resizeTo):
+
2012-02-23 ChangSeok Oh <[email protected]>
[GTK] DRT doesn't support scheduleAsynchronousKeyDown.
Modified: trunk/Tools/WebKitTestRunner/qt/PlatformWebViewQt.cpp (108634 => 108635)
--- trunk/Tools/WebKitTestRunner/qt/PlatformWebViewQt.cpp 2012-02-23 17:28:33 UTC (rev 108634)
+++ trunk/Tools/WebKitTestRunner/qt/PlatformWebViewQt.cpp 2012-02-23 17:32:01 UTC (rev 108635)
@@ -55,10 +55,14 @@
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,12 +92,8 @@
void PlatformWebView::resizeTo(unsigned width, unsigned height)
{
m_window->resize(width, height);
-
- // If we do not have a platform window we will never get the necessary
- // resize event, so simulate it in that case to make sure the quickview is
- // resized to what the layout test expects.
- if (!m_window->handle())
- QWindowSystemInterface::handleGeometryChange(m_window, m_window->geometry());
+ m_view->setWidth(width);
+ m_view->setHeight(height);
}
WKPageRef PlatformWebView::page()
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
