diff options
| author | senorblanco@google.com <senorblanco@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-08-18 18:33:43 +0000 |
|---|---|---|
| committer | senorblanco@google.com <senorblanco@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-08-18 18:33:43 +0000 |
| commit | 371390a71a7e4530b39e46f1f52c5a6d5a3acd43 (patch) | |
| tree | 5b9ae3df100143eb7c665d278278ccabe8e41661 | |
| parent | 4864ac8df9f2d34718c0d693040d1354dfb7f0eb (diff) | |
| download | chromium_src-371390a71a7e4530b39e46f1f52c5a6d5a3acd43.zip chromium_src-371390a71a7e4530b39e46f1f52c5a6d5a3acd43.tar.gz chromium_src-371390a71a7e4530b39e46f1f52c5a6d5a3acd43.tar.bz2 | |
Enable accelerated 2D canvas at compile time (still protected by a runtime flag). This enables compilation on all platforms, but it's only hooked up internally on Win and Linux.
BUG=none
TEST=if it compiles, you're happy
Review URL: http://codereview.chromium.org/3117023
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@56562 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | build/features_override.gypi | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/build/features_override.gypi b/build/features_override.gypi index 7364573..22053063 100644 --- a/build/features_override.gypi +++ b/build/features_override.gypi @@ -58,27 +58,21 @@ # through GYP_DEFINES. 'variables': { 'use_accelerated_compositing%': 0, - 'accelerated_2d_canvas%': 0, 'enable_svg%': 1, 'enable_touch_events%': 1, }, 'use_accelerated_compositing%': '<(use_accelerated_compositing)', - 'accelerated_2d_canvas%': '<(accelerated_2d_canvas)', 'enable_svg%': '<(enable_svg)', 'enable_touch_events%': '<(enable_touch_events)', 'conditions': [ ['OS=="win" or OS=="linux" or OS=="mac" or use_accelerated_compositing==1', { 'feature_defines': [ - 'WTF_USE_ACCELERATED_COMPOSITING=1', - 'ENABLE_3D_RENDERING=1', + 'WTF_USE_ACCELERATED_COMPOSITING=1', + 'ENABLE_3D_RENDERING=1', + 'ENABLE_ACCELERATED_2D_CANVAS=1', ], 'use_accelerated_compositing': 1, }], - ['accelerated_2d_canvas==1', { - 'feature_defines': [ - 'ENABLE_ACCELERATED_2D_CANVAS=1', - ] - }] ], # TODO: If the need arises, create a mechanism that will intelligently # merge the lists rather than replace one with the other. This may |