Changeset 193930 in webkit

Timestamp:

Dec 10, 2015, 3:39:52 PM (10 years ago)

Author:

mmaxfield@apple.com

Message:

Build fix

Unreviewed.

Source/WebCore:

• platform/graphics/cocoa/FontCocoa.mm:

(WebCore::Font::variantCapsSupportsCharacterForSynthesis):

LayoutTests:

• platform/mac/TestExpectations:

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/platform/mac/TestExpectations (modified) (1 diff)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/platform/graphics/cocoa/FontCocoa.mm (modified) (2 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2015-12-10  Myles C. Maxfield  <mmaxfield@apple.com>
+
+        Build fix
+
+        Unreviewed.
+
+        * platform/mac/TestExpectations:
+
 2015-12-10  Ryan Haddad  <ryanhaddad@apple.com>
 

trunk/LayoutTests/platform/mac/TestExpectations

@@ -1293 +1293 @@
 [ Yosemite ElCapitan ] css3/font-variant-small-caps-synthesis-coverage.html [ ImageOnlyFailure ]
 [ Yosemite ElCapitan ] css3/font-variant-petite-caps-synthesis-coverage.html [ ImageOnlyFailure ]
+
+# Temporarily disable font feature synthesis tests.
+[ Yosemite ElCapitan ] css3/font-variant-small-caps-synthesis.html [ ImageOnlyFailure ]
+[ Yosemite ElCapitan ] css3/font-variant-petite-caps-synthesis.html [ ImageOnlyFailure ]

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2015-12-10  Myles C. Maxfield  <mmaxfield@apple.com>
+
+        Build fix
+
+        Unreviewed.
+
+        * platform/graphics/cocoa/FontCocoa.mm:
+        (WebCore::Font::variantCapsSupportsCharacterForSynthesis):
+
 2015-12-10  Zalan Bujtas  <zalan@apple.com>
 

trunk/Source/WebCore/platform/graphics/cocoa/FontCocoa.mm

@@ -285 +285 @@
 bool Font::variantCapsSupportsCharacterForSynthesis(FontVariantCaps fontVariantCaps, UChar32 character) const
 {
-#if (PLATFORM(IOS) && TARGET_OS_IOS && __IPHONE_OS_VERSION_MIN_REQUIRED >= 90300) || (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101100 && __MAC_OS_X_VERSION_MAX_ALLOWED >= 101104)
+#if (PLATFORM(IOS) && TARGET_OS_IOS && __IPHONE_OS_VERSION_MIN_REQUIRED >= 100000) || (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101200)
     Glyph glyph = glyphForCharacter(character);
     if (!glyph)
@@ -327 +327 @@
 }
 
-#if (PLATFORM(IOS) && TARGET_OS_IOS && __IPHONE_OS_VERSION_MIN_REQUIRED >= 90300) || (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101100 && __MAC_OS_X_VERSION_MAX_ALLOWED >= 101104)
+#if (PLATFORM(IOS) && TARGET_OS_IOS && __IPHONE_OS_VERSION_MIN_REQUIRED >= 100000) || (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101200)
 static RetainPtr<CFDictionaryRef> smallCapsOpenTypeDictionary(CFStringRef key, int rawValue)
 {