Reviewed by Sam Weinig.

        - fix <rdar://problem/5315265> REGRESSION: Leopard launch time -
          there are about 190 stats of icudt36b files during launch

        * platform/TextEncodingRegistry.cpp: (WebCore::atomicCanonicalTextEncodingName):
        Add a special case for the empty string so we don't load the extended text
        encodings just so we can return 0 for that case.

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@24203 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 73def29..29c2da1 100644 (file)
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,14 @@
+2007-07-11  Darin Adler  <darin@apple.com>
+
+        Reviewed by Sam Weinig.
+
+        - fix <rdar://problem/5315265> REGRESSION: Leopard launch time -
+          there are about 190 stats of icudt36b files during launch
+
+        * platform/TextEncodingRegistry.cpp: (WebCore::atomicCanonicalTextEncodingName):
+        Add a special case for the empty string so we don't load the extended text
+        encodings just so we can return 0 for that case.
+
 2007-07-11  Anders Carlsson  <andersca@apple.com>
 
         Reviewed by Darin.

diff --git a/WebCore/platform/TextEncodingRegistry.cpp b/WebCore/platform/TextEncodingRegistry.cpp
index f19e18d..b59b755 100644 (file)
--- a/WebCore/platform/TextEncodingRegistry.cpp
+++ b/WebCore/platform/TextEncodingRegistry.cpp
@@ -199,7 +199,7 @@ std::auto_ptr<TextCodec> newTextCodec(const TextEncoding& encoding)
 
 const char* atomicCanonicalTextEncodingName(const char* name)
 {
-    if (!name)
+    if (!name || !name[0])
         return 0;
     if (!textEncodingNameMap)
         buildBaseTextCodecMaps();