Changeset 121304 in webkit

Timestamp:

Jun 26, 2012 5:06:19 PM (12 years ago)

Author:

peter@chromium.org

Message:

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

Location:

trunk/Source/WebKit/chromium

Files:

• ChangeLog (modified) (1 diff)
• features.gypi (modified) (3 diffs)

trunk/Source/WebKit/chromium/ChangeLog

@@ +1 @@
+2012-06-26  Peter Beverloo  <peter@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  <dtu@chromium.org>
 

trunk/Source/WebKit/chromium/features.gypi

@@ -138 +138 @@
           'ENABLE_FONT_BOOSTING=1',
           'ENABLE_INPUT_SPEECH=0',
+          'ENABLE_INPUT_TYPE_COLOR=0',
           'ENABLE_INPUT_TYPE_DATETIME=1',
           'ENABLE_INPUT_TYPE_DATETIMELOCAL=1',
@@ -158 +159 @@
         ],
         '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',
@@ -175 +177 @@
         ],
       }],
-      ['OS=="android"', {
-        'feature_defines': [
-          'ENABLE_INPUT_TYPE_COLOR=0',
-        ],
-      }, {
-        'feature_defines': [
-          'ENABLE_INPUT_TYPE_COLOR=1',
-        ],
-      }],
       ['use_accelerated_compositing==1', {
         'feature_defines': [
+          'ENABLE_3D_RENDERING=1',
+          'ENABLE_ACCELERATED_2D_CANVAS=1',
           'WTF_USE_ACCELERATED_COMPOSITING=1',
-          'ENABLE_3D_RENDERING=1',
-        ],
-      }],
-      ['use_accelerated_compositing==1', {
-        'feature_defines': [
-          'ENABLE_ACCELERATED_2D_CANVAS=1',
         ],
       }],