Title: [181740] tags/Safari-601.1.23.3/Source/WebCore
- Revision
- 181740
- Author
- [email protected]
- Date
- 2015-03-19 01:55:00 -0700 (Thu, 19 Mar 2015)
Log Message
Merged r181703. rdar://problem/19446938
Modified Paths
Diff
Modified: tags/Safari-601.1.23.3/Source/WebCore/ChangeLog (181739 => 181740)
--- tags/Safari-601.1.23.3/Source/WebCore/ChangeLog 2015-03-19 08:53:24 UTC (rev 181739)
+++ tags/Safari-601.1.23.3/Source/WebCore/ChangeLog 2015-03-19 08:55:00 UTC (rev 181740)
@@ -1,5 +1,22 @@
2015-03-19 Babak Shafiei <[email protected]>
+ Merge r181703.
+
+ 2015-03-18 Myles C. Maxfield <[email protected]>
+
+ 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 <[email protected]>
+
Merge r181666.
2015-03-17 Jeremy Jones <[email protected]>
Modified: tags/Safari-601.1.23.3/Source/WebCore/platform/graphics/cocoa/FontCascadeCocoa.mm (181739 => 181740)
--- tags/Safari-601.1.23.3/Source/WebCore/platform/graphics/cocoa/FontCascadeCocoa.mm 2015-03-19 08:53:24 UTC (rev 181739)
+++ tags/Safari-601.1.23.3/Source/WebCore/platform/graphics/cocoa/FontCascadeCocoa.mm 2015-03-19 08:55:00 UTC (rev 181740)
@@ -161,18 +161,24 @@
position.x += advances[i].width;
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);
}
}
Modified: tags/Safari-601.1.23.3/Source/WebCore/platform/spi/cocoa/CoreTextSPI.h (181739 => 181740)
--- tags/Safari-601.1.23.3/Source/WebCore/platform/spi/cocoa/CoreTextSPI.h 2015-03-19 08:53:24 UTC (rev 181739)
+++ tags/Safari-601.1.23.3/Source/WebCore/platform/spi/cocoa/CoreTextSPI.h 2015-03-19 08:55:00 UTC (rev 181740)
@@ -65,6 +65,9 @@
CTLineRef CTLineCreateWithUniCharProvider(CTUniCharProviderCallback provide, CTUniCharDisposeCallback dispose, void* refCon);
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);
CTFontDescriptorRef CTFontDescriptorCreateWithTextStyle(CFStringRef style, CFStringRef size, CFStringRef language);
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
