Changeset 190876 in webkit


Ignore:
Timestamp:
Oct 12, 2015 12:00:47 PM (9 years ago)
Author:
mmaxfield@apple.com
Message:

Test font-variant-* and font-feature-settings on Yosemite and Mavericks
​https://bugs.webkit.org/show_bug.cgi?id=149778

Reviewed by Simon Fraser.

Source/WebCore:

We can simply call the function which enables features on Yosemite and Mavericks.

  • platform/graphics/cocoa/FontCacheCoreText.cpp:

(WebCore::platformFontLookupWithFamily):
(WebCore::fontWithFamily):

LayoutTests:

  • platform/mac-wk1/TestExpectations:
  • platform/mac/TestExpectations:
Location:
trunk
Files:
6 edited

Legend:

Unmodified
Added
Removed

  • trunk/LayoutTests/ChangeLog

    r190874 r190876  
     12015-10-12  Myles C. Maxfield  <mmaxfield@apple.com>
     2
     3        Test font-variant-* and font-feature-settings on Yosemite and Mavericks
     4        https://bugs.webkit.org/show_bug.cgi?id=149778
     5
     6        Reviewed by Simon Fraser.
     7
     8        * platform/mac-wk1/TestExpectations:
     9        * platform/mac/TestExpectations:
     10
    1112015-10-12  Brent Fulgham  <bfulgham@apple.com>
    212

  • trunk/LayoutTests/css3/font-feature-settings-rendering-expected.html

    r190848 r190876  
    1717designed specifically for this purpose. The test passes if you see a sequence of alternating check
    1818marks and X below.
     19<div style="font-family: FontWithFeaturesOTF;">AB</div>
     20<div style="font-family: FontWithFeaturesTTF;">AB</div>
    1921<div><span style="font-family: FontFeaturesTestOTF;">BA</span>
    2022<span style="font-family: FontFeaturesTestOTF;">BA</span>

  • trunk/LayoutTests/css3/font-feature-settings-rendering.html

    r190848 r190876  
    1717designed specifically for this purpose. The test passes if you see a sequence of alternating check
    1818marks and X below.
     19<div style="font-family: FontFeaturesTestOTF;">AB</div>
     20<div style="font-family: FontFeaturesTestTTF;">AB</div>
    1921<div id="insertionPoint"></div>
    2022<div id="insertionPoint2"></div>

  • trunk/LayoutTests/platform/mac/TestExpectations

    r190858 r190876  
    259259fast/css/draggable-region-parser.html
    260260
    261 webkit.org/b/149246 [ Mavericks Yosemite ] css3/font-feature-settings-rendering.html [ ImageOnlyFailure ]
    262 webkit.org/b/149246 [ Mavericks Yosemite ] css3/font-variant-all.html [ ImageOnlyFailure ]
     261# Font features are not implemented on Mavericks.
     262webkit.org/b/149246 [ Mavericks ] css3/font-feature-settings-rendering.html [ ImageOnlyFailure ]
     263webkit.org/b/149246 [ Mavericks ] css3/font-variant-all.html [ ImageOnlyFailure ]
    263264
    264265# This feature is disabled on Mavericks.

  • trunk/Source/WebCore/ChangeLog

    r190859 r190876  
     12015-10-12  Myles C. Maxfield  <mmaxfield@apple.com>
     2
     3        Test font-variant-* and font-feature-settings on Yosemite and Mavericks
     4        https://bugs.webkit.org/show_bug.cgi?id=149778
     5
     6        Reviewed by Simon Fraser.
     7
     8        We can simply call the function which enables features on Yosemite and Mavericks.
     9
     10        * platform/graphics/cocoa/FontCacheCoreText.cpp:
     11        (WebCore::platformFontLookupWithFamily):
     12        (WebCore::fontWithFamily):
     13
    1142015-10-09  Anders Carlsson  <andersca@apple.com>
    215

  • trunk/Source/WebCore/platform/graphics/cocoa/FontCacheCoreText.cpp

    r190841 r190876  
    596596
    597597#if ENABLE(PLATFORM_FONT_LOOKUP)
    598 static RetainPtr<CTFontRef> platformFontLookupWithFamily(const AtomicString& family, CTFontSymbolicTraits requestedTraits, FontWeight weight, const FontFeatureSettings& featureSettings, const FontVariantSettings& variantSettings, TextRenderingMode textRenderingMode, float size)
     598static RetainPtr<CTFontRef> platformFontLookupWithFamily(const AtomicString& family, CTFontSymbolicTraits requestedTraits, FontWeight weight, float size)
    599599{
    600600    const auto& whitelist = fontWhitelist();
    … …  
    602602        return nullptr;
    603603
    604     auto foundFont = adoptCF(CTFontCreateForCSS(family.string().createCFString().get(), toCoreTextFontWeight(weight), requestedTraits, size));
    605     return preparePlatformFont(foundFont.get(), textRenderingMode, featureSettings, variantSettings);
     604    return adoptCF(CTFontCreateForCSS(family.string().createCFString().get(), toCoreTextFontWeight(weight), requestedTraits, size));
    606605}
    607606#endif
    … …  
    614613        return specialCase;
    615614#if ENABLE(PLATFORM_FONT_LOOKUP)
    616     return platformFontLookupWithFamily(family, desiredTraits, weight, featureSettings, variantSettings, textRenderingMode, size);
     615    RetainPtr<CTFontRef> foundFont = platformFontLookupWithFamily(family, desiredTraits, weight, size);
    617616#else
    618617    UNUSED_PARAM(featureSettings);
    619618    UNUSED_PARAM(variantSettings);
    620     return platformFontWithFamily(family, desiredTraits, weight, textRenderingMode, size);
    621 #endif
     619    RetainPtr<CTFontRef> foundFont = platformFontWithFamily(family, desiredTraits, weight, textRenderingMode, size);
     620#endif
     621    return preparePlatformFont(foundFont.get(), textRenderingMode, featureSettings, variantSettings);
    622622}
    623623
Note: See TracChangeset for help on using the changeset viewer.