Title: [134380] trunk/Source/WebCore
- Revision
- 134380
- Author
- [email protected]
- Date
- 2012-11-13 00:39:00 -0800 (Tue, 13 Nov 2012)
Log Message
Unreviewed attempt to fix the chromium mac-build after r134348.
* platform/graphics/mac/FontMac.mm:
(WebCore::Font::drawGlyphs):
* platform/mac/WebCoreSystemInterface.h:
* platform/mac/WebCoreSystemInterface.mm:
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (134379 => 134380)
--- trunk/Source/WebCore/ChangeLog 2012-11-13 08:34:35 UTC (rev 134379)
+++ trunk/Source/WebCore/ChangeLog 2012-11-13 08:39:00 UTC (rev 134380)
@@ -1,3 +1,12 @@
+2012-11-13 Hayato Ito <[email protected]>
+
+ Unreviewed attempt to fix the chromium mac-build after r134348.
+
+ * platform/graphics/mac/FontMac.mm:
+ (WebCore::Font::drawGlyphs):
+ * platform/mac/WebCoreSystemInterface.h:
+ * platform/mac/WebCoreSystemInterface.mm:
+
2012-11-13 Pavel Feldman <[email protected]>
Web Inspector: migrate text editor to mutation observers
Modified: trunk/Source/WebCore/platform/graphics/mac/FontMac.mm (134379 => 134380)
--- trunk/Source/WebCore/platform/graphics/mac/FontMac.mm 2012-11-13 08:34:35 UTC (rev 134379)
+++ trunk/Source/WebCore/platform/graphics/mac/FontMac.mm 2012-11-13 08:39:00 UTC (rev 134380)
@@ -211,7 +211,11 @@
matrix = CGAffineTransformConcat(matrix, CGAffineTransformMake(1, 0, -tanf(SYNTHETIC_OBLIQUE_ANGLE * acosf(0) / 90), 1, 0, 0));
CGContextSetTextMatrix(cgContext, matrix);
+#if PLATFORM(MAC)
wkSetCGFontRenderingMode(cgContext, drawFont, context->shouldSubpixelQuantizeFonts());
+#else
+ wkSetCGFontRenderingMode(cgContext, drawFont);
+#endif
if (drawFont)
CGContextSetFontSize(cgContext, 1.0f);
else
Modified: trunk/Source/WebCore/platform/mac/WebCoreSystemInterface.h (134379 => 134380)
--- trunk/Source/WebCore/platform/mac/WebCoreSystemInterface.h 2012-11-13 08:34:35 UTC (rev 134379)
+++ trunk/Source/WebCore/platform/mac/WebCoreSystemInterface.h 2012-11-13 08:39:00 UTC (rev 134380)
@@ -192,7 +192,11 @@
extern NSArray *(*wkQTGetSitesInMediaDownloadCache)();
extern void (*wkQTClearMediaDownloadCacheForSite)(NSString *site);
extern void (*wkQTClearMediaDownloadCache)();
+#if PLATFORM(MAC)
extern void (*wkSetCGFontRenderingMode)(CGContextRef, NSFont*, BOOL);
+#else
+extern void (*wkSetCGFontRenderingMode)(CGContextRef, NSFont*);
+#endif
extern void (*wkSetDragImage)(NSImage*, NSPoint offset);
extern void (*wkSetNSURLConnectionDefersCallbacks)(NSURLConnection *, BOOL);
extern void (*wkSetNSURLRequestShouldContentSniff)(NSMutableURLRequest *, BOOL);
Modified: trunk/Source/WebCore/platform/mac/WebCoreSystemInterface.mm (134379 => 134380)
--- trunk/Source/WebCore/platform/mac/WebCoreSystemInterface.mm 2012-11-13 08:34:35 UTC (rev 134379)
+++ trunk/Source/WebCore/platform/mac/WebCoreSystemInterface.mm 2012-11-13 08:39:00 UTC (rev 134380)
@@ -85,7 +85,11 @@
void (*wkQTClearMediaDownloadCacheForSite)(NSString *site);
void (*wkQTClearMediaDownloadCache)();
+#if PLATFORM(MAC)
void (*wkSetCGFontRenderingMode)(CGContextRef, NSFont*, BOOL);
+#else
+void (*wkSetCGFontRenderingMode)(CGContextRef, NSFont*);
+#endif
void (*wkSetDragImage)(NSImage*, NSPoint offset);
void (*wkSetBaseCTM)(CGContextRef, CGAffineTransform);
void (*wkSetPatternPhaseInUserSpace)(CGContextRef, CGPoint point);
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo/webkit-changes
