| OLD | NEW |
| 1 # Copyright (c) 2009 The Chromium Authors. All rights reserved. | 1 # Copyright (c) 2009 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 62 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 73 'enable_touch_events%': '<(enable_touch_events)', | 73 'enable_touch_events%': '<(enable_touch_events)', |
| 74 'conditions': [ | 74 'conditions': [ |
| 75 ['(OS=="win" or OS=="linux" or OS=="mac") and use_accelerated_compositing=
=1', { | 75 ['(OS=="win" or OS=="linux" or OS=="mac") and use_accelerated_compositing=
=1', { |
| 76 'feature_defines': [ | 76 'feature_defines': [ |
| 77 'WTF_USE_ACCELERATED_COMPOSITING=1', | 77 'WTF_USE_ACCELERATED_COMPOSITING=1', |
| 78 'ENABLE_3D_RENDERING=1', | 78 'ENABLE_3D_RENDERING=1', |
| 79 'ENABLE_ACCELERATED_2D_CANVAS=1', | 79 'ENABLE_ACCELERATED_2D_CANVAS=1', |
| 80 ], | 80 ], |
| 81 'use_accelerated_compositing': 1, | 81 'use_accelerated_compositing': 1, |
| 82 }], | 82 }], |
| 83 ['OS=="mac"', { | |
| 84 'feature_defines': [ | |
| 85 'ENABLE_WEB_AUDIO=1', | |
| 86 ], | |
| 87 }], | |
| 88 ], | 83 ], |
| 89 # TODO: If the need arises, create a mechanism that will intelligently | 84 # TODO: If the need arises, create a mechanism that will intelligently |
| 90 # merge the lists rather than replace one with the other. This may | 85 # merge the lists rather than replace one with the other. This may |
| 91 # require changes in gyp. | 86 # require changes in gyp. |
| 92 }, | 87 }, |
| 93 | 88 |
| 94 } | 89 } |
| 95 | 90 |
| 96 # Local Variables: | 91 # Local Variables: |
| 97 # tab-width:2 | 92 # tab-width:2 |
| 98 # indent-tabs-mode:nil | 93 # indent-tabs-mode:nil |
| 99 # End: | 94 # End: |
| 100 # vim: set expandtab tabstop=2 shiftwidth=2: | 95 # vim: set expandtab tabstop=2 shiftwidth=2: |
| OLD | NEW |