Changeset 195803 in webkit

Timestamp:

Jan 29, 2016, 12:12:19 AM (10 years ago)

Author:

bshafiei@apple.com

Message:

Merge patch for rdar://problem/24394636.

Location:

branches/safari-601-branch/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/graphics/Font.h (modified) (1 diff)

branches/safari-601-branch/Source/WebCore/ChangeLog

@@ +1 @@
+2016-01-29  Babak Shafiei  <bshafiei@apple.com>
+
+        Merge patch for rdar://problem/24394636.
+
 2016-01-28  Babak Shafiei  <bshafiei@apple.com>
 

branches/safari-601-branch/Source/WebCore/platform/graphics/Font.h

@@ -113 +113 @@
     PassRefPtr<Font> variantFont(const FontDescription& description, FontVariant variant) const
     {
-#if PLATFORM(COCOA)
+#if PLATFORM(COCOA) && (!PLATFORM(MAC) || __MAC_OS_X_VERSION_MIN_REQUIRED >= 101000)
         ASSERT(variant != SmallCapsVariant);
 #endif