Changeset 232784 in webkit

Timestamp:

Jun 12, 2018 5:37:48 PM (6 years ago)

Author:

Ryan Haddad

Message:

Unreviewed, rolling out r232774.

Breaks internal builds.

Reverted changeset:

"Complex text handling should opt out of bounded text layout."
​https://bugs.webkit.org/show_bug.cgi?id=186571
​https://trac.webkit.org/changeset/232774

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/text/complex-long-text-crash-expected.txt (deleted)
• LayoutTests/fast/text/complex-long-text-crash.html (deleted)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/platform/graphics/mac/ComplexTextControllerCoreText.mm (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2018-06-12  Ryan Haddad  <ryanhaddad@apple.com>
+
+        Unreviewed, rolling out r232774.
+
+        Breaks internal builds.
+
+        Reverted changeset:
+
+        "Complex text handling should opt out of bounded text layout."
+        https://bugs.webkit.org/show_bug.cgi?id=186571
+        https://trac.webkit.org/changeset/232774
+
 2018-06-07  Justin Fan  <justin_fan@apple.com>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2018-06-12  Ryan Haddad  <ryanhaddad@apple.com>
+
+        Unreviewed, rolling out r232774.
+
+        Breaks internal builds.
+
+        Reverted changeset:
+
+        "Complex text handling should opt out of bounded text layout."
+        https://bugs.webkit.org/show_bug.cgi?id=186571
+        https://trac.webkit.org/changeset/232774
+
 2018-06-12  Ryosuke Niwa  <rniwa@webkit.org>
 

trunk/Source/WebCore/platform/graphics/mac/ComplexTextControllerCoreText.mm

@@ -143 +143 @@
 
     if (!m_mayUseNaturalWritingDirection || m_run.directionalOverride()) {
+        static const void* optionKeys[] = { kCTTypesetterOptionForcedEmbeddingLevel };
         const short ltrForcedEmbeddingLevelValue = 0;
         const short rtlForcedEmbeddingLevelValue = 1;
-#if (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101400) || (PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 120000) || PLATFORM(WATCHOS)
-        static const void* optionKeys[] = { kCTTypesetterOptionForcedEmbeddingLevel, kCTTypesetterOptionAllowUnboundedLayout };
-        static const void* ltrOptionValues[] = { CFNumberCreate(kCFAllocatorDefault, kCFNumberShortType, &ltrForcedEmbeddingLevelValue), kCFBooleanTrue };
-        static const void* rtlOptionValues[] = { CFNumberCreate(kCFAllocatorDefault, kCFNumberShortType, &rtlForcedEmbeddingLevelValue), kCFBooleanTrue };
-#else
-        static const void* optionKeys[] = { kCTTypesetterOptionForcedEmbeddingLevel };
         static const void* ltrOptionValues[] = { CFNumberCreate(kCFAllocatorDefault, kCFNumberShortType, &ltrForcedEmbeddingLevelValue) };
         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);