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

Side by Side Diff: build/features_override.gypi

Issue 7020034: Made ENABLE_TOUCH_ICON_LOADING configurable. (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 | 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) 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 43 matching lines...) Expand 10 before | Expand all | Expand 10 after
54 'ENABLE_SANDBOX=1', 54 'ENABLE_SANDBOX=1',
55 'ENABLE_SHARED_WORKERS=1', 55 'ENABLE_SHARED_WORKERS=1',
56 'ENABLE_SKIA_GPU=<(use_skia_gpu)', 56 'ENABLE_SKIA_GPU=<(use_skia_gpu)',
57 'ENABLE_SVG=<(enable_svg)', 57 'ENABLE_SVG=<(enable_svg)',
58 'ENABLE_SVG_ANIMATION=<(enable_svg)', 58 'ENABLE_SVG_ANIMATION=<(enable_svg)',
59 'ENABLE_SVG_AS_IMAGE=<(enable_svg)', 59 'ENABLE_SVG_AS_IMAGE=<(enable_svg)',
60 'ENABLE_SVG_FONTS=<(enable_svg)', 60 'ENABLE_SVG_FONTS=<(enable_svg)',
61 'ENABLE_SVG_FOREIGN_OBJECT=<(enable_svg)', 61 'ENABLE_SVG_FOREIGN_OBJECT=<(enable_svg)',
62 'ENABLE_SVG_USE=<(enable_svg)', 62 'ENABLE_SVG_USE=<(enable_svg)',
63 'ENABLE_TOUCH_EVENTS=<(enable_touch_events)', 63 'ENABLE_TOUCH_EVENTS=<(enable_touch_events)',
64 'ENABLE_TOUCH_ICON_LOADING=0', 64 'ENABLE_TOUCH_ICON_LOADING=<(enable_touch_icon_loading)',
65 'ENABLE_V8_SCRIPT_DEBUG_SERVER=1', 65 'ENABLE_V8_SCRIPT_DEBUG_SERVER=1',
66 'ENABLE_VIDEO=1', 66 'ENABLE_VIDEO=1',
67 'ENABLE_WEB_SOCKETS=1', 67 'ENABLE_WEB_SOCKETS=1',
68 'ENABLE_WEB_TIMING=1', 68 'ENABLE_WEB_TIMING=1',
69 'ENABLE_WEBGL=1', 69 'ENABLE_WEBGL=1',
70 'ENABLE_WORKERS=1', 70 'ENABLE_WORKERS=1',
71 'ENABLE_XHR_RESPONSE_BLOB=1', 71 'ENABLE_XHR_RESPONSE_BLOB=1',
72 'ENABLE_XPATH=1', 72 'ENABLE_XPATH=1',
73 'ENABLE_XSLT=1', 73 'ENABLE_XSLT=1',
74 'WTF_USE_BUILTIN_UTF8_CODEC=1', 74 'WTF_USE_BUILTIN_UTF8_CODEC=1',
75 # WTF_USE_DYNAMIC_ANNOTATIONS=1 may be defined in build/common.gypi 75 # WTF_USE_DYNAMIC_ANNOTATIONS=1 may be defined in build/common.gypi
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_svg%': 1, 86 'enable_svg%': 1,
87 'enable_touch_events%': 1, 87 'enable_touch_events%': 1,
88 'use_skia_gpu%': 0, 88 'use_skia_gpu%': 0,
89 'enable_touch_icon_loading%' : 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)',
92 'enable_svg%': '<(enable_svg)', 93 'enable_svg%': '<(enable_svg)',
93 'enable_touch_events%': '<(enable_touch_events)', 94 'enable_touch_events%': '<(enable_touch_events)',
94 'conditions': [ 95 'conditions': [
95 ['use_accelerated_compositing==1', { 96 ['use_accelerated_compositing==1', {
96 'feature_defines': [ 97 'feature_defines': [
97 'WTF_USE_ACCELERATED_COMPOSITING=1', 98 'WTF_USE_ACCELERATED_COMPOSITING=1',
98 'ENABLE_3D_RENDERING=1', 99 'ENABLE_3D_RENDERING=1',
(...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after
133 # require changes in gyp. 134 # require changes in gyp.
134 }, 135 },
135 136
136 } 137 }
137 138
138 # Local Variables: 139 # Local Variables:
139 # tab-width:2 140 # tab-width:2
140 # indent-tabs-mode:nil 141 # indent-tabs-mode:nil
141 # End: 142 # End:
142 # vim: set expandtab tabstop=2 shiftwidth=2: 143 # 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