Title: [121594] trunk/Source/WebKit/chromium
- Revision
- 121594
- Author
- [email protected]
- Date
- 2012-06-29 15:10:43 -0700 (Fri, 29 Jun 2012)
Log Message
[Chromium] WebFontRendering.cpp requires some OS(ANDROID) ifdefs to build downstream
https://bugs.webkit.org/show_bug.cgi?id=90292
Reviewed by Nate Chapin.
These ifdefs are required to build this file downstream. There's some
sublte difference between how the OS flags are set upstream and
downstream. This is on our list of issues to resolve, but in the
meantime, this patch makes these files identical upstream and
downstream to reduce noise in the upstreaming queue.
* src/linux/WebFontRendering.cpp:
(WebKit::WebFontRendering::setSubpixelPositioning):
Modified Paths
Diff
Modified: trunk/Source/WebKit/chromium/ChangeLog (121593 => 121594)
--- trunk/Source/WebKit/chromium/ChangeLog 2012-06-29 22:02:37 UTC (rev 121593)
+++ trunk/Source/WebKit/chromium/ChangeLog 2012-06-29 22:10:43 UTC (rev 121594)
@@ -1,3 +1,19 @@
+2012-06-29 Adam Barth <[email protected]>
+
+ [Chromium] WebFontRendering.cpp requires some OS(ANDROID) ifdefs to build downstream
+ https://bugs.webkit.org/show_bug.cgi?id=90292
+
+ Reviewed by Nate Chapin.
+
+ These ifdefs are required to build this file downstream. There's some
+ sublte difference between how the OS flags are set upstream and
+ downstream. This is on our list of issues to resolve, but in the
+ meantime, this patch makes these files identical upstream and
+ downstream to reduce noise in the upstreaming queue.
+
+ * src/linux/WebFontRendering.cpp:
+ (WebKit::WebFontRendering::setSubpixelPositioning):
+
2012-06-29 Eric Penner <[email protected]>
[chromium] Adding PrioritizedTexture and replacing ContentsTextureManager
Modified: trunk/Source/WebKit/chromium/src/linux/WebFontRendering.cpp (121593 => 121594)
--- trunk/Source/WebKit/chromium/src/linux/WebFontRendering.cpp 2012-06-29 22:02:37 UTC (rev 121593)
+++ trunk/Source/WebKit/chromium/src/linux/WebFontRendering.cpp 2012-06-29 22:10:43 UTC (rev 121594)
@@ -33,7 +33,7 @@
#include "FontPlatformData.h"
-#if OS(LINUX)
+#if OS(LINUX) && !OS(ANDROID)
#include "WebFontInfo.h"
#endif
@@ -75,7 +75,7 @@
void WebFontRendering::setSubpixelPositioning(bool useSubpixelPositioning)
{
FontPlatformData::setSubpixelPositioning(useSubpixelPositioning);
-#if OS(LINUX)
+#if OS(LINUX) && !OS(ANDROID)
WebFontInfo::setSubpixelPositioning(useSubpixelPositioning);
#endif
}
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
