2011-01-26 Martin Robinson <mrobinson@igalia.com>
authormrobinson@webkit.org <mrobinson@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 27 Jan 2011 02:46:02 +0000 (02:46 +0000)
committermrobinson@webkit.org <mrobinson@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 27 Jan 2011 02:46:02 +0000 (02:46 +0000)
        Reviewed by Xan Lopez.

        [GTK] Pixel dumps do not include scrollbars in output images
        https://bugs.webkit.org/show_bug.cgi?id=53216

        Update expected results which should show scrollbars.

        * platform/gtk/css2.1/t0803-c5502-mrgn-r-02-c-expected.checksum:
        * platform/gtk/css2.1/t0803-c5502-mrgn-r-02-c-expected.png:
        * platform/gtk/css2.1/t0803-c5505-mrgn-02-c-expected.checksum:
        * platform/gtk/css2.1/t0803-c5505-mrgn-02-c-expected.png:
        * platform/gtk/css2.1/t080301-c411-vt-mrgn-00-b-expected.checksum:
        * platform/gtk/css2.1/t080301-c411-vt-mrgn-00-b-expected.png:
        * platform/gtk/css2.1/t0905-c5525-fltclr-00-c-ag-expected.checksum:
        * platform/gtk/css2.1/t0905-c5525-fltclr-00-c-ag-expected.png:
        * platform/gtk/css2.1/t0905-c5525-fltmrgn-00-c-ag-expected.checksum:
        * platform/gtk/css2.1/t0905-c5525-fltmrgn-00-c-ag-expected.png:
        * platform/gtk/css2.1/t0905-c5525-fltwidth-00-c-g-expected.checksum:
        * platform/gtk/css2.1/t0905-c5525-fltwidth-00-c-g-expected.png:
        * platform/gtk/css2.1/t0905-c5526-fltclr-00-c-ag-expected.checksum:
        * platform/gtk/css2.1/t0905-c5526-fltclr-00-c-ag-expected.png:
        * platform/gtk/css2.1/t1002-c5523-width-02-b-g-expected.checksum:
        * platform/gtk/css2.1/t1002-c5523-width-02-b-g-expected.png:
        * platform/gtk/css2.1/t1202-counters-08-b-expected.checksum:
        * platform/gtk/css2.1/t1202-counters-08-b-expected.png:
        * platform/gtk/css2.1/t1202-counters-09-b-expected.checksum:
        * platform/gtk/css2.1/t1202-counters-09-b-expected.png:
        * platform/gtk/css2.1/t140201-c535-bg-fixd-00-b-g-expected.checksum:
        * platform/gtk/css2.1/t140201-c535-bg-fixd-00-b-g-expected.png:
        * platform/gtk/css2.1/t140201-c537-bgfxps-00-c-ag-expected.checksum:
        * platform/gtk/css2.1/t140201-c537-bgfxps-00-c-ag-expected.png:
        * platform/gtk/css2.1/t1508-c527-font-07-b-expected.checksum:
        * platform/gtk/css2.1/t1508-c527-font-07-b-expected.png:
2011-01-26  Martin Robinson  <mrobinson@igalia.com>

        Reviewed by Xan Lopez.

        [GTK] Pixel dumps do not include scrollbars in output images
        https://bugs.webkit.org/show_bug.cgi?id=53216

        Show scrollbars in pixel dumps. This will fix pixel dumps for tests
        that have scrollbars.

        * DumpRenderTree/gtk/PixelDumpSupportGtk.cpp:
        (createBitmapContextFromWebView): Take the snapshot of the containing GtkScrolledWindow
        instead of the web view itself.

git-svn-id: http://svn.webkit.org/repository/webkit/trunk@76749 268f45cc-cd09-0410-ab3c-d52691b4dbfc

