Title: [158581] trunk/Source/WebCore
- Revision
- 158581
- Author
- [email protected]
- Date
- 2013-11-04 10:42:21 -0800 (Mon, 04 Nov 2013)
Log Message
Revert SetCGFontRenderingMode() build fix for Chromium Mac
https://bugs.webkit.org/show_bug.cgi?id=123633
Reviewed by Darin Adler.
Reverts <http://trac.webkit.org/changeset/134380>, which
was a Chromium Mac build fix for <http://trac.webkit.org/changeset/134348>
(https://bugs.webkit.org/show_bug.cgi?id=101787). Chromium doesn't
build against top-of-tree WebKit.
* platform/graphics/mac/FontMac.mm:
(WebCore::Font::drawGlyphs):
* platform/mac/WebCoreSystemInterface.h:
* platform/mac/WebCoreSystemInterface.mm:
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (158580 => 158581)
--- trunk/Source/WebCore/ChangeLog 2013-11-04 18:21:37 UTC (rev 158580)
+++ trunk/Source/WebCore/ChangeLog 2013-11-04 18:42:21 UTC (rev 158581)
@@ -1,3 +1,20 @@
+2013-11-04 Daniel Bates <[email protected]>
+
+ Revert SetCGFontRenderingMode() build fix for Chromium Mac
+ https://bugs.webkit.org/show_bug.cgi?id=123633
+
+ Reviewed by Darin Adler.
+
+ Reverts <http://trac.webkit.org/changeset/134380>, which
+ was a Chromium Mac build fix for <http://trac.webkit.org/changeset/134348>
+ (https://bugs.webkit.org/show_bug.cgi?id=101787). Chromium doesn't
+ build against top-of-tree WebKit.
+
+ * platform/graphics/mac/FontMac.mm:
+ (WebCore::Font::drawGlyphs):
+ * platform/mac/WebCoreSystemInterface.h:
+ * platform/mac/WebCoreSystemInterface.mm:
+
2013-11-04 Commit Queue <[email protected]>
Unreviewed, rolling out r158526.
Modified: trunk/Source/WebCore/platform/graphics/mac/FontMac.mm (158580 => 158581)
--- trunk/Source/WebCore/platform/graphics/mac/FontMac.mm 2013-11-04 18:21:37 UTC (rev 158580)
+++ trunk/Source/WebCore/platform/graphics/mac/FontMac.mm 2013-11-04 18:42:21 UTC (rev 158581)
@@ -186,11 +186,7 @@
}
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 (158580 => 158581)
--- trunk/Source/WebCore/platform/mac/WebCoreSystemInterface.h 2013-11-04 18:21:37 UTC (rev 158580)
+++ trunk/Source/WebCore/platform/mac/WebCoreSystemInterface.h 2013-11-04 18:42:21 UTC (rev 158581)
@@ -191,11 +191,7 @@
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 (158580 => 158581)
--- trunk/Source/WebCore/platform/mac/WebCoreSystemInterface.mm 2013-11-04 18:21:37 UTC (rev 158580)
+++ trunk/Source/WebCore/platform/mac/WebCoreSystemInterface.mm 2013-11-04 18:42:21 UTC (rev 158581)
@@ -83,11 +83,7 @@
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]
https://lists.webkit.org/mailman/listinfo/webkit-changes
