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

[eric at webkit.org]

The following commit has been merged in the webkit-1.2 branch:
commit a6fc050e80a708611784d7f9905ce1832ec81a64
Author: eric at webkit.org <eric at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Jan 8 10:22:27 2010 +0000

    2010-01-08  Eric Seidel  <eric at webkit.org>
    
            Reviewed by Simon Hausmann.
    
            http/tests/uri/escaped-entity.html affects the output of svg/W3C-SVG-1.1/filters-conv-01-f.svg
            https://bugs.webkit.org/show_bug.cgi?id=32294
    
            * platform/mac/Skipped: Add http/tests/uri/escaped-entity.html to Skipped list since it affects later tests.
            * platform/mac/svg/W3C-SVG-1.1/filters-conv-01-f-expected.txt: Check in correct results.
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@52980 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 302c2c3..8d244c0 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,13 @@
+2010-01-08  Eric Seidel  <eric at webkit.org>
+
+        Reviewed by Simon Hausmann.
+
+        http/tests/uri/escaped-entity.html affects the output of svg/W3C-SVG-1.1/filters-conv-01-f.svg
+        https://bugs.webkit.org/show_bug.cgi?id=32294
+
+        * platform/mac/Skipped: Add http/tests/uri/escaped-entity.html to Skipped list since it affects later tests.
+        * platform/mac/svg/W3C-SVG-1.1/filters-conv-01-f-expected.txt: Check in correct results.
+
 2010-01-07  Eric Seidel  <eric at webkit.org>
 
         Reviewed by Darin Fisher.
diff --git a/LayoutTests/platform/mac/Skipped b/LayoutTests/platform/mac/Skipped
index 1fedcd9..a5c837e 100644
--- a/LayoutTests/platform/mac/Skipped
+++ b/LayoutTests/platform/mac/Skipped
@@ -103,3 +103,7 @@ fast/websockets/websocket-event-target.html
 # This test is causing later tests to fail
 # https://bugs.webkit.org/show_bug.cgi?id=33300
 platform/mac/accessibility/aria-liveregions-notifications.html
+
+# This test changes the output of svg/W3C-SVG-1.1/filters-conv-01-f.svg for unknown reasons.
+# https://bugs.webkit.org/show_bug.cgi?id=32294
+http/tests/uri/escaped-entity.html
diff --git a/LayoutTests/platform/mac/svg/W3C-SVG-1.1/filters-conv-01-f-expected.txt b/LayoutTests/platform/mac/svg/W3C-SVG-1.1/filters-conv-01-f-expected.txt
index 77fd3c8..0f4f93e 100644
--- a/LayoutTests/platform/mac/svg/W3C-SVG-1.1/filters-conv-01-f-expected.txt
+++ b/LayoutTests/platform/mac/svg/W3C-SVG-1.1/filters-conv-01-f-expected.txt
@@ -39,7 +39,7 @@ layer at (0,0) size 480x360
             RenderSVGImage {image} at (180,163) size 50x63 [filter=convolve5]
           RenderSVGText {text} at (10,20) size 117x18 contains 1 chunk(s)
             RenderSVGInlineText {#text} at (0,-14) size 117x18
-              chunk 1 text run 1 at (10.00,20.00) startOffset 0 endOffset 19 width 117.00: "Vertical blur (1x3)"
+              chunk 1 text run 1 at (10.00,20.00) startOffset 0 endOffset 19 width 115.00: "Vertical blur (1x3)"
           RenderSVGContainer {g} at (330,163) size 50x63 [transform={m=((1.00,0.00)(0.00,1.00)) t=(300.00,93.00)}]
             RenderSVGImage {image} at (330,163) size 50x63 [filter=convolve6]
     RenderSVGText {text} at (10,340) size 264x46 contains 1 chunk(s)

-- 
WebKit Debian packaging