Changeset 155532 in webkit

Timestamp:

Sep 11, 2013 8:55:13 AM (11 years ago)

Author:

commit-queue@webkit.org

Message:

Unreviewed, rolling out r154899.
​http://trac.webkit.org/changeset/154899
​https://bugs.webkit.org/show_bug.cgi?id=121162

It didn't fix the problem and broke other unit tests
(Requested by KaL on #webkit).

• 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-09-11  Commit Queue  <commit-queue@webkit.org>
+
+        Unreviewed, rolling out r154899.
+        http://trac.webkit.org/changeset/154899
+        https://bugs.webkit.org/show_bug.cgi?id=121162
+
+        It didn't fix the problem and broke other unit tests
+        (Requested by KaL on #webkit).
+
+        * UIProcess/API/gtk/tests/WebViewTest.cpp:
+        (WebViewTest::resizeView):
+
 2013-09-11  Mikhail Pozdnyakov  <mikhail.pozdnyakov@intel.com>
 

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

@@ -202 +202 @@
 void WebViewTest::resizeView(int width, int height)
 {
-    gtk_window_resize(GTK_WINDOW(m_parentWindow), width, height);
-
-    while (gtk_events_pending())
-        gtk_main_iteration();
+    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);
 }