[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 97ac2164a0dc91ede783278f33a0af1f20431cbd
Author: ap at apple.com <ap at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Aug 6 11:23:29 2010 +0000

            Fix crashing Leopard and Gtk bots.
    
            * platform/text/TextCodecICU.cpp: (WebCore::TextCodecICU::registerExtendedEncodingNames):
            Don't register ISO8859-16, because older versions of ICU don't support ISO-8859-16, causing
            crashes when we try to register an alias. Also, we don't need it, because Firefox doesn't
            support this particular alias (it supports ISO8859-1 to ISO8859-15, but only supports the
            main name for ISO-8859-16).
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@64831 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index d8926a5..a89306a 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,13 @@
+2010-08-06  Alexey Proskuryakov  <ap at apple.com>
+
+        Fix crashing Leopard and Gtk bots.
+
+        * platform/text/TextCodecICU.cpp: (WebCore::TextCodecICU::registerExtendedEncodingNames):
+        Don't register ISO8859-16, because older versions of ICU don't support ISO-8859-16, causing
+        crashes when we try to register an alias. Also, we don't need it, because Firefox doesn't
+        support this particular alias (it supports ISO8859-1 to ISO8859-15, but only supports the
+        main name for ISO-8859-16).
+
 2010-08-06  Nikolas Zimmermann  <nzimmermann at rim.com>
 
         Reviewed by Dirk Schulze.
diff --git a/WebCore/platform/text/TextCodecICU.cpp b/WebCore/platform/text/TextCodecICU.cpp
index 5f9f8c5..6a579f9 100644
--- a/WebCore/platform/text/TextCodecICU.cpp
+++ b/WebCore/platform/text/TextCodecICU.cpp
@@ -186,7 +186,8 @@ void TextCodecICU::registerExtendedEncodingNames(EncodingNameRegistrar registrar
     registrar("ISO8859-13", "ISO-8859-13");
     registrar("ISO8859-14", "ISO-8859-14");
     registrar("ISO8859-15", "ISO-8859-15");
-    registrar("ISO8859-16", "ISO-8859-16");
+    // Not registering ISO8859-16, because Firefox (as of version 3.6.6) doesn't know this particular alias,
+    // and because older versions of ICU don't support ISO-8859-16 encoding at all.
 }
 
 void TextCodecICU::registerExtendedCodecs(TextCodecRegistrar registrar)

-- 
WebKit Debian packaging