Changeset 181740 in webkit

Timestamp:

Mar 19, 2015, 1:55:00 AM (11 years ago)

Author:

bshafiei@apple.com

Message:

Merged r181703. rdar://problem/19446938

Location:

tags/Safari-601.1.23.3/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/graphics/cocoa/FontCascadeCocoa.mm (modified) (1 diff)
• platform/spi/cocoa/CoreTextSPI.h (modified) (1 diff)

tags/Safari-601.1.23.3/Source/WebCore/ChangeLog

@@ +1 @@
+2015-03-19  Babak Shafiei  <bshafiei@apple.com>
+
+        Merge r181703.
+
+    2015-03-18  Myles C. Maxfield  <mmaxfield@apple.com>
+
+            Call CTFontSetRenderingParameters before rendering text
+            https://bugs.webkit.org/show_bug.cgi?id=142816
+
+            Reviewed by Darin Adler.
+
+            No new tests.
+
+            * platform/graphics/cocoa/FontCascadeCocoa.mm:
+            (WebCore::showGlyphsWithAdvances):
+            * platform/spi/cocoa/CoreTextSPI.h:
+
 2015-03-19  Babak Shafiei  <bshafiei@apple.com>
 

tags/Safari-601.1.23.3/Source/WebCore/platform/graphics/cocoa/FontCascadeCocoa.mm

@@ -162 +162 @@
             position.y += advances[i].height;
         }
-        if (!platformData.isColorBitmapFont())
+        if (!platformData.isColorBitmapFont()) {
+#if PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED > 101000
+            CTFontSetRenderingParameters(platformData.ctFont(), context);
+#endif
             CGContextShowGlyphsAtPositions(context, glyphs, positions.data(), count);
-        else
+        } else
             CTFontDrawGlyphs(platformData.ctFont(), glyphs, positions.data(), count, context);
         CGContextSetTextMatrix(context, savedMatrix);
     } else {
-        if (!platformData.isColorBitmapFont())
+        if (!platformData.isColorBitmapFont()) {
+#if PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED > 101000
+            CTFontSetRenderingParameters(platformData.ctFont(), context);
+#endif
 #pragma clang diagnostic push
 #pragma clang diagnostic ignored "-Wdeprecated-declarations"
             CGContextShowGlyphsWithAdvances(context, glyphs, advances, count);
 #pragma clang diagnostic pop
-        else
+        } else
             CTFontDrawGlyphs(platformData.ctFont(), glyphs, positions.data(), count, context);
     }

tags/Safari-601.1.23.3/Source/WebCore/platform/spi/cocoa/CoreTextSPI.h

@@ -66 +66 @@
 CTTypesetterRef CTTypesetterCreateWithUniCharProviderAndOptions(CTUniCharProviderCallback provide, CTUniCharDisposeCallback dispose, void* refCon, CFDictionaryRef options);
 bool CTFontGetVerticalGlyphsForCharacters(CTFontRef, const UniChar characters[], CGGlyph glyphs[], CFIndex count);
+#if PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED > 101000
+void CTFontSetRenderingParameters(CTFontRef, CGContextRef);
+#endif
 
 CTFontDescriptorRef CTFontDescriptorCreateForUIType(CTFontUIFontType, CGFloat size, CFStringRef language);