[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc

[ap at apple.com]

The following commit has been merged in the debian/experimental branch:
commit 3eac952cac755acdc74642cc5e14efed2f85e0b5
Author: ap at apple.com <ap at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Aug 6 06:50:41 2010 +0000

            Fix http/tests/webarchive/test-css-url-encoding-shift-jis.html
    
            For some reason, I didn't see the failure locally, but bots complain.
    
            * platform/text/TextCodecICU.cpp: (WebCore::TextCodecICU::registerExtendedEncodingNames):
            Register "shift-jis" (with dash instead of underscore). At least Firefox supports it.
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@64820 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 8b2d295..3e0a365 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,11 @@
+2010-08-05  Alexey Proskuryakov  <ap at apple.com>
+
+        Fix http/tests/webarchive/test-css-url-encoding-shift-jis.html
+
+        * fast/encoding/char-decoding-expected.txt:
+        * fast/encoding/char-decoding.html:
+        Also added an explicit case for this encoding name.
+
 2010-08-05  Ben Murdoch  <benm at google.com>
 
         Reviewed by Simon Fraser.
diff --git a/LayoutTests/fast/encoding/char-decoding-expected.txt b/LayoutTests/fast/encoding/char-decoding-expected.txt
index 8699b98..26afe48 100644
--- a/LayoutTests/fast/encoding/char-decoding-expected.txt
+++ b/LayoutTests/fast/encoding/char-decoding-expected.txt
@@ -10,6 +10,8 @@ PASS decode('chinese', '%A3%A0') is 'U+3000'
 PASS decode('gbk', '%A3%A0') is 'U+3000'
 PASS decode('gb18030', '%A3%A0') is 'U+3000'
 PASS decode('EUC-CN', '%A3%A0') is 'U+3000'
+PASS decode('Shift_JIS', '%82%d0') is 'U+3072'
+PASS decode('shift-jis', '%82%d0') is 'U+3072'
 PASS decode('korean', '%A2%E6') is 'U+20AC'
 PASS decode('korean', '%A1%A4') is 'U+00B7'
 PASS decode('korean', '%A1%A9') is 'U+00AD'
diff --git a/LayoutTests/fast/encoding/char-decoding.html b/LayoutTests/fast/encoding/char-decoding.html
index f17fc0e..b913389 100644
--- a/LayoutTests/fast/encoding/char-decoding.html
+++ b/LayoutTests/fast/encoding/char-decoding.html
@@ -21,6 +21,10 @@ testDecode('gbk', '%A3%A0', 'U+3000');
 testDecode('gb18030', '%A3%A0', 'U+3000');
 testDecode('EUC-CN', '%A3%A0', 'U+3000');
 
+// Test Shift_JIS aliases.
+testDecode('Shift_JIS', '%82%d0', 'U+3072');
+testDecode('shift-jis', '%82%d0', 'U+3072');
+
 // Test that all Korean encodings of EUC-KR family are treated as windows-949.
 var korean = {
     encodings: ['korean', 'EUC-KR', 'windows-949', 'x-windows-949', 'x-uhc',
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 69554b1..89c735b 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,12 @@
+2010-08-05  Alexey Proskuryakov  <ap at apple.com>
+
+        Fix http/tests/webarchive/test-css-url-encoding-shift-jis.html
+
+        For some reason, I didn't see the failure locally, but bots complain.
+
+        * platform/text/TextCodecICU.cpp: (WebCore::TextCodecICU::registerExtendedEncodingNames):
+        Register "shift-jis" (with dash instead of underscore). At least Firefox supports it.
+
 2010-08-05  Ben Murdoch  <benm at google.com>
 
         Reviewed by Simon Fraser.
diff --git a/WebCore/platform/text/TextCodecICU.cpp b/WebCore/platform/text/TextCodecICU.cpp
index 07bc4c8..5f9f8c5 100644
--- a/WebCore/platform/text/TextCodecICU.cpp
+++ b/WebCore/platform/text/TextCodecICU.cpp
@@ -164,6 +164,7 @@ void TextCodecICU::registerExtendedEncodingNames(EncodingNameRegistrar registrar
     registrar("x-windows-949", "windows-949");
     registrar("x-uhc", "windows-949");
     registrar("utf8", "UTF-8");
+    registrar("shift-jis", "Shift_JIS");
 
     // These aliases are present in modern versions of ICU, but use different codecs, and have no standard names.
     // They are not present in ICU 3.2.

-- 
WebKit Debian packaging