Title: [173151] trunk/Source/WebCore
- Revision
- 173151
- Author
- [email protected]
- Date
- 2014-08-31 18:11:20 -0700 (Sun, 31 Aug 2014)
Log Message
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.
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (173150 => 173151)
--- trunk/Source/WebCore/ChangeLog 2014-08-31 22:06:29 UTC (rev 173150)
+++ trunk/Source/WebCore/ChangeLog 2014-09-01 01:11:20 UTC (rev 173151)
@@ -1,5 +1,19 @@
2014-08-31 Tim Horton <[email protected]>
+ 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 <[email protected]>
+
Remove unnecessary (and unnecessarily iOS-specific) setStrokeAndFillColor
https://bugs.webkit.org/show_bug.cgi?id=136416
Modified: trunk/Source/WebCore/platform/text/cf/HyphenationCF.cpp (173150 => 173151)
--- trunk/Source/WebCore/platform/text/cf/HyphenationCF.cpp 2014-08-31 22:06:29 UTC (rev 173150)
+++ trunk/Source/WebCore/platform/text/cf/HyphenationCF.cpp 2014-09-01 01:11:20 UTC (rev 173151)
@@ -40,7 +40,7 @@
{
// 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 @@
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)
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