29 files changed:
LayoutTests/ChangeLog
LayoutTests/platform/gtk/css2.1/t0803-c5502-mrgn-r-02-c-expected.checksum
LayoutTests/platform/gtk/css2.1/t0803-c5502-mrgn-r-02-c-expected.png
LayoutTests/platform/gtk/css2.1/t0803-c5505-mrgn-02-c-expected.checksum
LayoutTests/platform/gtk/css2.1/t0803-c5505-mrgn-02-c-expected.png
LayoutTests/platform/gtk/css2.1/t080301-c411-vt-mrgn-00-b-expected.checksum
LayoutTests/platform/gtk/css2.1/t080301-c411-vt-mrgn-00-b-expected.png
LayoutTests/platform/gtk/css2.1/t0905-c5525-fltclr-00-c-ag-expected.checksum
LayoutTests/platform/gtk/css2.1/t0905-c5525-fltclr-00-c-ag-expected.png
LayoutTests/platform/gtk/css2.1/t0905-c5525-fltmrgn-00-c-ag-expected.checksum
LayoutTests/platform/gtk/css2.1/t0905-c5525-fltmrgn-00-c-ag-expected.png
LayoutTests/platform/gtk/css2.1/t0905-c5525-fltwidth-00-c-g-expected.checksum
LayoutTests/platform/gtk/css2.1/t0905-c5525-fltwidth-00-c-g-expected.png
LayoutTests/platform/gtk/css2.1/t0905-c5526-fltclr-00-c-ag-expected.checksum
LayoutTests/platform/gtk/css2.1/t0905-c5526-fltclr-00-c-ag-expected.png
LayoutTests/platform/gtk/css2.1/t1002-c5523-width-02-b-g-expected.checksum
LayoutTests/platform/gtk/css2.1/t1002-c5523-width-02-b-g-expected.png
LayoutTests/platform/gtk/css2.1/t1202-counters-08-b-expected.checksum
LayoutTests/platform/gtk/css2.1/t1202-counters-08-b-expected.png
LayoutTests/platform/gtk/css2.1/t1202-counters-09-b-expected.checksum
LayoutTests/platform/gtk/css2.1/t1202-counters-09-b-expected.png
LayoutTests/platform/gtk/css2.1/t140201-c535-bg-fixd-00-b-g-expected.checksum
LayoutTests/platform/gtk/css2.1/t140201-c535-bg-fixd-00-b-g-expected.png
LayoutTests/platform/gtk/css2.1/t140201-c537-bgfxps-00-c-ag-expected.checksum
LayoutTests/platform/gtk/css2.1/t140201-c537-bgfxps-00-c-ag-expected.png
LayoutTests/platform/gtk/css2.1/t1508-c527-font-07-b-expected.checksum
LayoutTests/platform/gtk/css2.1/t1508-c527-font-07-b-expected.png
Tools/ChangeLog
Tools/DumpRenderTree/gtk/PixelDumpSupportGtk.cpp

index 18f458cea7bd6fe67a34ff13f704825a51ef9a68..b1c4347919921fd5f778ab41c8c77120b0e2df9e 100644 (file)
@@ -1,3 +1,39 @@
+2011-01-26  Martin Robinson  <mrobinson@igalia.com>
+
+        Reviewed by Xan Lopez.
+
+        [GTK] Pixel dumps do not include scrollbars in output images
+        https://bugs.webkit.org/show_bug.cgi?id=53216
+
+        Update expected results which should show scrollbars.
+
+        * platform/gtk/css2.1/t0803-c5502-mrgn-r-02-c-expected.checksum:
+        * platform/gtk/css2.1/t0803-c5502-mrgn-r-02-c-expected.png:
+        * platform/gtk/css2.1/t0803-c5505-mrgn-02-c-expected.checksum:
+        * platform/gtk/css2.1/t0803-c5505-mrgn-02-c-expected.png:
+        * platform/gtk/css2.1/t080301-c411-vt-mrgn-00-b-expected.checksum:
+        * platform/gtk/css2.1/t080301-c411-vt-mrgn-00-b-expected.png:
+        * platform/gtk/css2.1/t0905-c5525-fltclr-00-c-ag-expected.checksum:
+        * platform/gtk/css2.1/t0905-c5525-fltclr-00-c-ag-expected.png:
+        * platform/gtk/css2.1/t0905-c5525-fltmrgn-00-c-ag-expected.checksum:
+        * platform/gtk/css2.1/t0905-c5525-fltmrgn-00-c-ag-expected.png:
+        * platform/gtk/css2.1/t0905-c5525-fltwidth-00-c-g-expected.checksum:
+        * platform/gtk/css2.1/t0905-c5525-fltwidth-00-c-g-expected.png:
+        * platform/gtk/css2.1/t0905-c5526-fltclr-00-c-ag-expected.checksum:
+        * platform/gtk/css2.1/t0905-c5526-fltclr-00-c-ag-expected.png:
+        * platform/gtk/css2.1/t1002-c5523-width-02-b-g-expected.checksum:
+        * platform/gtk/css2.1/t1002-c5523-width-02-b-g-expected.png:
+        * platform/gtk/css2.1/t1202-counters-08-b-expected.checksum:
+        * platform/gtk/css2.1/t1202-counters-08-b-expected.png:
+        * platform/gtk/css2.1/t1202-counters-09-b-expected.checksum:
+        * platform/gtk/css2.1/t1202-counters-09-b-expected.png:
+        * platform/gtk/css2.1/t140201-c535-bg-fixd-00-b-g-expected.checksum:
+        * platform/gtk/css2.1/t140201-c535-bg-fixd-00-b-g-expected.png:
+        * platform/gtk/css2.1/t140201-c537-bgfxps-00-c-ag-expected.checksum:
+        * platform/gtk/css2.1/t140201-c537-bgfxps-00-c-ag-expected.png:
+        * platform/gtk/css2.1/t1508-c527-font-07-b-expected.checksum:
+        * platform/gtk/css2.1/t1508-c527-font-07-b-expected.png:
+
 2011-01-26  Martin Robinson  <mrobinson@igalia.com>
 
         [GTK] Text input controls do not react properly to CSS styling
