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

Side by Side Diff: build/features_override.gypi

Issue 7034052: Linux/CrOS smooth scrolling support - behind a flag. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 9 years, 6 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 | chrome/app/generated_resources.grd » ('j') | chrome/browser/about_flags.cc » ('J')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 # Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2011 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 6 # feature_defines variable in
7 # third_party/WebKit/Source/WebKit/chromium/features.gypi. 7 # third_party/WebKit/Source/WebKit/chromium/features.gypi.
8 { 8 {
9 'variables': { 9 'variables': {
10 # WARNING: This list of strings completely replaces the list in 10 # WARNING: This list of strings completely replaces the list in
(...skipping 65 matching lines...) Expand 10 before | Expand all | Expand 10 after
76 # We can't define it here because it should be present only 76 # We can't define it here because it should be present only
77 # in Debug or release_valgrind_build=1 builds. 77 # in Debug or release_valgrind_build=1 builds.
78 'WTF_USE_WEBP=1', 78 'WTF_USE_WEBP=1',
79 'WTF_USE_WEBKIT_IMAGE_DECODERS=1', 79 'WTF_USE_WEBKIT_IMAGE_DECODERS=1',
80 ], 80 ],
81 # We have to nest variables inside variables so that they can be overridden 81 # We have to nest variables inside variables so that they can be overridden
82 # through GYP_DEFINES. 82 # through GYP_DEFINES.
83 'variables': { 83 'variables': {
84 'use_accelerated_compositing%': 1, 84 'use_accelerated_compositing%': 1,
85 'use_threaded_compositing%': 0, 85 'use_threaded_compositing%': 0,
86 'enable_smooth_scrolling%': 0,
86 'enable_svg%': 1, 87 'enable_svg%': 1,
87 'enable_touch_events%': 1, 88 'enable_touch_events%': 1,
88 'use_skia_gpu%': 0, 89 'use_skia_gpu%': 0,
89 }, 90 },
90 'use_accelerated_compositing%': '<(use_accelerated_compositing)', 91 'use_accelerated_compositing%': '<(use_accelerated_compositing)',
91 'use_threaded_compositing%': '<(use_threaded_compositing)', 92 'use_threaded_compositing%': '<(use_threaded_compositing)',
93 'enable_smooth_scrolling%': '<(enable_smooth_scrolling)',
92 'enable_svg%': '<(enable_svg)', 94 'enable_svg%': '<(enable_svg)',
93 'enable_touch_events%': '<(enable_touch_events)', 95 'enable_touch_events%': '<(enable_touch_events)',
94 'conditions': [ 96 'conditions': [
95 ['use_accelerated_compositing==1', { 97 ['use_accelerated_compositing==1', {
96 'feature_defines': [ 98 'feature_defines': [
97 'WTF_USE_ACCELERATED_COMPOSITING=1', 99 'WTF_USE_ACCELERATED_COMPOSITING=1',
98 'ENABLE_3D_RENDERING=1', 100 'ENABLE_3D_RENDERING=1',
99 'ENABLE_ACCELERATED_2D_CANVAS=1', 101 'ENABLE_ACCELERATED_2D_CANVAS=1',
100 ], 102 ],
101 'use_accelerated_compositing': 1, 103 'use_accelerated_compositing': 1,
(...skipping 16 matching lines...) Expand all
118 ['OS!="mac"', { 120 ['OS!="mac"', {
119 'feature_defines': [ 121 'feature_defines': [
120 'WTF_USE_WEBAUDIO_FFMPEG=1', 122 'WTF_USE_WEBAUDIO_FFMPEG=1',
121 ], 123 ],
122 }], 124 }],
123 ['enable_register_protocol_handler==1', { 125 ['enable_register_protocol_handler==1', {
124 'feature_defines': [ 126 'feature_defines': [
125 'ENABLE_REGISTER_PROTOCOL_HANDLER=1', 127 'ENABLE_REGISTER_PROTOCOL_HANDLER=1',
126 ], 128 ],
127 }], 129 }],
130 ['OS=="linux" and enable_smooth_scrolling==1', {
darin (slow to review) 2011/05/31 20:40:24 i don't quite understand why this is OS==linux. w
Scott Byer 2011/05/31 21:02:45 Hmm, perhaps I'm being too cautious on the initial
131 'feature_defines': [
132 'ENABLE_SMOOTH_SCROLLING=1',
133 ],
134 }],
128 ], 135 ],
129 # TODO: If the need arises, create a mechanism that will intelligently 136 # TODO: If the need arises, create a mechanism that will intelligently
130 # merge the lists rather than replace one with the other. This may 137 # merge the lists rather than replace one with the other. This may
131 # require changes in gyp. 138 # require changes in gyp.
132 }, 139 },
133 140
134 } 141 }
135 142
136 # Local Variables: 143 # Local Variables:
137 # tab-width:2 144 # tab-width:2
138 # indent-tabs-mode:nil 145 # indent-tabs-mode:nil
139 # End: 146 # End:
140 # vim: set expandtab tabstop=2 shiftwidth=2: 147 # vim: set expandtab tabstop=2 shiftwidth=2:
OLDNEW
« no previous file with comments | « no previous file | chrome/app/generated_resources.grd » ('j') | chrome/browser/about_flags.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698