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

[ap at apple.com]

The following commit has been merged in the webkit-1.2 branch:
commit 524c4e92da7cb0b3544cd6dd213d2f9824717ff0
Author: ap at apple.com <ap at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Jan 8 22:51:59 2010 +0000

            Reviewed by Darin Adler.
    
            https://bugs.webkit.org/show_bug.cgi?id=32294
            http/tests/uri/escaped-entity.html affects the output of svg/W3C-SVG-1.1/filters-conv-01-f.svg
    
            Changed the test to not have any funky characters. Filed bug 33400 to track the underlying
            problem with kerning.
    
            * http/tests/uri/escaped-entity-expected.txt:
            * http/tests/uri/escaped-entity.html:
            * platform/mac/Skipped:
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@53012 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index ef163e8..ff764de 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,17 @@
+2010-01-08  Alexey Proskuryakov  <ap at apple.com>
+
+        Reviewed by Darin Adler.
+
+        https://bugs.webkit.org/show_bug.cgi?id=32294
+        http/tests/uri/escaped-entity.html affects the output of svg/W3C-SVG-1.1/filters-conv-01-f.svg
+
+        Changed the test to not have any funky characters. Filed bug 33400 to track the underlying
+        problem with kerning.
+
+        * http/tests/uri/escaped-entity-expected.txt:
+        * http/tests/uri/escaped-entity.html:
+        * platform/mac/Skipped:
+
 2010-01-08  James Robinson  <jamesr at chromium.org>
 
         Reviewed by Eric Seidel.
diff --git a/LayoutTests/http/tests/uri/escaped-entity-expected.txt b/LayoutTests/http/tests/uri/escaped-entity-expected.txt
index e9931ee..251d339 100644
--- a/LayoutTests/http/tests/uri/escaped-entity-expected.txt
+++ b/LayoutTests/http/tests/uri/escaped-entity-expected.txt
@@ -1,4 +1,4 @@
-Test for bug 15119: Unrepresentable characters in a URL's character set should be converted to escaped entities. We use the character U+06DE (۞) which does not exist in Big-5.
+Test for bug 15119: Unrepresentable characters in a URL's character set should be converted to escaped entities. We use the character U+06DE (ARABIC START OF RUB EL HIZB) which does not exist in Big-5.
 
 Note that this exact page won't work in IE or Firefox. Firefox seems to always use UTF-8 for local files, and IE actually preserves the Unicode in the URL when we get it from JS, so we don't know what would get sent over the wire. However, both browsers will send %26%231758%3B over HTTP for the query.
 
diff --git a/LayoutTests/http/tests/uri/escaped-entity.html b/LayoutTests/http/tests/uri/escaped-entity.html
index 44cd0b1..6ef14f3 100644
--- a/LayoutTests/http/tests/uri/escaped-entity.html
+++ b/LayoutTests/http/tests/uri/escaped-entity.html
@@ -11,7 +11,7 @@
 
 <p>Test for <a href='http://bugs.webkit.org/show_bug.cgi?id=15119'>bug 15119</a>:
 Unrepresentable characters in a URL's character set should be converted to
-escaped entities. We use the character U+06DE (&#x6de;) which does not exist in
+escaped entities. We use the character U+06DE (ARABIC START OF RUB EL HIZB) which does not exist in
 Big-5.</p>
 
 <p>Note that this exact page won't work in IE or Firefox. Firefox seems to
diff --git a/LayoutTests/platform/mac/Skipped b/LayoutTests/platform/mac/Skipped
index ae54f8f..421b17d 100644
--- a/LayoutTests/platform/mac/Skipped
+++ b/LayoutTests/platform/mac/Skipped
@@ -99,7 +99,3 @@ fast/events/basic-touch-events.html
 # This test is causing a log message to occur after the test, thus causing the next test after it to fail:
 # https://bugs.webkit.org/show_bug.cgi?id=33256
 fast/websockets/websocket-event-target.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

-- 
WebKit Debian packaging