[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.15.1-1414-gc69ee75

[eric at webkit.org]

The following commit has been merged in the webkit-1.1 branch:
commit f3de531dd02cfc6e279a1600a5dba2836cec4c69
Author: eric at webkit.org <eric at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Oct 14 03:37:24 2009 +0000

    2009-10-13  Zan Dobersek  <zandobersek at gmail.com>
    
            Reviewed by Holger Freyther.
    
            [LayoutTests][Gtk] Set a common Gtk theme as default and update the results
            https://bugs.webkit.org/show_bug.cgi?id=30223
    
            Update test results to reflect the usage of the default theme.
    
            * platform/gtk/editing/selection/iframe-expected.txt:
            * platform/gtk/editing/selection/select-box-expected.txt:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@49552 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 35f4d47..d75cad5 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,15 @@
+2009-10-13  Zan Dobersek  <zandobersek at gmail.com>
+
+        Reviewed by Holger Freyther.
+
+        [LayoutTests][Gtk] Set a common Gtk theme as default and update the results
+        https://bugs.webkit.org/show_bug.cgi?id=30223
+
+        Update test results to reflect the usage of the default theme.
+
+        * platform/gtk/editing/selection/iframe-expected.txt:
+        * platform/gtk/editing/selection/select-box-expected.txt:
+
 2009-10-13  Sam Weinig  <sam at webkit.org>
 
         Reviewed by David Hyatt.
diff --git a/LayoutTests/platform/gtk/editing/selection/iframe-expected.txt b/LayoutTests/platform/gtk/editing/selection/iframe-expected.txt
index 0f467b3..6d7724f 100644
--- a/LayoutTests/platform/gtk/editing/selection/iframe-expected.txt
+++ b/LayoutTests/platform/gtk/editing/selection/iframe-expected.txt
@@ -13,12 +13,12 @@ layer at (0,0) size 800x600
           RenderText {#text} at (0,187) size 48x20
             text run at (0,187) width 48: "iframe: "
           RenderPartObject {IFRAME} at (48,0) size 402x202 [border: (1px solid #000000)]
-            layer at (0,0) size 383x219
-              RenderView at (0,0) size 383x200
-            layer at (0,0) size 383x219
-              RenderBlock {HTML} at (0,0) size 383x219
-                RenderBody {BODY} at (8,8) size 367x203
-                  RenderBlock {P} at (0,0) size 367x100
+            layer at (0,0) size 386x219
+              RenderView at (0,0) size 386x200
+            layer at (0,0) size 386x219
+              RenderBlock {HTML} at (0,0) size 386x219
+                RenderBody {BODY} at (8,8) size 370x203
+                  RenderBlock {P} at (0,0) size 370x100
                     RenderText {#text} at (0,0) size 365x100
                       text run at (0,0) width 316: "This tests caret movement through an inline table. "
                       text run at (316,0) width 37: "There"
@@ -27,8 +27,8 @@ layer at (0,0) size 800x600
                       text run at (142,40) width 216: "The caret shouldn't skip across the"
                       text run at (0,60) width 348: "table, but should enter it (unless we later decide that we"
                       text run at (0,80) width 160: "don't want this behavior)."
-                  RenderBlock {DIV} at (0,116) size 367x87
-                    RenderBlock {DIV} at (0,0) size 367x87
+                  RenderBlock {DIV} at (0,116) size 370x87
+                    RenderBlock {DIV} at (0,0) size 370x87
                       RenderText {#text} at (0,67) size 80x20
                         text run at (0,67) width 80: "Inline Table:"
                       RenderTable {TABLE} at (80,0) size 132x82 [border: (1px outset #808080)]
diff --git a/LayoutTests/platform/gtk/editing/selection/select-box-expected.txt b/LayoutTests/platform/gtk/editing/selection/select-box-expected.txt
index 69158e0..c2005d1 100644
--- a/LayoutTests/platform/gtk/editing/selection/select-box-expected.txt
+++ b/LayoutTests/platform/gtk/editing/selection/select-box-expected.txt
@@ -7,14 +7,14 @@ layer at (0,0) size 800x600
         RenderText {#text} at (0,0) size 691x20
           text run at (0,0) width 292: "This tests caret movement across a select box. "
           text run at (292,0) width 399: "The caret should skip over the select box as if it were an image."
-      RenderBlock {DIV} at (0,36) size 784x32
-        RenderBlock {DIV} at (0,0) size 784x32
-          RenderText {#text} at (0,6) size 71x20
-            text run at (0,6) width 71: "select box: "
-          RenderMenuList {SELECT} at (73,2) size 33x28 [bgcolor=#FFFFFF]
-            RenderBlock (anonymous) at (4,4) size 8x20
+      RenderBlock {DIV} at (0,36) size 784x30
+        RenderBlock {DIV} at (0,0) size 784x30
+          RenderText {#text} at (0,5) size 71x20
+            text run at (0,5) width 71: "select box: "
+          RenderMenuList {SELECT} at (73,2) size 31x26 [bgcolor=#FFFFFF]
+            RenderBlock (anonymous) at (3,3) size 8x20
               RenderText at (0,0) size 8x20
                 text run at (0,0) width 8: "1"
-          RenderText {#text} at (108,6) size 66x20
-            text run at (108,6) width 66: " the end ..."
+          RenderText {#text} at (106,5) size 66x20
+            text run at (106,5) width 66: " the end ..."
 caret: position 1 of child 0 {#text} of child 1 {DIV} of child 3 {DIV} of child 1 {BODY} of child 0 {HTML} of document

-- 
WebKit Debian packaging