Title: [119715] trunk/Tools
Revision
119715
Author
[email protected]
Date
2012-06-07 06:21:08 -0700 (Thu, 07 Jun 2012)

Log Message

[Gtk] Assertions in gtk_widget_draw when acquiring pixel output
https://bugs.webkit.org/show_bug.cgi?id=88060

Reviewed by Martin Robinson.

Spin the main loop before acquiring the pixel content. This ensures things
like late size allocations are finished before calling gtk_widget_draw,
avoiding assertions and subsequent empty pixel results.

* DumpRenderTree/gtk/PixelDumpSupportGtk.cpp:
(createBitmapContextFromWebView):

Modified Paths

Diff

Modified: trunk/Tools/ChangeLog (119714 => 119715)


--- trunk/Tools/ChangeLog	2012-06-07 13:09:18 UTC (rev 119714)
+++ trunk/Tools/ChangeLog	2012-06-07 13:21:08 UTC (rev 119715)
@@ -1,3 +1,17 @@
+2012-06-07  Zan Dobersek  <[email protected]>
+
+        [Gtk] Assertions in gtk_widget_draw when acquiring pixel output
+        https://bugs.webkit.org/show_bug.cgi?id=88060
+
+        Reviewed by Martin Robinson.
+
+        Spin the main loop before acquiring the pixel content. This ensures things
+        like late size allocations are finished before calling gtk_widget_draw,
+        avoiding assertions and subsequent empty pixel results.
+
+        * DumpRenderTree/gtk/PixelDumpSupportGtk.cpp:
+        (createBitmapContextFromWebView):
+
 2012-06-06  Kenneth Rohde Christiansen  <[email protected]>
 
         [Qt] Improve the visual of the viewport info box

Modified: trunk/Tools/DumpRenderTree/gtk/PixelDumpSupportGtk.cpp (119714 => 119715)


--- trunk/Tools/DumpRenderTree/gtk/PixelDumpSupportGtk.cpp	2012-06-07 13:09:18 UTC (rev 119714)
+++ trunk/Tools/DumpRenderTree/gtk/PixelDumpSupportGtk.cpp	2012-06-07 13:21:08 UTC (rev 119715)
@@ -48,6 +48,9 @@
     height = gtk_widget_get_allocated_height(viewContainer);
 #endif
 
+    while (gtk_events_pending())
+        gtk_main_iteration();
+
     cairo_surface_t* imageSurface = cairo_image_surface_create(CAIRO_FORMAT_ARGB32, width, height);
     cairo_t* context = cairo_create(imageSurface);
 
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes

Reply via email to