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 37 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
48 'ENABLE_WEB_SOCKETS=1', | 48 'ENABLE_WEB_SOCKETS=1', |
49 'ENABLE_WEB_TIMING=1', | 49 'ENABLE_WEB_TIMING=1', |
50 'ENABLE_WORKERS=1', | 50 'ENABLE_WORKERS=1', |
51 'ENABLE_XPATH=1', | 51 'ENABLE_XPATH=1', |
52 'ENABLE_XSLT=1', | 52 'ENABLE_XSLT=1', |
53 ], | 53 ], |
54 # We have to nest variables inside variables so that they can be overridden | 54 # We have to nest variables inside variables so that they can be overridden |
55 # through GYP_DEFINES. | 55 # through GYP_DEFINES. |
56 'variables': { | 56 'variables': { |
57 'use_accelerated_compositing%': 0, | 57 'use_accelerated_compositing%': 0, |
| 58 'accelerated_2d_canvas%': 0, |
58 'enable_svg%': 1, | 59 'enable_svg%': 1, |
59 'enable_touch_events%': 1, | 60 'enable_touch_events%': 1, |
60 }, | 61 }, |
61 'use_accelerated_compositing%': '<(use_accelerated_compositing)', | 62 'use_accelerated_compositing%': '<(use_accelerated_compositing)', |
| 63 'accelerated_2d_canvas%': '<(accelerated_2d_canvas)', |
62 'enable_svg%': '<(enable_svg)', | 64 'enable_svg%': '<(enable_svg)', |
63 'enable_touch_events%': '<(enable_touch_events)', | 65 'enable_touch_events%': '<(enable_touch_events)', |
64 'conditions': [ | 66 'conditions': [ |
65 ['OS=="win" or OS=="linux" or use_accelerated_compositing==1', { | 67 ['OS=="win" or OS=="linux" or use_accelerated_compositing==1', { |
66 'feature_defines': [ | 68 'feature_defines': [ |
67 'WTF_USE_ACCELERATED_COMPOSITING=1', | 69 'WTF_USE_ACCELERATED_COMPOSITING=1', |
68 'ENABLE_3D_RENDERING=1', | 70 'ENABLE_3D_RENDERING=1', |
69 ], | 71 ], |
70 'use_accelerated_compositing': 1, | 72 'use_accelerated_compositing': 1, |
71 }], | 73 }], |
| 74 ['accelerated_2d_canvas==1', { |
| 75 'feature_defines': [ |
| 76 'ENABLE_ACCELERATED_2D_CANVAS=1', |
| 77 ] |
| 78 }] |
72 ], | 79 ], |
73 # TODO: If the need arises, create a mechanism that will intelligently | 80 # TODO: If the need arises, create a mechanism that will intelligently |
74 # merge the lists rather than replace one with the other. This may | 81 # merge the lists rather than replace one with the other. This may |
75 # require changes in gyp. | 82 # require changes in gyp. |
76 }, | 83 }, |
77 | 84 |
78 } | 85 } |
79 | 86 |
80 # Local Variables: | 87 # Local Variables: |
81 # tab-width:2 | 88 # tab-width:2 |
82 # indent-tabs-mode:nil | 89 # indent-tabs-mode:nil |
83 # End: | 90 # End: |
84 # vim: set expandtab tabstop=2 shiftwidth=2: | 91 # vim: set expandtab tabstop=2 shiftwidth=2: |
OLD | NEW |