index ac6762c70d96c2f57694f158b5a372199827f0ae..039c308b33cce6b6abd721bfa9792a4e4fc04e32 100644 (file)
@@ -1 +1 @@
-8eaae228cb5381e59b7220036368b2da
\ No newline at end of file
+b1aa71ea04782765025aa2a6a0675632
\ No newline at end of file
index 7104ab2d98d06d0ff1ea4f54386de0bd27fe86e1..6f7ac328525f4ca5ecaf793a7ecd39a6d9361687 100644 (file)
Binary files a/LayoutTests/platform/gtk/css2.1/t0803-c5502-mrgn-r-02-c-expected.png and b/LayoutTests/platform/gtk/css2.1/t0803-c5502-mrgn-r-02-c-expected.png differ
index 1a7bad118be3b9792a1986c0fd8e826d87891834..b83ed084ce53c91fa50cdeb925b4065772655493 100644 (file)
@@ -1 +1 @@
-e99926fb3866297acc7b29f5c7edac92
\ No newline at end of file
+73678a652ab623564087b382bb954d7c
\ No newline at end of file
index d8b13498e2ce91c576aa6b326c38ae0947dedbdf..5a229e65391a0063e5c63c7894fcbfcf520e70bd 100644 (file)
Binary files a/LayoutTests/platform/gtk/css2.1/t0803-c5505-mrgn-02-c-expected.png and b/LayoutTests/platform/gtk/css2.1/t0803-c5505-mrgn-02-c-expected.png differ
index c3f733872acfc85c85eccd1f512d1ef127988dc1..00d662d3d3bb3342e07a9d5259872c7a884ff1a9 100644 (file)
@@ -1 +1 @@
-4d69a18c5369414e57cb3b4f177ee6ed
\ No newline at end of file
+b3045d09d01dc859eba08637799882ef
\ No newline at end of file
index 8b98c8dbb6f4bf1bf5bf1d022e2008bd57ef719a..3bc0e695d3a2428dcc9386f64af7861a90c7ccd1 100644 (file)
Binary files a/LayoutTests/platform/gtk/css2.1/t080301-c411-vt-mrgn-00-b-expected.png and b/LayoutTests/platform/gtk/css2.1/t080301-c411-vt-mrgn-00-b-expected.png differ
index 712b9eefa24d8795fde8fbed8dc7560e2ea44572..41b6ba487e0eb440feb81da6b017dd74cc60152c 100644 (file)
@@ -1 +1 @@
-9a1d5e8381a517abf467902d7bb5674f
\ No newline at end of file
+5c4e354e7fa24d82c686d42cc02e1607
\ No newline at end of file
index 8798d3c8a35d713c88fc18a6fa0f83d3109182d4..2a310979e3d90b532beada55c991a41e3d139ce8 100644 (file)
Binary files a/LayoutTests/platform/gtk/css2.1/t0905-c5525-fltclr-00-c-ag-expected.png and b/LayoutTests/platform/gtk/css2.1/t0905-c5525-fltclr-00-c-ag-expected.png differ
index a222021b9596578d9be90270d298b71a358f37fd..c4a200a988603dbcf6e942fb9adef12a6a90830b 100644 (file)
@@ -1 +1 @@
-a69161dc7c5137d9504c552a366b0dc3
\ No newline at end of file
+f6cc7fcda395e88bd2fdf61f635b612a
\ No newline at end of file
index 934a7ef228cca578c956f889d194119d1bc2edb4..f3b65cd384c53494e5f011641dc7696dc07d2a7c 100644 (file)
Binary files a/LayoutTests/platform/gtk/css2.1/t0905-c5525-fltmrgn-00-c-ag-expected.png and b/LayoutTests/platform/gtk/css2.1/t0905-c5525-fltmrgn-00-c-ag-expected.png differ
index 2440fd9d1c45e2fb240375cf3b6c0310651e9152..e9bf42f72ddb320df24659e8307a74755fb4eba6 100644 (file)
@@ -1 +1 @@
-426fd9b3a1e5924c92940eeb64236f9b
\ No newline at end of file
+815a0fc75b489b6dae3aca27a17ce6b0
\ No newline at end of file
index e87b782d51ee15a6144114be081d0de1e24d7747..a2f7017b33ea504e2f44f61d3263cce0f8f45b26 100644 (file)
Binary files a/LayoutTests/platform/gtk/css2.1/t0905-c5525-fltwidth-00-c-g-expected.png and b/LayoutTests/platform/gtk/css2.1/t0905-c5525-fltwidth-00-c-g-expected.png differ
index 712b9eefa24d8795fde8fbed8dc7560e2ea44572..41b6ba487e0eb440feb81da6b017dd74cc60152c 100644 (file)
@@ -1 +1 @@
-9a1d5e8381a517abf467902d7bb5674f
\ No newline at end of file
+5c4e354e7fa24d82c686d42cc02e1607
\ No newline at end of file
index 8798d3c8a35d713c88fc18a6fa0f83d3109182d4..2a310979e3d90b532beada55c991a41e3d139ce8 100644 (file)
Binary files a/LayoutTests/platform/gtk/css2.1/t0905-c5526-fltclr-00-c-ag-expected.png and b/LayoutTests/platform/gtk/css2.1/t0905-c5526-fltclr-00-c-ag-expected.png differ
index 4245318dcdf246f59e69ccc9791a31eba040d320..84eb31f3ceb7e08664ffb3af2eba353c0df52482 100644 (file)
@@ -1 +1 @@
-ebeed88d62724fef3e3d2f5bc94c12fc
\ No newline at end of file
+3d7ca95fbb0554cb373e5922f65731e1
\ No newline at end of file
index f7bf10f08ef38f544cdd8589792a66f6074e5aed..a2af54bf492c479aa95bdb18ddc379edb28926f1 100644 (file)
Binary files a/LayoutTests/platform/gtk/css2.1/t1002-c5523-width-02-b-g-expected.png and b/LayoutTests/platform/gtk/css2.1/t1002-c5523-width-02-b-g-expected.png differ
index 044dbe69372a65f111734a1dd7084acc00cfb0b8..203d5e355f4e42d61817d9702943ccaaf26d77a6 100644 (file)
@@ -1 +1 @@
-99d973bef774ab5db90b8f79dbb40669
\ No newline at end of file
+d94eacb8f05e5c37de50e11702bdb8bf
\ No newline at end of file
index 3ba5fc2bc310b4bfc7a202c0e1ae988fc83e078d..2b075746ca02c5e1297e2ffeb90c153b0873552c 100644 (file)
Binary files a/LayoutTests/platform/gtk/css2.1/t1202-counters-08-b-expected.png and b/LayoutTests/platform/gtk/css2.1/t1202-counters-08-b-expected.png differ
index cb994aa8b27108592cbd2b65435ec106ac5a4d11..88e9962c5c42b1e4cf1ac0ab393858457bf9264c 100644 (file)
@@ -1 +1 @@
-7e74635b6aaa225d9775da388a280826
\ No newline at end of file
+39819aa633d215691e0724f824540018
\ No newline at end of file
index 22de400c772658991b446555eb2f8076820f0423..d16868d736758eadf13ece7093bb22c8858aba74 100644 (file)
Binary files a/LayoutTests/platform/gtk/css2.1/t1202-counters-09-b-expected.png and b/LayoutTests/platform/gtk/css2.1/t1202-counters-09-b-expected.png differ
index e62f16f56202f17ca2934b1e2577ec2b5aa70549..b5a8dc1c6ee74fa339df63cd845b8cb440aa361c 100644 (file)
@@ -1 +1 @@
-0437b4e721c382a1ee4f6fc2f045d17d
\ No newline at end of file
+abff0719a55abf1b6f82d51f3b41df3a
\ No newline at end of file
index f218512d9b9c0d699a13c1785680de2bdd76243c..c2f5c83bde23be942f03335ef5f6df7cc6a09eba 100644 (file)
Binary files a/LayoutTests/platform/gtk/css2.1/t140201-c535-bg-fixd-00-b-g-expected.png and b/LayoutTests/platform/gtk/css2.1/t140201-c535-bg-fixd-00-b-g-expected.png differ
index 2d1f5c370b0001f0f7619cd9991b5ad2bddda955..ea0d87224a3b173f6a22379c405c6681292f41f2 100644 (file)
@@ -1 +1 @@
-67e0400371612bcff494d4a84b0ebe5d
\ No newline at end of file
+66729075eddffb14860a4af6fa1f3a84
\ No newline at end of file
index 68a6aed14ed7de7ace40c112328d97527763b18d..1c8479c03859295841ca9e6a4d5663de976aff02 100644 (file)
Binary files a/LayoutTests/platform/gtk/css2.1/t140201-c537-bgfxps-00-c-ag-expected.png and b/LayoutTests/platform/gtk/css2.1/t140201-c537-bgfxps-00-c-ag-expected.png differ
index 0b22d80db39b51b6a89863f09d2b6f30ec6ee80b..3deb547944b5463f7850cb7731856624e7052734 100644 (file)
@@ -1 +1 @@
-7dc2412f7632b0d769e461bea805557c
\ No newline at end of file
+6014c0ceda6097265b3b711f41a1ed12
\ No newline at end of file
index 703d4b076b0aacf39d2a64515fa1abec6ab1e4d2..0f2946e836547c51303275676b752c87244f4bc5 100644 (file)
Binary files a/LayoutTests/platform/gtk/css2.1/t1508-c527-font-07-b-expected.png and b/LayoutTests/platform/gtk/css2.1/t1508-c527-font-07-b-expected.png differ
index 44663db4f43bbf0e4cdc832b0aa50c43c128ee50..618930153b2dd26d16f1853360833b6c3dcce001 100644 (file)
@@ -1,3 +1,17 @@
+2011-01-26  Martin Robinson  <mrobinson@igalia.com>
+
+        Reviewed by Xan Lopez.
+
+        [GTK] Pixel dumps do not include scrollbars in output images
+        https://bugs.webkit.org/show_bug.cgi?id=53216
+
+        Show scrollbars in pixel dumps. This will fix pixel dumps for tests
+        that have scrollbars.
+
+        * DumpRenderTree/gtk/PixelDumpSupportGtk.cpp:
+        (createBitmapContextFromWebView): Take the snapshot of the containing GtkScrolledWindow
+        instead of the web view itself.
+
 2011-01-26  Dirk Pranke  <dpranke@chromium.org>
 
         Reviewed by Mihai Parparita.
