Changeset 190876 in webkit
- Timestamp:
- Oct 12, 2015 12:00:47 PM (9 years ago)
- Location:
- trunk
- Files:
-
- 6 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/LayoutTests/ChangeLog
r190874 r190876 1 2015-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 1 11 2015-10-12 Brent Fulgham <bfulgham@apple.com> 2 12 -
trunk/LayoutTests/css3/font-feature-settings-rendering-expected.html
r190848 r190876 17 17 designed specifically for this purpose. The test passes if you see a sequence of alternating check 18 18 marks and X below. 19 <div style="font-family: FontWithFeaturesOTF;">AB</div> 20 <div style="font-family: FontWithFeaturesTTF;">AB</div> 19 21 <div><span style="font-family: FontFeaturesTestOTF;">BA</span> 20 22 <span style="font-family: FontFeaturesTestOTF;">BA</span> -
trunk/LayoutTests/css3/font-feature-settings-rendering.html
r190848 r190876 17 17 designed specifically for this purpose. The test passes if you see a sequence of alternating check 18 18 marks and X below. 19 <div style="font-family: FontFeaturesTestOTF;">AB</div> 20 <div style="font-family: FontFeaturesTestTTF;">AB</div> 19 21 <div id="insertionPoint"></div> 20 22 <div id="insertionPoint2"></div> -
trunk/LayoutTests/platform/mac/TestExpectations
r190858 r190876 259 259 fast/css/draggable-region-parser.html 260 260 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. 262 webkit.org/b/149246 [ Mavericks ] css3/font-feature-settings-rendering.html [ ImageOnlyFailure ] 263 webkit.org/b/149246 [ Mavericks ] css3/font-variant-all.html [ ImageOnlyFailure ] 263 264 264 265 # This feature is disabled on Mavericks. -
trunk/Source/WebCore/ChangeLog
r190859 r190876 1 2015-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 1 14 2015-10-09 Anders Carlsson <andersca@apple.com> 2 15 -
trunk/Source/WebCore/platform/graphics/cocoa/FontCacheCoreText.cpp
r190841 r190876 596 596 597 597 #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)598 static RetainPtr<CTFontRef> platformFontLookupWithFamily(const AtomicString& family, CTFontSymbolicTraits requestedTraits, FontWeight weight, float size) 599 599 { 600 600 const auto& whitelist = fontWhitelist(); … … 602 602 return nullptr; 603 603 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)); 606 605 } 607 606 #endif … … 614 613 return specialCase; 615 614 #if ENABLE(PLATFORM_FONT_LOOKUP) 616 return platformFontLookupWithFamily(family, desiredTraits, weight, featureSettings, variantSettings, textRenderingMode, size);615 RetainPtr<CTFontRef> foundFont = platformFontLookupWithFamily(family, desiredTraits, weight, size); 617 616 #else 618 617 UNUSED_PARAM(featureSettings); 619 618 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); 622 622 } 623 623
Note: See TracChangeset
for help on using the changeset viewer.