From 5b188acd90d5a2aec51f627acc9c67a508713b49 Mon Sep 17 00:00:00 2001
From: "timothy_horton@apple.com"
 <timothy_horton@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Mon, 1 Sep 2014 01:11:20 +0000
Subject: [PATCH] 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
---
 Source/WebCore/ChangeLog                          | 14 ++++++++++++++
 Source/WebCore/platform/text/cf/HyphenationCF.cpp | 12 +-----------
 2 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
index 3e86d1531681..0f51e42f5c44 100644
--- 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 a344bd85336e..40b8be9adb31 100644
--- 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)
-- 
2.36.0