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

[commit-queue at webkit.org]

The following commit has been merged in the debian/experimental branch:
commit a2666939c9312f1324e53183571cc5eb737dcff2
Author: commit-queue at webkit.org <commit-queue at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Oct 21 11:26:01 2010 +0000

    2010-10-21  Carlos Garcia Campos  <cgarcia at igalia.com>
    
            Reviewed by Martin Robinson.
    
            [GTK] Tests LayoutTests/fast/encoding/utf-32* fail when using glib unicode
            https://bugs.webkit.org/show_bug.cgi?id=47805
    
            Register UTF-32 encodings in TextCodecGtk.
    
            * platform/text/gtk/TextCodecGtk.cpp:
            (WebCore::TextCodecGtk::registerBaseEncodingNames):
            (WebCore::TextCodecGtk::registerBaseCodecs):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@70227 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index de28b31..95d8c15 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,16 @@
+2010-10-21  Carlos Garcia Campos  <cgarcia at igalia.com>
+
+        Reviewed by Martin Robinson.
+
+        [GTK] Tests LayoutTests/fast/encoding/utf-32* fail when using glib unicode
+        https://bugs.webkit.org/show_bug.cgi?id=47805
+
+        Register UTF-32 encodings in TextCodecGtk.
+
+        * platform/text/gtk/TextCodecGtk.cpp:
+        (WebCore::TextCodecGtk::registerBaseEncodingNames):
+        (WebCore::TextCodecGtk::registerBaseCodecs):
+
 2010-10-21  Luiz Agostini  <luiz.agostini at openbossa.org>
 
         Reviewed by Darin Adler.
diff --git a/WebCore/platform/text/gtk/TextCodecGtk.cpp b/WebCore/platform/text/gtk/TextCodecGtk.cpp
index 4dadcf2..5fa38e2 100644
--- a/WebCore/platform/text/gtk/TextCodecGtk.cpp
+++ b/WebCore/platform/text/gtk/TextCodecGtk.cpp
@@ -105,6 +105,9 @@ void TextCodecGtk::registerBaseEncodingNames(EncodingNameRegistrar registrar)
 {
     // Unicode
     registerEncodingNameIfAvailable(registrar, "UTF-8");
+    registerEncodingNameIfAvailable(registrar, "UTF-32");
+    registerEncodingNameIfAvailable(registrar, "UTF-32BE");
+    registerEncodingNameIfAvailable(registrar, "UTF-32LE");
 
     // Western
     if (registerEncodingNameIfAvailable(registrar, "ISO-8859-1")) {
@@ -124,6 +127,9 @@ void TextCodecGtk::registerBaseCodecs(TextCodecRegistrar registrar)
 {
     // Unicode
     registerCodecIfAvailable(registrar, "UTF-8");
+    registerCodecIfAvailable(registrar, "UTF-32");
+    registerCodecIfAvailable(registrar, "UTF-32BE");
+    registerCodecIfAvailable(registrar, "UTF-32LE");
 
     // Western
     registerCodecIfAvailable(registrar, "ISO-8859-1");

-- 
WebKit Debian packaging