Title: [119497] trunk/Source/WebKit2
Revision
119497
Author
alexis.men...@openbossa.org
Date
2012-06-05 09:30:47 -0700 (Tue, 05 Jun 2012)

Log Message

[Qt] Don't propagate viewport size changes if the viewport is empty.
https://bugs.webkit.org/show_bug.cgi?id=88336

Reviewed by Tor Arne Vestbø.

Qt Quick sequentially set the x, y, width, height of the view. We really want to
start propagating further when the size of the viewport becomes valid, i.e. both
height and width are defined. In any case lower level classes are discarding an empty
size such as WebPage::sendViewportAttributesChanged() so it was pointless to send the size
through the IPC bus for nothing.

* UIProcess/API/qt/qquickwebview.cpp:
(QQuickWebViewLegacyPrivate::updateViewportSize):

Modified Paths

Diff

Modified: trunk/Source/WebKit2/ChangeLog (119496 => 119497)


--- trunk/Source/WebKit2/ChangeLog	2012-06-05 16:23:42 UTC (rev 119496)
+++ trunk/Source/WebKit2/ChangeLog	2012-06-05 16:30:47 UTC (rev 119497)
@@ -1,3 +1,19 @@
+2012-06-05  Alexis Menard  <alexis.men...@openbossa.org>
+
+        [Qt] Don't propagate viewport size changes if the viewport is empty.
+        https://bugs.webkit.org/show_bug.cgi?id=88336
+
+        Reviewed by Tor Arne Vestbø.
+
+        Qt Quick sequentially set the x, y, width, height of the view. We really want to
+        start propagating further when the size of the viewport becomes valid, i.e. both
+        height and width are defined. In any case lower level classes are discarding an empty
+        size such as WebPage::sendViewportAttributesChanged() so it was pointless to send the size
+        through the IPC bus for nothing.
+
+        * UIProcess/API/qt/qquickwebview.cpp:
+        (QQuickWebViewLegacyPrivate::updateViewportSize):
+
 2012-06-05  Carlos Garcia Campos  <cgar...@igalia.com>
 
         [GTK] Add webkit_download_get_received_data_length to WebKit2 GTK+ API

Modified: trunk/Source/WebKit2/UIProcess/API/qt/qquickwebview.cpp (119496 => 119497)


--- trunk/Source/WebKit2/UIProcess/API/qt/qquickwebview.cpp	2012-06-05 16:23:42 UTC (rev 119496)
+++ trunk/Source/WebKit2/UIProcess/API/qt/qquickwebview.cpp	2012-06-05 16:30:47 UTC (rev 119497)
@@ -775,6 +775,8 @@
 {
     Q_Q(QQuickWebView);
     QSize viewportSize = q->boundingRect().size().toSize();
+    if (viewportSize.isEmpty())
+        return;
     pageView->setContentsSize(viewportSize);
     // The fixed layout is handled by the FrameView and the drawing area doesn't behave differently
     // whether its fixed or not. We still need to tell the drawing area which part of it
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes

Reply via email to