Remove unused ARMv6-specific #if branches in WebCore::canHyphenate

https://bugs.webkit.org/show_bug.cgi?id=136420

Reviewed by Dan Bernstein.

* platform/text/cf/HyphenationCF.cpp:
(WebCore::AtomicStringKeyedMRUCache<RetainPtr<CFLocaleRef>>::createValueForNullKey):
Use kCFAllocatorDefault instead of 0.

(WebCore::canHyphenate):
Remove ARMv6-specific code.

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

diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
index 3e86d15316818e388a4bfc12bb48a03c150de951..0f51e42f5c449a9b30ca23d3f40244019f2fcfc8 100644 (file)
--- a/Source/WebCore/ChangeLog
+++ b/Source/WebCore/ChangeLog
@@ -1,3 +1,17 @@
+2014-08-31  Tim Horton  <timothy_horton@apple.com>
+
+        Remove unused ARMv6-specific #if branches in WebCore::canHyphenate
+        https://bugs.webkit.org/show_bug.cgi?id=136420
+
+        Reviewed by Dan Bernstein.
+
+        * platform/text/cf/HyphenationCF.cpp:
+        (WebCore::AtomicStringKeyedMRUCache<RetainPtr<CFLocaleRef>>::createValueForNullKey):
+        Use kCFAllocatorDefault instead of 0.
+
+        (WebCore::canHyphenate):
+        Remove ARMv6-specific code.
+
 2014-08-31  Tim Horton  <timothy_horton@apple.com>
 
         Remove unnecessary (and unnecessarily iOS-specific) setStrokeAndFillColor

diff --git a/Source/WebCore/platform/text/cf/HyphenationCF.cpp b/Source/WebCore/platform/text/cf/HyphenationCF.cpp
index a344bd85336e4947e30ff7e472bb5a52192b1622..40b8be9adb3107a11b76e7f3d7624d74ad805b01 100644 (file)
--- a/Source/WebCore/platform/text/cf/HyphenationCF.cpp
+++ b/Source/WebCore/platform/text/cf/HyphenationCF.cpp
@@ -40,7 +40,7 @@ RetainPtr<CFLocaleRef> AtomicStringKeyedMRUCache<RetainPtr<CFLocaleRef>>::create
 {
     // CF hyphenation functions use locale (regional formats) language, which doesn't necessarily match primary UI language,
     // so we can't use default locale here. See <rdar://problem/14897664>.
-    RetainPtr<CFLocaleRef> locale = adoptCF(CFLocaleCreate(0, defaultLanguage().createCFString().get()));
+    RetainPtr<CFLocaleRef> locale = adoptCF(CFLocaleCreate(kCFAllocatorDefault, defaultLanguage().createCFString().get()));
 
     return CFStringIsHyphenationAvailableForLocale(locale.get()) ? locale : 0;
 }
@@ -61,17 +61,7 @@ static AtomicStringKeyedMRUCache<RetainPtr<CFLocaleRef>>& cfLocaleCache()
 
 bool canHyphenate(const AtomicString& localeIdentifier)
 {
-#if !PLATFORM(IOS)
     return cfLocaleCache().get(localeIdentifier);
-#else
-#if !(defined(WTF_ARM_ARCH_VERSION) && WTF_ARM_ARCH_VERSION == 6)
-    return cfLocaleCache().get(localeIdentifier);
-#else
-    // Hyphenation is not available on devices with ARMv6 processors. See <rdar://8352570>.
-    UNUSED_PARAM(localeIdentifier);
-    return false;
-#endif
-#endif // PLATFORM(IOS)
 }
 
 size_t lastHyphenLocation(StringView text, size_t beforeIndex, const AtomicString& localeIdentifier)