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 38 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
49 # through GYP_DEFINES. | 49 # through GYP_DEFINES. |
50 'variables': { | 50 'variables': { |
51 'use_accelerated_compositing%': 0, | 51 'use_accelerated_compositing%': 0, |
52 'enable_svg%': 1, | 52 'enable_svg%': 1, |
53 'enable_touch_events%': 1, | 53 'enable_touch_events%': 1, |
54 }, | 54 }, |
55 'use_accelerated_compositing%': '<(use_accelerated_compositing)', | 55 'use_accelerated_compositing%': '<(use_accelerated_compositing)', |
56 'enable_svg%': '<(enable_svg)', | 56 'enable_svg%': '<(enable_svg)', |
57 'enable_touch_events%': '<(enable_touch_events)', | 57 'enable_touch_events%': '<(enable_touch_events)', |
58 'conditions': [ | 58 'conditions': [ |
59 ['use_accelerated_compositing==1', { | 59 ['OS=="win" or use_accelerated_compositing==1', { |
60 'feature_defines': [ | 60 'feature_defines': [ |
61 'WTF_USE_ACCELERATED_COMPOSITING=1', | 61 'WTF_USE_ACCELERATED_COMPOSITING=1', |
62 'ENABLE_3D_RENDERING=1', | 62 'ENABLE_3D_RENDERING=1', |
63 ], | 63 ], |
64 }], | 64 }], |
65 ], | 65 ], |
66 # TODO: If the need arises, create a mechanism that will intelligently | 66 # TODO: If the need arises, create a mechanism that will intelligently |
67 # merge the lists rather than replace one with the other. This may | 67 # merge the lists rather than replace one with the other. This may |
68 # require changes in gyp. | 68 # require changes in gyp. |
69 }, | 69 }, |
70 | 70 |
71 } | 71 } |
72 | 72 |
73 # Local Variables: | 73 # Local Variables: |
74 # tab-width:2 | 74 # tab-width:2 |
75 # indent-tabs-mode:nil | 75 # indent-tabs-mode:nil |
76 # End: | 76 # End: |
77 # vim: set expandtab tabstop=2 shiftwidth=2: | 77 # vim: set expandtab tabstop=2 shiftwidth=2: |
OLD | NEW |