summaryrefslogtreecommitdiffstats
path: root/build/features_override.gypi
diff options
context:
space:
mode:
authornduca@chromium.org <nduca@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-03-09 00:54:51 +0000
committernduca@chromium.org <nduca@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-03-09 00:54:51 +0000
commite848ec764000bd751d7ce3078a125c7580ef672d (patch)
tree61149779815475a269605d8c08c0c87fda42ac6d /build/features_override.gypi
parent955b73964372469fe35b0162d37f4a357532d6f4 (diff)
downloadchromium_src-e848ec764000bd751d7ce3078a125c7580ef672d.zip
chromium_src-e848ec764000bd751d7ce3078a125c7580ef672d.tar.gz
chromium_src-e848ec764000bd751d7ce3078a125c7580ef672d.tar.bz2
Add use_threaded_compositing as gypi variable and bind to WTF_USE_THREADED_COMPOSITING. Defaults off.
BUG= TEST= Review URL: http://codereview.chromium.org/6609046 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@77388 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'build/features_override.gypi')
-rw-r--r--build/features_override.gypi8
1 files changed, 8 insertions, 0 deletions
diff --git a/build/features_override.gypi b/build/features_override.gypi
index 225dfc5..317549d 100644
--- a/build/features_override.gypi
+++ b/build/features_override.gypi
@@ -73,11 +73,13 @@
# through GYP_DEFINES.
'variables': {
'use_accelerated_compositing%': 1,
+ 'use_threaded_compositing%': 0,
'enable_svg%': 1,
'enable_touch_events%': 1,
'use_skia_gpu%': 0,
},
'use_accelerated_compositing%': '<(use_accelerated_compositing)',
+ 'use_threaded_compositing%': '<(use_threaded_compositing)',
'enable_svg%': '<(enable_svg)',
'enable_touch_events%': '<(enable_touch_events)',
'conditions': [
@@ -89,6 +91,12 @@
],
'use_accelerated_compositing': 1,
}],
+ ['use_accelerated_compositing==1 and use_threaded_compositing==1', {
+ 'feature_defines': [
+ 'WTF_USE_THREADED_COMPOSITING=1',
+ ],
+ 'use_threaded_compositing': 1,
+ }],
['OS=="mac"', {
'feature_defines': [
'ENABLE_WEB_AUDIO=1',