diff options
-rw-r--r-- | build/features_override.gypi | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/build/features_override.gypi b/build/features_override.gypi index 7364573..22053063 100644 --- a/build/features_override.gypi +++ b/build/features_override.gypi @@ -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 |