index 32bc600052351329d6f260c92abefc578fc57ba0..1e591bb86f88deed7b0d39c7b05937fda1fff962 100644 (file)
 PassRefPtr<BitmapContext> createBitmapContextFromWebView(bool, bool, bool, bool)
 {
     WebKitWebView* view = webkit_web_frame_get_web_view(mainFrame);
+    GtkWidget* viewContainer = gtk_widget_get_parent(GTK_WIDGET(view));
     gint width, height;
 #ifdef GTK_API_VERSION_2
-    GdkPixmap* pixmap = gtk_widget_get_snapshot(GTK_WIDGET(view), 0);
+    GdkPixmap* pixmap = gtk_widget_get_snapshot(viewContainer, 0);
     gdk_pixmap_get_size(pixmap, &width, &height);
 #else
-    width = gtk_widget_get_allocated_width(GTK_WIDGET(view));
-    height = gtk_widget_get_allocated_height(GTK_WIDGET(view));
+    width = gtk_widget_get_allocated_width(viewContainer);
+    height = gtk_widget_get_allocated_height(viewContainer);
 #endif
 
     cairo_surface_t* imageSurface = cairo_image_surface_create(CAIRO_FORMAT_ARGB32, width, height);
@@ -53,7 +54,7 @@ PassRefPtr<BitmapContext> createBitmapContextFromWebView(bool, bool, bool, bool)
     cairo_paint(context);
     g_object_unref(pixmap);
 #else
-    gtk_widget_draw(GTK_WIDGET(view), context);
+    gtk_widget_draw(viewContainer, context);
 #endif
 
     return BitmapContext::createByAdoptingBitmapAndContext(0, context);