OLD | NEW |
---|---|
1 # Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 # Copyright (c) 2011 The Chromium Authors. All rights reserved. |
2 # Use of this source code is governed by a BSD-style license that can be | 2 # Use of this source code is governed by a BSD-style license that can be |
3 # found in the LICENSE file. | 3 # found in the LICENSE file. |
4 | 4 |
5 # This file is only included in full-chromium builds, and overrides the | 5 # This file is only included in full-chromium builds, and overrides the |
6 # feature_defines variable in | 6 # feature_defines variable in |
7 # third_party/WebKit/Source/WebKit/chromium/features.gypi. | 7 # third_party/WebKit/Source/WebKit/chromium/features.gypi. |
8 { | 8 { |
9 'variables': { | 9 'variables': { |
10 # WARNING: This list of strings completely replaces the list in | 10 # WARNING: This list of strings completely replaces the list in |
(...skipping 78 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
89 }, | 89 }, |
90 'use_accelerated_compositing%': '<(use_accelerated_compositing)', | 90 'use_accelerated_compositing%': '<(use_accelerated_compositing)', |
91 'use_threaded_compositing%': '<(use_threaded_compositing)', | 91 'use_threaded_compositing%': '<(use_threaded_compositing)', |
92 'enable_svg%': '<(enable_svg)', | 92 'enable_svg%': '<(enable_svg)', |
93 'enable_touch_events%': '<(enable_touch_events)', | 93 'enable_touch_events%': '<(enable_touch_events)', |
94 'conditions': [ | 94 'conditions': [ |
95 ['use_accelerated_compositing==1', { | 95 ['use_accelerated_compositing==1', { |
96 'feature_defines': [ | 96 'feature_defines': [ |
97 'WTF_USE_ACCELERATED_COMPOSITING=1', | 97 'WTF_USE_ACCELERATED_COMPOSITING=1', |
98 'ENABLE_3D_RENDERING=1', | 98 'ENABLE_3D_RENDERING=1', |
99 ], | |
100 }], | |
101 ['use_accelerated_compositing==1 and OS!="mac"', { | |
102 'feature_defines': [ | |
99 'ENABLE_ACCELERATED_2D_CANVAS=1', | 103 'ENABLE_ACCELERATED_2D_CANVAS=1', |
100 ], | 104 ], |
101 'use_accelerated_compositing': 1, | |
102 }], | 105 }], |
103 ['use_accelerated_compositing==1 and use_threaded_compositing==1', { | 106 ['use_accelerated_compositing==1 and use_threaded_compositing==1', { |
104 'feature_defines': [ | 107 'feature_defines': [ |
105 'WTF_USE_THREADED_COMPOSITING=1', | 108 'WTF_USE_THREADED_COMPOSITING=1', |
106 ], | 109 ], |
107 'use_threaded_compositing': 1, | 110 'use_threaded_compositing': 1, |
Mark Mentovai
2011/05/31 21:02:31
Yes, I think you can get rid of this too.
| |
108 }], | 111 }], |
109 # TODO(crogers): For the moment Windows is only enabled for | 112 # TODO(crogers): For the moment Windows is only enabled for |
110 # Google-branded build, since the FFmpeg DLLs need to be re-built | 113 # Google-branded build, since the FFmpeg DLLs need to be re-built |
111 # for chromium. | 114 # for chromium. |
112 ['OS=="mac" or OS=="linux" or (OS=="win" and branding=="Chrome")', { | 115 ['OS=="mac" or OS=="linux" or (OS=="win" and branding=="Chrome")', { |
113 'feature_defines': [ | 116 'feature_defines': [ |
114 'ENABLE_WEB_AUDIO=1', | 117 'ENABLE_WEB_AUDIO=1', |
115 ], | 118 ], |
116 }], | 119 }], |
117 # Mac OS X uses Accelerate.framework FFT by default instead of FFmpeg. | 120 # Mac OS X uses Accelerate.framework FFT by default instead of FFmpeg. |
(...skipping 13 matching lines...) Expand all Loading... | |
131 # require changes in gyp. | 134 # require changes in gyp. |
132 }, | 135 }, |
133 | 136 |
134 } | 137 } |
135 | 138 |
136 # Local Variables: | 139 # Local Variables: |
137 # tab-width:2 | 140 # tab-width:2 |
138 # indent-tabs-mode:nil | 141 # indent-tabs-mode:nil |
139 # End: | 142 # End: |
140 # vim: set expandtab tabstop=2 shiftwidth=2: | 143 # vim: set expandtab tabstop=2 shiftwidth=2: |
OLD | NEW |