Title: [250173] trunk/Source/WebCore
- Revision
- 250173
- Author
- krol...@apple.com
- Date
- 2019-09-20 17:36:06 -0700 (Fri, 20 Sep 2019)
Log Message
Remove dead code for a specific macOS and iOS SDK
https://bugs.webkit.org/show_bug.cgi?id=202054
<rdar://problem/55569619>
Reviewed by Zalan Bujtas.
ComplexTextController::collectComplexTextRunsForCharacters in
ComplexTextControllerCoreText.mm has some code for compatibility with
specifically macOS 10.14.0 and iOS 12.0 (see Bug 186571). We don't
build for these targets any more (when we build for macOS 10.14, it's
for a later minor revision), so this code can be removed.
No new tests -- no new or changed functionality.
* platform/graphics/mac/ComplexTextControllerCoreText.mm:
(WebCore::ComplexTextController::collectComplexTextRunsForCharacters):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (250172 => 250173)
--- trunk/Source/WebCore/ChangeLog 2019-09-21 00:29:13 UTC (rev 250172)
+++ trunk/Source/WebCore/ChangeLog 2019-09-21 00:36:06 UTC (rev 250173)
@@ -1,3 +1,22 @@
+2019-09-20 Keith Rollin <krol...@apple.com>
+
+ Remove dead code for a specific macOS and iOS SDK
+ https://bugs.webkit.org/show_bug.cgi?id=202054
+ <rdar://problem/55569619>
+
+ Reviewed by Zalan Bujtas.
+
+ ComplexTextController::collectComplexTextRunsForCharacters in
+ ComplexTextControllerCoreText.mm has some code for compatibility with
+ specifically macOS 10.14.0 and iOS 12.0 (see Bug 186571). We don't
+ build for these targets any more (when we build for macOS 10.14, it's
+ for a later minor revision), so this code can be removed.
+
+ No new tests -- no new or changed functionality.
+
+ * platform/graphics/mac/ComplexTextControllerCoreText.mm:
+ (WebCore::ComplexTextController::collectComplexTextRunsForCharacters):
+
2019-09-20 Alex Christensen <achristen...@webkit.org>
Remove unnecessary abstractions around WebsiteDataStore
Modified: trunk/Source/WebCore/platform/graphics/mac/ComplexTextControllerCoreText.mm (250172 => 250173)
--- trunk/Source/WebCore/platform/graphics/mac/ComplexTextControllerCoreText.mm 2019-09-21 00:29:13 UTC (rev 250172)
+++ trunk/Source/WebCore/platform/graphics/mac/ComplexTextControllerCoreText.mm 2019-09-21 00:36:06 UTC (rev 250173)
@@ -139,15 +139,9 @@
if (!m_mayUseNaturalWritingDirection || m_run.directionalOverride()) {
const short ltrForcedEmbeddingLevelValue = 0;
const short rtlForcedEmbeddingLevelValue = 1;
-#if (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED == 101400) || (PLATFORM(IOS_FAMILY) && __IPHONE_OS_VERSION_MIN_REQUIRED == 120000)
- static const void* optionKeys[] = { kCTTypesetterOptionForcedEmbeddingLevel, kCTTypesetterOptionAllowUnboundedLayout };
- static const void* ltrOptionValues[] = { CFNumberCreate(kCFAllocatorDefault, kCFNumberShortType, <rForcedEmbeddingLevelValue), kCFBooleanTrue };
- static const void* rtlOptionValues[] = { CFNumberCreate(kCFAllocatorDefault, kCFNumberShortType, &rtlForcedEmbeddingLevelValue), kCFBooleanTrue };
-#else
static const void* optionKeys[] = { kCTTypesetterOptionForcedEmbeddingLevel };
static const void* ltrOptionValues[] = { CFNumberCreate(kCFAllocatorDefault, kCFNumberShortType, <rForcedEmbeddingLevelValue) };
static const void* rtlOptionValues[] = { CFNumberCreate(kCFAllocatorDefault, kCFNumberShortType, &rtlForcedEmbeddingLevelValue) };
-#endif
static CFDictionaryRef ltrTypesetterOptions = CFDictionaryCreate(kCFAllocatorDefault, optionKeys, ltrOptionValues, WTF_ARRAY_LENGTH(optionKeys), &kCFCopyStringDictionaryKeyCallBacks, &kCFTypeDictionaryValueCallBacks);
static CFDictionaryRef rtlTypesetterOptions = CFDictionaryCreate(kCFAllocatorDefault, optionKeys, rtlOptionValues, WTF_ARRAY_LENGTH(optionKeys), &kCFCopyStringDictionaryKeyCallBacks, &kCFTypeDictionaryValueCallBacks);
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes