Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(582)

Side by Side Diff: build/features_override.gypi

Issue 3012048: Build accelerated compositor by default on Mac OS X to ensure no... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Created 10 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 49 matching lines...) Expand 10 before | Expand all | Expand 10 after
60 'use_accelerated_compositing%': 0, 60 'use_accelerated_compositing%': 0,
61 'accelerated_2d_canvas%': 0, 61 'accelerated_2d_canvas%': 0,
62 'enable_svg%': 1, 62 'enable_svg%': 1,
63 'enable_touch_events%': 1, 63 'enable_touch_events%': 1,
64 }, 64 },
65 'use_accelerated_compositing%': '<(use_accelerated_compositing)', 65 'use_accelerated_compositing%': '<(use_accelerated_compositing)',
66 'accelerated_2d_canvas%': '<(accelerated_2d_canvas)', 66 'accelerated_2d_canvas%': '<(accelerated_2d_canvas)',
67 'enable_svg%': '<(enable_svg)', 67 'enable_svg%': '<(enable_svg)',
68 'enable_touch_events%': '<(enable_touch_events)', 68 'enable_touch_events%': '<(enable_touch_events)',
69 'conditions': [ 69 'conditions': [
70 ['OS=="win" or OS=="linux" or use_accelerated_compositing==1', { 70 ['OS=="win" or OS=="linux" or OS=="mac" or use_accelerated_compositing==1' , {
71 'feature_defines': [ 71 'feature_defines': [
72 'WTF_USE_ACCELERATED_COMPOSITING=1', 72 'WTF_USE_ACCELERATED_COMPOSITING=1',
73 'ENABLE_3D_RENDERING=1', 73 'ENABLE_3D_RENDERING=1',
74 ], 74 ],
75 'use_accelerated_compositing': 1, 75 'use_accelerated_compositing': 1,
76 }], 76 }],
77 ['accelerated_2d_canvas==1', { 77 ['accelerated_2d_canvas==1', {
78 'feature_defines': [ 78 'feature_defines': [
79 'ENABLE_ACCELERATED_2D_CANVAS=1', 79 'ENABLE_ACCELERATED_2D_CANVAS=1',
80 ] 80 ]
81 }] 81 }]
82 ], 82 ],
83 # TODO: If the need arises, create a mechanism that will intelligently 83 # TODO: If the need arises, create a mechanism that will intelligently
84 # merge the lists rather than replace one with the other. This may 84 # merge the lists rather than replace one with the other. This may
85 # require changes in gyp. 85 # require changes in gyp.
86 }, 86 },
87 87
88 } 88 }
89 89
90 # Local Variables: 90 # Local Variables:
91 # tab-width:2 91 # tab-width:2
92 # indent-tabs-mode:nil 92 # indent-tabs-mode:nil
93 # End: 93 # End:
94 # vim: set expandtab tabstop=2 shiftwidth=2: 94 # vim: set expandtab tabstop=2 shiftwidth=2:
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698