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 third_party/WebKit/WebKit/chromium/features.gypi. | 6 # feature_defines variable in third_party/WebKit/WebKit/chromium/features.gypi. |
7 { | 7 { |
8 'variables': { | 8 'variables': { |
9 # WARNING: This list of strings completely replaces the list in | 9 # WARNING: This list of strings completely replaces the list in |
10 # features.gypi. Therefore, if an enable is listed in features.gypi | 10 # features.gypi. Therefore, if an enable is listed in features.gypi |
(...skipping 44 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
55 }, | 55 }, |
56 'use_accelerated_compositing%': '<(use_accelerated_compositing)', | 56 'use_accelerated_compositing%': '<(use_accelerated_compositing)', |
57 'enable_svg%': '<(enable_svg)', | 57 'enable_svg%': '<(enable_svg)', |
58 'enable_touch_events%': '<(enable_touch_events)', | 58 'enable_touch_events%': '<(enable_touch_events)', |
59 'conditions': [ | 59 'conditions': [ |
60 ['OS=="win" or use_accelerated_compositing==1', { | 60 ['OS=="win" or use_accelerated_compositing==1', { |
61 'feature_defines': [ | 61 'feature_defines': [ |
62 'WTF_USE_ACCELERATED_COMPOSITING=1', | 62 'WTF_USE_ACCELERATED_COMPOSITING=1', |
63 'ENABLE_3D_RENDERING=1', | 63 'ENABLE_3D_RENDERING=1', |
64 ], | 64 ], |
| 65 'use_accelerated_compositing': 1, |
65 }], | 66 }], |
66 ], | 67 ], |
67 # TODO: If the need arises, create a mechanism that will intelligently | 68 # TODO: If the need arises, create a mechanism that will intelligently |
68 # merge the lists rather than replace one with the other. This may | 69 # merge the lists rather than replace one with the other. This may |
69 # require changes in gyp. | 70 # require changes in gyp. |
70 }, | 71 }, |
71 | 72 |
72 } | 73 } |
73 | 74 |
74 # Local Variables: | 75 # Local Variables: |
75 # tab-width:2 | 76 # tab-width:2 |
76 # indent-tabs-mode:nil | 77 # indent-tabs-mode:nil |
77 # End: | 78 # End: |
78 # vim: set expandtab tabstop=2 shiftwidth=2: | 79 # vim: set expandtab tabstop=2 shiftwidth=2: |
OLD | NEW |