[SCM] WebKit Debian packaging branch, debian/experimental, updated. debian/1.3.8-1-1049-g2e11a8e

[mitz at apple.com]

The following commit has been merged in the debian/experimental branch:
commit 4e79757aab5a07e384248d47e4c0a37e93f3bbcd
Author: mitz at apple.com <mitz at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Dec 23 00:13:54 2010 +0000

    2010-12-22  Dan Bernstein  <mitz at apple.com>
    
            Reviewed by Anders Carlsson.
    
            canHyphenate() always returns true for the default locale
            https://bugs.webkit.org/show_bug.cgi?id=51506
    
            No test, since this change only affects performance.
    
            * platform/text/cf/HyphenationCF.cpp:
            (WebCore::::createValueForNullKey): Return 0 if hyphenation is not supported for the default locale.
            (WebCore::::createValueForKey): Removed whitespace.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@74513 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 3d3d3a0..dc6440f 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,16 @@
+2010-12-22  Dan Bernstein  <mitz at apple.com>
+
+        Reviewed by Anders Carlsson.
+
+        canHyphenate() always returns true for the default locale
+        https://bugs.webkit.org/show_bug.cgi?id=51506
+
+        No test, since this change only affects performance.
+
+        * platform/text/cf/HyphenationCF.cpp:
+        (WebCore::::createValueForNullKey): Return 0 if hyphenation is not supported for the default locale.
+        (WebCore::::createValueForKey): Removed whitespace.
+
 2010-12-22  Yury Semikhatsky  <yurys at chromium.org>
 
         Reviewed by Joseph Pecoraro.
diff --git a/WebCore/platform/text/cf/HyphenationCF.cpp b/WebCore/platform/text/cf/HyphenationCF.cpp
index dbc11ae..0866cfd 100644
--- a/WebCore/platform/text/cf/HyphenationCF.cpp
+++ b/WebCore/platform/text/cf/HyphenationCF.cpp
@@ -72,7 +72,8 @@ RetainPtr<CFLocaleRef> AtomicStringKeyedMRUCache<RetainPtr<CFLocaleRef> >::creat
 {
     RetainPtr<CFStringRef> cfLocaleIdentifier(AdoptCF, CFStringCreateWithBytesNoCopy(kCFAllocatorDefault, reinterpret_cast<const UInt8*>(currentSearchLocaleID()), strlen(currentSearchLocaleID()), kCFStringEncodingASCII, false, kCFAllocatorNull));
     RetainPtr<CFLocaleRef> locale(AdoptCF, CFLocaleCreate(kCFAllocatorDefault, cfLocaleIdentifier.get()));
-    return locale;
+
+    return CFStringIsHyphenationAvailableForLocale(locale.get()) ? locale : 0;
 }
 
 template<>
@@ -80,7 +81,7 @@ RetainPtr<CFLocaleRef> AtomicStringKeyedMRUCache<RetainPtr<CFLocaleRef> >::creat
 {
     RetainPtr<CFStringRef> cfLocaleIdentifier(AdoptCF, localeIdentifier.createCFString());
     RetainPtr<CFLocaleRef> locale(AdoptCF, CFLocaleCreate(kCFAllocatorDefault, cfLocaleIdentifier.get()));
-    
+
     return CFStringIsHyphenationAvailableForLocale(locale.get()) ? locale : 0;
 }
 

-- 
WebKit Debian packaging