[SCM] WebKit Debian packaging branch, webkit-1.2, updated. upstream/1.1.90-6072-g9a69373

[zimmermann at webkit.org]

The following commit has been merged in the webkit-1.2 branch:
commit 29e5e21d78631be00bc92b570fa392a4a055df0b
Author: zimmermann at webkit.org <zimmermann at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Jan 4 16:50:36 2010 +0000

    2010-01-04  Nikolas Zimmermann  <nzimmermann at rim.com>
    
            Not reviewed.  Update two win-specific test results, that showed up on the Windows Release/Debug slave.
            Skip fast/frames/iframe-onload-remove-self-no-crash.html as it crashes the debug slave, filed bug.
    
            All bots except SnowLeopard Leaks & GTK Linux Debug (32-bit) should turn to green now!
    
            * platform/win/editing/selection/select-text-overflow-ellipsis-expected.txt:
            * platform/win/fast/forms/basic-selects-expected.txt: Added.
            * platform/win/Skipped:
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@52740 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 99fcd4d..c72dc95 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,5 +1,16 @@
 2010-01-04  Nikolas Zimmermann  <nzimmermann at rim.com>
 
+        Not reviewed.  Update two win-specific test results, that showed up on the Windows Release/Debug slave.
+        Skip fast/frames/iframe-onload-remove-self-no-crash.html as it crashes the debug slave, filed bug.
+
+        All bots except SnowLeopard Leaks & GTK Linux Debug (32-bit) should turn to green now!
+
+        * platform/win/editing/selection/select-text-overflow-ellipsis-expected.txt:
+        * platform/win/fast/forms/basic-selects-expected.txt: Added.
+        * platform/win/Skipped:
+
+2010-01-04  Nikolas Zimmermann  <nzimmermann at rim.com>
+
         Not reviewed. Bring back Tiger bot to green: svg/custom/use-on-symbol-inside-pattern.svg exposes a bug on both Tiger & Win.
         Reopened bug 17393 and skipping this test for now, as it requires a larger rework of Path::debugString().
 
diff --git a/LayoutTests/platform/win/Skipped b/LayoutTests/platform/win/Skipped
index 22c98a5..cedec95 100644
--- a/LayoutTests/platform/win/Skipped
+++ b/LayoutTests/platform/win/Skipped
@@ -739,3 +739,6 @@ http/tests/navigation/parsed-iframe-dynamic-form-back-entry.html
 
 # Shows subtle 0.0 vs -0.0 difference in path debug string, see https://bugs.webkit.org/show_bug.cgi?id=17393
 svg/custom/use-on-symbol-inside-pattern.svg
+
+# Crashes debug slave, see https://bugs.webkit.org/show_bug.cgi?id=33155
+fast/forms/iframe-onload-remove-self-no-crash.html
diff --git a/LayoutTests/platform/win/editing/selection/select-text-overflow-ellipsis-expected.txt b/LayoutTests/platform/win/editing/selection/select-text-overflow-ellipsis-expected.txt
index 7ebb1a8..65c7676 100644
--- a/LayoutTests/platform/win/editing/selection/select-text-overflow-ellipsis-expected.txt
+++ b/LayoutTests/platform/win/editing/selection/select-text-overflow-ellipsis-expected.txt
@@ -3,17 +3,17 @@ layer at (0,0) size 800x600
 layer at (0,0) size 800x600
   RenderBlock {HTML} at (0,0) size 800x600
     RenderBody {BODY} at (8,8) size 784x584
-      RenderBlock {H3} at (0,0) size 784x25
-        RenderText {#text} at (0,0) size 68x24
+      RenderBlock {H3} at (0,0) size 784x22
+        RenderText {#text} at (0,0) size 68x22
           text run at (0,0) width 68: "Test for "
-        RenderInline {A} at (0,0) size 156x24 [color=#0000EE]
-          RenderText {#text} at (68,0) size 156x24
+        RenderInline {A} at (0,0) size 156x22 [color=#0000EE]
+          RenderText {#text} at (68,0) size 156x22
             text run at (68,0) width 156: "WebKit bug 29968"
-        RenderText {#text} at (224,0) size 560x24
+        RenderText {#text} at (224,0) size 560x22
           text run at (224,0) width 560: ": Selecting text with text-overflow ellipsis should not show cut off text"
-layer at (8,51) size 95x21 scrollWidth 121
-  RenderBlock {DIV} at (0,43) size 95x21
-    RenderText {#text} at (0,0) size 121x20
+layer at (8,48) size 95x18 scrollWidth 121
+  RenderBlock {DIV} at (0,40) size 95x18
+    RenderText {#text} at (0,0) size 121x18
       text run at (0,0) width 121: "Lorem ipsum dolor"
 selection start: position 0 of child 0 {#text} of child 3 {DIV} of child 1 {BODY} of child 0 {HTML} of document
 selection end:   position 11 of child 0 {#text} of child 3 {DIV} of child 1 {BODY} of child 0 {HTML} of document
diff --git a/LayoutTests/platform/mac-leopard/fast/forms/basic-selects-expected.txt b/LayoutTests/platform/win/fast/forms/basic-selects-expected.txt
similarity index 100%
copy from LayoutTests/platform/mac-leopard/fast/forms/basic-selects-expected.txt
copy to LayoutTests/platform/win/fast/forms/basic-selects-expected.txt

-- 
WebKit Debian packaging