Changeset 154899 in webkit

Timestamp:

Aug 30, 2013 11:00:36 AM (11 years ago)

Author:

commit-queue@webkit.org

Message:

[GTK] [WK2] TestWebKitWebView snapshot fails
​https://bugs.webkit.org/show_bug.cgi?id=120404

Patch by Brian Holt <​brian.holt@samsung.com> on 2013-08-30
Reviewed by Darin Adler.

Fixed the snapshot test failure caused by GTK no longer allowing
widgets to resize. Instead, resize the WebView by resizing the
window and waiting for the event to complete asynchronously.

• UIProcess/API/gtk/tests/WebViewTest.cpp:

(WebViewTest::resizeView):

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• UIProcess/API/gtk/tests/WebViewTest.cpp (modified) (1 diff)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2013-08-30  Brian Holt  <brian.holt@samsung.com>
+
+        [GTK] [WK2] TestWebKitWebView snapshot fails
+        https://bugs.webkit.org/show_bug.cgi?id=120404
+
+        Reviewed by Darin Adler.
+
+        Fixed the snapshot test failure caused by GTK no longer allowing
+        widgets to resize.  Instead, resize the WebView by resizing the
+        window and waiting for the event to complete asynchronously.
+
+        * UIProcess/API/gtk/tests/WebViewTest.cpp:
+        (WebViewTest::resizeView):
+
 2013-08-30  Csaba Osztrogonác  <ossy@webkit.org>
 

trunk/Source/WebKit2/UIProcess/API/gtk/tests/WebViewTest.cpp

@@ -202 +202 @@
 void WebViewTest::resizeView(int width, int height)
 {
-    GtkAllocation allocation;
-    gtk_widget_get_allocation(GTK_WIDGET(m_webView), &allocation);
-    if (width != -1)
-        allocation.width = width;
-    if (height != -1)
-        allocation.height = height;
-    gtk_widget_size_allocate(GTK_WIDGET(m_webView), &allocation);
+    gtk_window_resize(GTK_WINDOW(m_parentWindow), width, height);
+
+    while (gtk_events_pending())
+        gtk_main_iteration();
 }