Title: [193930] trunk
- Revision
- 193930
- Author
- [email protected]
- Date
- 2015-12-10 15:39:52 -0800 (Thu, 10 Dec 2015)
Log Message
Build fix
Unreviewed.
Source/WebCore:
* platform/graphics/cocoa/FontCocoa.mm:
(WebCore::Font::variantCapsSupportsCharacterForSynthesis):
LayoutTests:
* platform/mac/TestExpectations:
Modified Paths
Diff
Modified: trunk/LayoutTests/ChangeLog (193929 => 193930)
--- trunk/LayoutTests/ChangeLog 2015-12-10 23:30:41 UTC (rev 193929)
+++ trunk/LayoutTests/ChangeLog 2015-12-10 23:39:52 UTC (rev 193930)
@@ -1,3 +1,11 @@
+2015-12-10 Myles C. Maxfield <[email protected]>
+
+ Build fix
+
+ Unreviewed.
+
+ * platform/mac/TestExpectations:
+
2015-12-10 Ryan Haddad <[email protected]>
Adding iOS-simulator expectations for compositing/layers-inside-overflow-scroll.html
Modified: trunk/LayoutTests/platform/mac/TestExpectations (193929 => 193930)
--- trunk/LayoutTests/platform/mac/TestExpectations 2015-12-10 23:30:41 UTC (rev 193929)
+++ trunk/LayoutTests/platform/mac/TestExpectations 2015-12-10 23:39:52 UTC (rev 193930)
@@ -1292,3 +1292,7 @@
# Yosemite and El Capitan do not support font feature coverage queries.
[ 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 ]
Modified: trunk/Source/WebCore/ChangeLog (193929 => 193930)
--- trunk/Source/WebCore/ChangeLog 2015-12-10 23:30:41 UTC (rev 193929)
+++ trunk/Source/WebCore/ChangeLog 2015-12-10 23:39:52 UTC (rev 193930)
@@ -1,3 +1,12 @@
+2015-12-10 Myles C. Maxfield <[email protected]>
+
+ Build fix
+
+ Unreviewed.
+
+ * platform/graphics/cocoa/FontCocoa.mm:
+ (WebCore::Font::variantCapsSupportsCharacterForSynthesis):
+
2015-12-10 Zalan Bujtas <[email protected]>
TextPainter: Add support for painting multiple text runs.
Modified: trunk/Source/WebCore/platform/graphics/cocoa/FontCocoa.mm (193929 => 193930)
--- trunk/Source/WebCore/platform/graphics/cocoa/FontCocoa.mm 2015-12-10 23:30:41 UTC (rev 193929)
+++ trunk/Source/WebCore/platform/graphics/cocoa/FontCocoa.mm 2015-12-10 23:39:52 UTC (rev 193930)
@@ -284,7 +284,7 @@
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)
return false;
@@ -326,7 +326,7 @@
#endif
}
-#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)
{
RetainPtr<CFNumberRef> value = adoptCF(CFNumberCreate(kCFAllocatorDefault, kCFNumberIntType, &rawValue));
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
