[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):

git-svn-id: http://svn.webkit.org/repository/webkit/trunk@121594 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/Source/WebKit/chromium/ChangeLog b/Source/WebKit/chromium/ChangeLog
index 2f602bc..ad626aa 100644 (file)
--- a/Source/WebKit/chromium/ChangeLog
+++ b/Source/WebKit/chromium/ChangeLog
@@ -1,3 +1,19 @@
+2012-06-29  Adam Barth  <abarth@webkit.org>
+
+        [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  <epenner@google.com>
 
         [chromium] Adding PrioritizedTexture and replacing ContentsTextureManager

diff --git a/Source/WebKit/chromium/src/linux/WebFontRendering.cpp b/Source/WebKit/chromium/src/linux/WebFontRendering.cpp
index 7dc98e6..67d5c2b 100644 (file)
--- a/Source/WebKit/chromium/src/linux/WebFontRendering.cpp
+++ b/Source/WebKit/chromium/src/linux/WebFontRendering.cpp
@@ -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::setSubpixelRendering(bool useSubpixelRendering)
 void WebFontRendering::setSubpixelPositioning(bool useSubpixelPositioning)
 {
     FontPlatformData::setSubpixelPositioning(useSubpixelPositioning);
-#if OS(LINUX)
+#if OS(LINUX) && !OS(ANDROID)
     WebFontInfo::setSubpixelPositioning(useSubpixelPositioning);
 #endif
 }