Title: [130558] trunk/Source/WebKit/chromium
Revision
130558
Author
[email protected]
Date
2012-10-05 15:05:55 -0700 (Fri, 05 Oct 2012)

Log Message

[chromium] Only define SK_SUPPORT_HINTING_SCALE_FACTOR when building for chromeOS
https://bugs.webkit.org/show_bug.cgi?id=98526

Patch by Terry Anderson <[email protected]> on 2012-10-05
Reviewed by Stephen White.

This is causing some problems with picture serialization between chrome
and the mainline skia tools. (Once this change lands and is gardened in,
I will make the corresponding change in chromium/skia/skia.gyp)

* features.gypi:

Modified Paths

Diff

Modified: trunk/Source/WebKit/chromium/ChangeLog (130557 => 130558)


--- trunk/Source/WebKit/chromium/ChangeLog	2012-10-05 22:01:04 UTC (rev 130557)
+++ trunk/Source/WebKit/chromium/ChangeLog	2012-10-05 22:05:55 UTC (rev 130558)
@@ -1,3 +1,16 @@
+2012-10-05  Terry Anderson  <[email protected]>
+
+        [chromium] Only define SK_SUPPORT_HINTING_SCALE_FACTOR when building for chromeOS
+        https://bugs.webkit.org/show_bug.cgi?id=98526
+
+        Reviewed by Stephen White.
+
+        This is causing some problems with picture serialization between chrome 
+        and the mainline skia tools. (Once this change lands and is gardened in, 
+        I will make the corresponding change in chromium/skia/skia.gyp)
+
+        * features.gypi:
+
 2012-10-05  Adam Barth  <[email protected]>
 
         Unreviewed.

Modified: trunk/Source/WebKit/chromium/features.gypi (130557 => 130558)


--- trunk/Source/WebKit/chromium/features.gypi	2012-10-05 22:01:04 UTC (rev 130557)
+++ trunk/Source/WebKit/chromium/features.gypi	2012-10-05 22:05:55 UTC (rev 130558)
@@ -119,7 +119,6 @@
       'ENABLE_WORKERS=1',
       'ENABLE_XHR_RESPONSE_BLOB=1',
       'ENABLE_XSLT=1',
-      'SK_SUPPORT_HINTING_SCALE_FACTOR',
       'WTF_USE_LEVELDB=1',
       'WTF_USE_BUILTIN_UTF8_CODEC=1',
       # WTF_USE_DYNAMIC_ANNOTATIONS=1 may be defined in build/common.gypi
@@ -228,6 +227,11 @@
           'WTF_USE_HARFBUZZ_NG=1',
         ],
       }],
+      ['chromeos==1', {
+        'feature_defines': [
+          'SK_SUPPORT_HINTING_SCALE_FACTOR',
+        ],
+      }],
     ],
   },
 }
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to