From 09331b4fede28bf4656183b9205b670db9bf0bf0 Mon Sep 17 00:00:00 2001 From: "thakis@chromium.org" Date: Fri, 20 Aug 2010 16:57:47 +0000 Subject: Let use_accelerated_compositing be usable for both enabling and disabling compositing. With this, Chromium can be built on 10.5 again with the following ~/.gyp/include.gypi: { 'variables': { 'build_ffmpegsumo': 0, 'use_system_ffmpeg': 0, 'disable_nacl': 1, 'enable_svg': 0, 'use_accelerated_compositing': 0, } } Review URL: http://codereview.chromium.org/3173033 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@56871 0039d316-1c4b-4281-b951-d872f2087c98 --- build/features_override.gypi | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'build/features_override.gypi') diff --git a/build/features_override.gypi b/build/features_override.gypi index 22053063..19e12ed 100644 --- a/build/features_override.gypi +++ b/build/features_override.gypi @@ -57,7 +57,7 @@ # We have to nest variables inside variables so that they can be overridden # through GYP_DEFINES. 'variables': { - 'use_accelerated_compositing%': 0, + 'use_accelerated_compositing%': 1, 'enable_svg%': 1, 'enable_touch_events%': 1, }, @@ -65,7 +65,7 @@ 'enable_svg%': '<(enable_svg)', 'enable_touch_events%': '<(enable_touch_events)', 'conditions': [ - ['OS=="win" or OS=="linux" or OS=="mac" or use_accelerated_compositing==1', { + ['(OS=="win" or OS=="linux" or OS=="mac") and use_accelerated_compositing==1', { 'feature_defines': [ 'WTF_USE_ACCELERATED_COMPOSITING=1', 'ENABLE_3D_RENDERING=1', -- cgit v1.1