[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.19-706-ge5415e9

[kov at webkit.org]

The following commit has been merged in the webkit-1.1 branch:
commit 3eecb89cbcdf9d8fbdb24b47ea5e6ec1ad03121f
Author: kov at webkit.org <kov at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Sat Jan 23 04:06:38 2010 +0000

    LayoutTests
    
    2010-01-22  Gustavo Noronha Silva  <gns at gnome.org>
    
            Reviewed by Simon Fraser.
    
            Checking in platform-specific results for test that is failing
            because of an additional single pixel in size - the test passes,
            when testing manually.
    
            * platform/gtk/svg/custom/text-zoom-expected.txt: Added.
    
    WebKitTools
    
    2010-01-22  Gustavo Noronha Silva  <gns at gnome.org>
    
            Reviewed by Simon Fraser.
    
            Reset zoom level to 1.0 when resetting view state. This is causing
            many tests to fail after svg/custom/text-zoom.xhtml changes the
            zoom level.
    
            * DumpRenderTree/gtk/DumpRenderTree.cpp:
            (resetDefaultsToConsistentValues):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@53754 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 0d0c8ee..c7d5d00 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,13 @@
+2010-01-22  Gustavo Noronha Silva  <gns at gnome.org>
+
+        Reviewed by Simon Fraser.
+
+        Checking in platform-specific results for test that is failing
+        because of an additional single pixel in size - the test passes,
+        when testing manually.
+
+        * platform/gtk/svg/custom/text-zoom-expected.txt: Added.
+
 2010-01-22  Simon Fraser  <simon.fraser at apple.com>
 
         No review.
diff --git a/LayoutTests/platform/gtk/svg/custom/text-zoom-expected.txt b/LayoutTests/platform/gtk/svg/custom/text-zoom-expected.txt
new file mode 100644
index 0000000..a815d10
--- /dev/null
+++ b/LayoutTests/platform/gtk/svg/custom/text-zoom-expected.txt
@@ -0,0 +1,12 @@
+layer at (0,0) size 800x600
+  RenderView at (0,0) size 800x600
+layer at (0,0) size 800x8
+  RenderBlock {html} at (0,0) size 800x8
+    RenderBody {body} at (8,8) size 784x0
+layer at (0,30) size 100x100
+  RenderBlock (positioned) {div} at (0,30) size 100x100 [bgcolor=#FF0000]
+layer at (0,30) size 200x206
+  RenderBlock (positioned) {div} at (0,30) size 200x200
+    RenderSVGRoot {svg} at (8,38) size 100x100
+      RenderPath {rect} at (8,38) size 100x100 [fill={[type=SOLID] [color=#008000]}] [data="M0.00,0.00 L50.00,0.00 L50.00,50.00 L0.00,50.00 Z"]
+    RenderText {#text} at (0,0) size 0x0
diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index 7da80c6..6c49322 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,14 @@
+2010-01-22  Gustavo Noronha Silva  <gns at gnome.org>
+
+        Reviewed by Simon Fraser.
+
+        Reset zoom level to 1.0 when resetting view state. This is causing
+        many tests to fail after svg/custom/text-zoom.xhtml changes the
+        zoom level.
+
+        * DumpRenderTree/gtk/DumpRenderTree.cpp:
+        (resetDefaultsToConsistentValues):
+
 2010-01-22  Steve Falkenburg  <sfalken at apple.com>
 
         Reviewed by Darin Adler.
diff --git a/WebKitTools/DumpRenderTree/gtk/DumpRenderTree.cpp b/WebKitTools/DumpRenderTree/gtk/DumpRenderTree.cpp
index 5e9154c..39430cf 100644
--- a/WebKitTools/DumpRenderTree/gtk/DumpRenderTree.cpp
+++ b/WebKitTools/DumpRenderTree/gtk/DumpRenderTree.cpp
@@ -342,6 +342,8 @@ static void resetDefaultsToConsistentValues()
     WebKitWebInspector* inspector = webkit_web_view_get_inspector(webView);
     g_object_set(G_OBJECT(inspector), "javascript-profiling-enabled", FALSE, NULL);
 
+    webkit_web_view_set_zoom_level(webView, 1.0);
+
     webkit_reset_origin_access_white_lists();
 
     setlocale(LC_ALL, "");

-- 
WebKit Debian packaging