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

[kov at webkit.org]

The following commit has been merged in the webkit-1.2 branch:
commit ca17dfbe059738a6d375bfac4e638397c1160d86
Author: kov at webkit.org <kov at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Sun Dec 20 10:46:33 2009 +0000

    Rubber-stamped by Xan Lopez.
    
    Make sure the text encoding machinery is initialized from the main
    frame, before opening the icon database.
    
    * webkit/webkitprivate.cpp:
    (webkit_init):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@52411 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/gtk/ChangeLog b/WebKit/gtk/ChangeLog
index bf04832..14dfa9d 100644
--- a/WebKit/gtk/ChangeLog
+++ b/WebKit/gtk/ChangeLog
@@ -1,3 +1,13 @@
+2009-12-20  Gustavo Noronha Silva  <gustavo.noronha at collabora.co.uk>
+
+        Rubber-stamped by Xan Lopez.
+
+        Make sure the text encoding machinery is initialized from the main
+        frame, before opening the icon database.
+
+        * webkit/webkitprivate.cpp:
+        (webkit_init):
+
 2009-12-19  Alejandro G. Castro  <alex at igalia.com>
 
         Reviewed by Xan Lopez.
diff --git a/WebKit/gtk/webkit/webkitprivate.cpp b/WebKit/gtk/webkit/webkitprivate.cpp
index 7b613ba..a75bf9a 100644
--- a/WebKit/gtk/webkit/webkitprivate.cpp
+++ b/WebKit/gtk/webkit/webkitprivate.cpp
@@ -43,6 +43,7 @@
 #include <runtime/InitializeThreading.h>
 #include "SecurityOrigin.h"
 #include <stdlib.h>
+#include "TextEncodingRegistry.h"
 #include "webkitnetworkresponse.h"
 
 #if ENABLE(DATABASE)
@@ -246,6 +247,10 @@ void webkit_init()
     JSC::initializeThreading();
     WebCore::InitializeLoggingChannelsIfNecessary();
 
+    // We make sure the text codecs have been initialized, because
+    // that may only be done by the main thread.
+    atomicCanonicalTextEncodingName("UTF-8");
+
     // Page cache capacity (in pages). Comment from Mac port:
     // (Research indicates that value / page drops substantially after 3 pages.)
     // FIXME: Expose this with an API and/or calculate based on available resources

-- 
WebKit Debian packaging