Changeset 232779 in webkit


Ignore:
Timestamp:
Jun 12, 2018 3:10:01 PM (6 years ago)
Author:
Kocsen Chung
Message:

Cherry-pick r232774. rdar://problem/40801429

Complex text handling should opt out of bounded text layout.
​https://bugs.webkit.org/show_bug.cgi?id=186571
<rdar://problem/40801429>

Reviewed by Tim Horton.

Source/WebCore:

Test: fast/text/complex-long-text-crash.html

  • platform/graphics/mac/ComplexTextControllerCoreText.mm: (WebCore::ComplexTextController::collectComplexTextRunsForCharacters):

LayoutTests:

  • fast/text/complex-long-text-crash-expected.txt: Added.
  • fast/text/complex-long-text-crash.html: Added.

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

Location:
branches/safari-606.1.20.40-branch
Files:
2 added
3 edited

Legend:

Unmodified
Added
Removed

  • branches/safari-606.1.20.40-branch/LayoutTests/ChangeLog

    r232631 r232779  
     12018-06-12  Kocsen Chung  <kocsen_chung@apple.com>
     2
     3        Cherry-pick r232774. rdar://problem/40801429
     4
     5    Complex text handling should opt out of bounded text layout.
     6    https://bugs.webkit.org/show_bug.cgi?id=186571
     7    <rdar://problem/40801429>
     8   
     9    Reviewed by Tim Horton.
     10   
     11    Source/WebCore:
     12   
     13    Test: fast/text/complex-long-text-crash.html
     14   
     15    * platform/graphics/mac/ComplexTextControllerCoreText.mm:
     16    (WebCore::ComplexTextController::collectComplexTextRunsForCharacters):
     17   
     18    LayoutTests:
     19   
     20    * fast/text/complex-long-text-crash-expected.txt: Added.
     21    * fast/text/complex-long-text-crash.html: Added.
     22   
     23   
     24    git-svn-id: https://svn.webkit.org/repository/webkit/trunk@232774 268f45cc-cd09-0410-ab3c-d52691b4dbfc
     25
     26    2018-06-12  Zalan Bujtas  <zalan@apple.com>
     27
     28            Complex text handling should opt out of bounded text layout.
     29            https://bugs.webkit.org/show_bug.cgi?id=186571
     30            <rdar://problem/40801429>
     31
     32            Reviewed by Tim Horton.
     33
     34            * fast/text/complex-long-text-crash-expected.txt: Added.
     35            * fast/text/complex-long-text-crash.html: Added.
     36
    1372018-06-08  Kocsen Chung  <kocsen_chung@apple.com>
    238

  • branches/safari-606.1.20.40-branch/Source/WebCore/ChangeLog

    r232769 r232779  
     12018-06-12  Kocsen Chung  <kocsen_chung@apple.com>
     2
     3        Cherry-pick r232774. rdar://problem/40801429
     4
     5    Complex text handling should opt out of bounded text layout.
     6    https://bugs.webkit.org/show_bug.cgi?id=186571
     7    <rdar://problem/40801429>
     8   
     9    Reviewed by Tim Horton.
     10   
     11    Source/WebCore:
     12   
     13    Test: fast/text/complex-long-text-crash.html
     14   
     15    * platform/graphics/mac/ComplexTextControllerCoreText.mm:
     16    (WebCore::ComplexTextController::collectComplexTextRunsForCharacters):
     17   
     18    LayoutTests:
     19   
     20    * fast/text/complex-long-text-crash-expected.txt: Added.
     21    * fast/text/complex-long-text-crash.html: Added.
     22   
     23   
     24    git-svn-id: https://svn.webkit.org/repository/webkit/trunk@232774 268f45cc-cd09-0410-ab3c-d52691b4dbfc
     25
     26    2018-06-12  Zalan Bujtas  <zalan@apple.com>
     27
     28            Complex text handling should opt out of bounded text layout.
     29            https://bugs.webkit.org/show_bug.cgi?id=186571
     30            <rdar://problem/40801429>
     31
     32            Reviewed by Tim Horton.
     33
     34            Test: fast/text/complex-long-text-crash.html
     35
     36            * platform/graphics/mac/ComplexTextControllerCoreText.mm:
     37            (WebCore::ComplexTextController::collectComplexTextRunsForCharacters):
     38
    1392018-06-12  Kocsen Chung  <kocsen_chung@apple.com>
    240

  • branches/safari-606.1.20.40-branch/Source/WebCore/platform/graphics/mac/ComplexTextControllerCoreText.mm

    r232493 r232779  
    143143
    144144    if (!m_mayUseNaturalWritingDirection || m_run.directionalOverride()) {
    145         static const void* optionKeys[] = { kCTTypesetterOptionForcedEmbeddingLevel };
    146145        const short ltrForcedEmbeddingLevelValue = 0;
    147146        const short rtlForcedEmbeddingLevelValue = 1;
     147#if (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101400) || (PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 120000) || PLATFORM(WATCHOS)
     148        static const void* optionKeys[] = { kCTTypesetterOptionForcedEmbeddingLevel, kCTTypesetterOptionAllowUnboundedLayout };
     149        static const void* ltrOptionValues[] = { CFNumberCreate(kCFAllocatorDefault, kCFNumberShortType, &ltrForcedEmbeddingLevelValue), kCFBooleanTrue };
     150        static const void* rtlOptionValues[] = { CFNumberCreate(kCFAllocatorDefault, kCFNumberShortType, &rtlForcedEmbeddingLevelValue), kCFBooleanTrue };
     151#else
     152        static const void* optionKeys[] = { kCTTypesetterOptionForcedEmbeddingLevel };
    148153        static const void* ltrOptionValues[] = { CFNumberCreate(kCFAllocatorDefault, kCFNumberShortType, &ltrForcedEmbeddingLevelValue) };
    149154        static const void* rtlOptionValues[] = { CFNumberCreate(kCFAllocatorDefault, kCFNumberShortType, &rtlForcedEmbeddingLevelValue) };
     155#endif
    150156        static CFDictionaryRef ltrTypesetterOptions = CFDictionaryCreate(kCFAllocatorDefault, optionKeys, ltrOptionValues, WTF_ARRAY_LENGTH(optionKeys), &kCFCopyStringDictionaryKeyCallBacks, &kCFTypeDictionaryValueCallBacks);
    151157        static CFDictionaryRef rtlTypesetterOptions = CFDictionaryCreate(kCFAllocatorDefault, optionKeys, rtlOptionValues, WTF_ARRAY_LENGTH(optionKeys), &kCFCopyStringDictionaryKeyCallBacks, &kCFTypeDictionaryValueCallBacks);
Note: See TracChangeset for help on using the changeset viewer.