Enable accelerated 2D canvas at compile time (still protected by a runtim...

build/features_override.gypi

Index: build/features_override.gypi
===================================================================
--- build/features_override.gypi	(revision 56527)
+++ build/features_override.gypi	(working copy)
@@ -58,27 +58,21 @@
     # through GYP_DEFINES.
     'variables': {
       'use_accelerated_compositing%': 0,
-      'accelerated_2d_canvas%': 0,
       'enable_svg%': 1,
       'enable_touch_events%': 1,
     },
     'use_accelerated_compositing%': '<(use_accelerated_compositing)',
-    'accelerated_2d_canvas%': '<(accelerated_2d_canvas)',
     'enable_svg%': '<(enable_svg)',
     'enable_touch_events%': '<(enable_touch_events)',
     'conditions': [
       ['OS=="win" or OS=="linux" or OS=="mac" or use_accelerated_compositing==1', {
         'feature_defines': [
-         'WTF_USE_ACCELERATED_COMPOSITING=1',
-         'ENABLE_3D_RENDERING=1',
+          'WTF_USE_ACCELERATED_COMPOSITING=1',
+          'ENABLE_3D_RENDERING=1',
+          'ENABLE_ACCELERATED_2D_CANVAS=1',
         ],
         'use_accelerated_compositing': 1,
       }],
-      ['accelerated_2d_canvas==1', {
-        'feature_defines': [
-          'ENABLE_ACCELERATED_2D_CANVAS=1',
-        ]
-      }]
     ],
     # TODO: If the need arises, create a mechanism that will intelligently
     # merge the lists rather than replace one with the other. This may