Modified: trunk/Source/WebKit/chromium/ChangeLog (121303 => 121304)
--- trunk/Source/WebKit/chromium/ChangeLog 2012-06-27 00:00:52 UTC (rev 121303)
+++ trunk/Source/WebKit/chromium/ChangeLog 2012-06-27 00:06:19 UTC (rev 121304)
@@ -1,3 +1,15 @@
+2012-06-26 Peter Beverloo <pe...@chromium.org>
+
+ [Chromium] Decrease the number of conditional blocks in features.gypi
+ https://bugs.webkit.org/show_bug.cgi?id=90013
+
+ Reviewed by Adam Barth.
+
+ Consolidate two Android-specific and accelerated-compositing-specific
+ conditional blocks into other blocks which serve an identical purpose.
+
+ * features.gypi:
+
2012-06-26 Dave Tu <d...@chromium.org>
[chromium] Expose rendering statistics to WebWidget.
Modified: trunk/Source/WebKit/chromium/features.gypi (121303 => 121304)
--- trunk/Source/WebKit/chromium/features.gypi 2012-06-27 00:00:52 UTC (rev 121303)
+++ trunk/Source/WebKit/chromium/features.gypi 2012-06-27 00:06:19 UTC (rev 121304)
@@ -137,6 +137,7 @@
'ENABLE_CALENDAR_PICKER=0',
'ENABLE_FONT_BOOSTING=1',
'ENABLE_INPUT_SPEECH=0',
+ 'ENABLE_INPUT_TYPE_COLOR=0',
'ENABLE_INPUT_TYPE_DATETIME=1',
'ENABLE_INPUT_TYPE_DATETIMELOCAL=1',
'ENABLE_INPUT_TYPE_MONTH=1',
@@ -157,11 +158,12 @@
'WTF_USE_NATIVE_FULLSCREEN_VIDEO=1',
],
'enable_touch_icon_loading': 1,
- }, {
+ }, { # OS!="android"
'feature_defines': [
'ENABLE_CALENDAR_PICKER=1',
'ENABLE_FONT_BOOSTING=0',
'ENABLE_INPUT_SPEECH=1',
+ 'ENABLE_INPUT_TYPE_COLOR=1',
'ENABLE_JAVASCRIPT_I18N_API=1',
'ENABLE_LEGACY_NOTIFICATIONS=1',
'ENABLE_MEDIA_CAPTURE=0',
@@ -174,24 +176,11 @@
'ENABLE_WEB_AUDIO=1',
],
}],
- ['OS=="android"', {
- 'feature_defines': [
- 'ENABLE_INPUT_TYPE_COLOR=0',
- ],
- }, {
- 'feature_defines': [
- 'ENABLE_INPUT_TYPE_COLOR=1',
- ],
- }],
['use_accelerated_compositing==1', {
'feature_defines': [
- 'WTF_USE_ACCELERATED_COMPOSITING=1',
'ENABLE_3D_RENDERING=1',
- ],
- }],
- ['use_accelerated_compositing==1', {
- 'feature_defines': [
'ENABLE_ACCELERATED_2D_CANVAS=1',
+ 'WTF_USE_ACCELERATED_COMPOSITING=1',
],
}],
# Mac OS X uses Accelerate.framework FFT by default instead of FFmpeg.
