[SCM] WebKit Debian packaging branch, webkit-1.3, updated. upstream/1.3.7-4207-g178b198

mrobinson at webkit.org mrobinson at webkit.org
Sun Feb 20 23:57:02 UTC 2011


The following commit has been merged in the webkit-1.3 branch:
commit 3ce973c3ba37f9d4e7c9cbe99b7e497fc1e3f28b
Author: mrobinson at webkit.org <mrobinson at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Jan 27 02:46:02 2011 +0000

    2011-01-26  Martin Robinson  <mrobinson at 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 at 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

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 18f458c..b1c4347 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,5 +1,41 @@
 2011-01-26  Martin Robinson  <mrobinson at 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 at igalia.com>
+
         [GTK] Text input controls do not react properly to CSS styling
         https://bugs.webkit.org/show_bug.cgi?id=40855
 
diff --git a/LayoutTests/platform/gtk/css2.1/t0803-c5502-mrgn-r-02-c-expected.checksum b/LayoutTests/platform/gtk/css2.1/t0803-c5502-mrgn-r-02-c-expected.checksum
index ac6762c..039c308 100644
--- a/LayoutTests/platform/gtk/css2.1/t0803-c5502-mrgn-r-02-c-expected.checksum
+++ b/LayoutTests/platform/gtk/css2.1/t0803-c5502-mrgn-r-02-c-expected.checksum
@@ -1 +1 @@
-8eaae228cb5381e59b7220036368b2da
\ No newline at end of file
+b1aa71ea04782765025aa2a6a0675632
\ No newline at end of file
diff --git a/LayoutTests/platform/gtk/css2.1/t0803-c5502-mrgn-r-02-c-expected.png b/LayoutTests/platform/gtk/css2.1/t0803-c5502-mrgn-r-02-c-expected.png
index 7104ab2..6f7ac32 100644
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
diff --git a/LayoutTests/platform/gtk/css2.1/t0803-c5505-mrgn-02-c-expected.checksum b/LayoutTests/platform/gtk/css2.1/t0803-c5505-mrgn-02-c-expected.checksum
index 1a7bad1..b83ed08 100644
--- a/LayoutTests/platform/gtk/css2.1/t0803-c5505-mrgn-02-c-expected.checksum
+++ b/LayoutTests/platform/gtk/css2.1/t0803-c5505-mrgn-02-c-expected.checksum
@@ -1 +1 @@
-e99926fb3866297acc7b29f5c7edac92
\ No newline at end of file
+73678a652ab623564087b382bb954d7c
\ No newline at end of file
diff --git a/LayoutTests/platform/gtk/css2.1/t0803-c5505-mrgn-02-c-expected.png b/LayoutTests/platform/gtk/css2.1/t0803-c5505-mrgn-02-c-expected.png
index d8b1349..5a229e6 100644
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
diff --git a/LayoutTests/platform/gtk/css2.1/t080301-c411-vt-mrgn-00-b-expected.checksum b/LayoutTests/platform/gtk/css2.1/t080301-c411-vt-mrgn-00-b-expected.checksum
index c3f7338..00d662d 100644
--- a/LayoutTests/platform/gtk/css2.1/t080301-c411-vt-mrgn-00-b-expected.checksum
+++ b/LayoutTests/platform/gtk/css2.1/t080301-c411-vt-mrgn-00-b-expected.checksum
@@ -1 +1 @@
-4d69a18c5369414e57cb3b4f177ee6ed
\ No newline at end of file
+b3045d09d01dc859eba08637799882ef
\ No newline at end of file
diff --git a/LayoutTests/platform/gtk/css2.1/t080301-c411-vt-mrgn-00-b-expected.png b/LayoutTests/platform/gtk/css2.1/t080301-c411-vt-mrgn-00-b-expected.png
index 8b98c8d..3bc0e69 100644
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
diff --git a/LayoutTests/platform/gtk/css2.1/t0905-c5525-fltclr-00-c-ag-expected.checksum b/LayoutTests/platform/gtk/css2.1/t0905-c5525-fltclr-00-c-ag-expected.checksum
index 712b9ee..41b6ba4 100644
--- a/LayoutTests/platform/gtk/css2.1/t0905-c5525-fltclr-00-c-ag-expected.checksum
+++ b/LayoutTests/platform/gtk/css2.1/t0905-c5525-fltclr-00-c-ag-expected.checksum
@@ -1 +1 @@
-9a1d5e8381a517abf467902d7bb5674f
\ No newline at end of file
+5c4e354e7fa24d82c686d42cc02e1607
\ No newline at end of file
diff --git a/LayoutTests/platform/gtk/css2.1/t0905-c5525-fltclr-00-c-ag-expected.png b/LayoutTests/platform/gtk/css2.1/t0905-c5525-fltclr-00-c-ag-expected.png
index 8798d3c..2a31097 100644
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
diff --git a/LayoutTests/platform/gtk/css2.1/t0905-c5525-fltmrgn-00-c-ag-expected.checksum b/LayoutTests/platform/gtk/css2.1/t0905-c5525-fltmrgn-00-c-ag-expected.checksum
index a222021..c4a200a 100644
--- a/LayoutTests/platform/gtk/css2.1/t0905-c5525-fltmrgn-00-c-ag-expected.checksum
+++ b/LayoutTests/platform/gtk/css2.1/t0905-c5525-fltmrgn-00-c-ag-expected.checksum
@@ -1 +1 @@
-a69161dc7c5137d9504c552a366b0dc3
\ No newline at end of file
+f6cc7fcda395e88bd2fdf61f635b612a
\ No newline at end of file
diff --git a/LayoutTests/platform/gtk/css2.1/t0905-c5525-fltmrgn-00-c-ag-expected.png b/LayoutTests/platform/gtk/css2.1/t0905-c5525-fltmrgn-00-c-ag-expected.png
index 934a7ef..f3b65cd 100644
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
diff --git a/LayoutTests/platform/gtk/css2.1/t0905-c5525-fltwidth-00-c-g-expected.checksum b/LayoutTests/platform/gtk/css2.1/t0905-c5525-fltwidth-00-c-g-expected.checksum
index 2440fd9..e9bf42f 100644
--- a/LayoutTests/platform/gtk/css2.1/t0905-c5525-fltwidth-00-c-g-expected.checksum
+++ b/LayoutTests/platform/gtk/css2.1/t0905-c5525-fltwidth-00-c-g-expected.checksum
@@ -1 +1 @@
-426fd9b3a1e5924c92940eeb64236f9b
\ No newline at end of file
+815a0fc75b489b6dae3aca27a17ce6b0
\ No newline at end of file
diff --git a/LayoutTests/platform/gtk/css2.1/t0905-c5525-fltwidth-00-c-g-expected.png b/LayoutTests/platform/gtk/css2.1/t0905-c5525-fltwidth-00-c-g-expected.png
index e87b782..a2f7017 100644
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
diff --git a/LayoutTests/platform/gtk/css2.1/t0905-c5526-fltclr-00-c-ag-expected.checksum b/LayoutTests/platform/gtk/css2.1/t0905-c5526-fltclr-00-c-ag-expected.checksum
index 712b9ee..41b6ba4 100644
--- a/LayoutTests/platform/gtk/css2.1/t0905-c5526-fltclr-00-c-ag-expected.checksum
+++ b/LayoutTests/platform/gtk/css2.1/t0905-c5526-fltclr-00-c-ag-expected.checksum
@@ -1 +1 @@
-9a1d5e8381a517abf467902d7bb5674f
\ No newline at end of file
+5c4e354e7fa24d82c686d42cc02e1607
\ No newline at end of file
diff --git a/LayoutTests/platform/gtk/css2.1/t0905-c5526-fltclr-00-c-ag-expected.png b/LayoutTests/platform/gtk/css2.1/t0905-c5526-fltclr-00-c-ag-expected.png
index 8798d3c..2a31097 100644
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
diff --git a/LayoutTests/platform/gtk/css2.1/t1002-c5523-width-02-b-g-expected.checksum b/LayoutTests/platform/gtk/css2.1/t1002-c5523-width-02-b-g-expected.checksum
index 4245318..84eb31f 100644
--- a/LayoutTests/platform/gtk/css2.1/t1002-c5523-width-02-b-g-expected.checksum
+++ b/LayoutTests/platform/gtk/css2.1/t1002-c5523-width-02-b-g-expected.checksum
@@ -1 +1 @@
-ebeed88d62724fef3e3d2f5bc94c12fc
\ No newline at end of file
+3d7ca95fbb0554cb373e5922f65731e1
\ No newline at end of file
diff --git a/LayoutTests/platform/gtk/css2.1/t1002-c5523-width-02-b-g-expected.png b/LayoutTests/platform/gtk/css2.1/t1002-c5523-width-02-b-g-expected.png
index f7bf10f..a2af54b 100644
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
diff --git a/LayoutTests/platform/gtk/css2.1/t1202-counters-08-b-expected.checksum b/LayoutTests/platform/gtk/css2.1/t1202-counters-08-b-expected.checksum
index 044dbe6..203d5e3 100644
--- a/LayoutTests/platform/gtk/css2.1/t1202-counters-08-b-expected.checksum
+++ b/LayoutTests/platform/gtk/css2.1/t1202-counters-08-b-expected.checksum
@@ -1 +1 @@
-99d973bef774ab5db90b8f79dbb40669
\ No newline at end of file
+d94eacb8f05e5c37de50e11702bdb8bf
\ No newline at end of file
diff --git a/LayoutTests/platform/gtk/css2.1/t1202-counters-08-b-expected.png b/LayoutTests/platform/gtk/css2.1/t1202-counters-08-b-expected.png
index 3ba5fc2..2b07574 100644
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
diff --git a/LayoutTests/platform/gtk/css2.1/t1202-counters-09-b-expected.checksum b/LayoutTests/platform/gtk/css2.1/t1202-counters-09-b-expected.checksum
index cb994aa..88e9962 100644
--- a/LayoutTests/platform/gtk/css2.1/t1202-counters-09-b-expected.checksum
+++ b/LayoutTests/platform/gtk/css2.1/t1202-counters-09-b-expected.checksum
@@ -1 +1 @@
-7e74635b6aaa225d9775da388a280826
\ No newline at end of file
+39819aa633d215691e0724f824540018
\ No newline at end of file
diff --git a/LayoutTests/platform/gtk/css2.1/t1202-counters-09-b-expected.png b/LayoutTests/platform/gtk/css2.1/t1202-counters-09-b-expected.png
index 22de400..d16868d 100644
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
diff --git a/LayoutTests/platform/gtk/css2.1/t140201-c535-bg-fixd-00-b-g-expected.checksum b/LayoutTests/platform/gtk/css2.1/t140201-c535-bg-fixd-00-b-g-expected.checksum
index e62f16f..b5a8dc1 100644
--- a/LayoutTests/platform/gtk/css2.1/t140201-c535-bg-fixd-00-b-g-expected.checksum
+++ b/LayoutTests/platform/gtk/css2.1/t140201-c535-bg-fixd-00-b-g-expected.checksum
@@ -1 +1 @@
-0437b4e721c382a1ee4f6fc2f045d17d
\ No newline at end of file
+abff0719a55abf1b6f82d51f3b41df3a
\ No newline at end of file
diff --git a/LayoutTests/platform/gtk/css2.1/t140201-c535-bg-fixd-00-b-g-expected.png b/LayoutTests/platform/gtk/css2.1/t140201-c535-bg-fixd-00-b-g-expected.png
index f218512..c2f5c83 100644
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
diff --git a/LayoutTests/platform/gtk/css2.1/t140201-c537-bgfxps-00-c-ag-expected.checksum b/LayoutTests/platform/gtk/css2.1/t140201-c537-bgfxps-00-c-ag-expected.checksum
index 2d1f5c3..ea0d872 100644
--- a/LayoutTests/platform/gtk/css2.1/t140201-c537-bgfxps-00-c-ag-expected.checksum
+++ b/LayoutTests/platform/gtk/css2.1/t140201-c537-bgfxps-00-c-ag-expected.checksum
@@ -1 +1 @@
-67e0400371612bcff494d4a84b0ebe5d
\ No newline at end of file
+66729075eddffb14860a4af6fa1f3a84
\ No newline at end of file
diff --git a/LayoutTests/platform/gtk/css2.1/t140201-c537-bgfxps-00-c-ag-expected.png b/LayoutTests/platform/gtk/css2.1/t140201-c537-bgfxps-00-c-ag-expected.png
index 68a6aed..1c8479c 100644
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
diff --git a/LayoutTests/platform/gtk/css2.1/t1508-c527-font-07-b-expected.checksum b/LayoutTests/platform/gtk/css2.1/t1508-c527-font-07-b-expected.checksum
index 0b22d80..3deb547 100644
--- a/LayoutTests/platform/gtk/css2.1/t1508-c527-font-07-b-expected.checksum
+++ b/LayoutTests/platform/gtk/css2.1/t1508-c527-font-07-b-expected.checksum
@@ -1 +1 @@
-7dc2412f7632b0d769e461bea805557c
\ No newline at end of file
+6014c0ceda6097265b3b711f41a1ed12
\ No newline at end of file
diff --git a/LayoutTests/platform/gtk/css2.1/t1508-c527-font-07-b-expected.png b/LayoutTests/platform/gtk/css2.1/t1508-c527-font-07-b-expected.png
index 703d4b0..0f2946e 100644
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
diff --git a/Tools/ChangeLog b/Tools/ChangeLog
index 44663db..6189301 100644
--- a/Tools/ChangeLog
+++ b/Tools/ChangeLog
@@ -1,3 +1,17 @@
+2011-01-26  Martin Robinson  <mrobinson at 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 at chromium.org>
 
         Reviewed by Mihai Parparita.
diff --git a/Tools/DumpRenderTree/gtk/PixelDumpSupportGtk.cpp b/Tools/DumpRenderTree/gtk/PixelDumpSupportGtk.cpp
index 32bc600..1e591bb 100644
--- a/Tools/DumpRenderTree/gtk/PixelDumpSupportGtk.cpp
+++ b/Tools/DumpRenderTree/gtk/PixelDumpSupportGtk.cpp
@@ -37,13 +37,14 @@
 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);

-- 
WebKit Debian packaging



More information about the Pkg-webkit-commits mailing list