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

Side by Side Diff: build/features_override.gypi

Issue 6461016: add enable flag for SKIA_GPU, set to 0 by default (set to 1 for local testing... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 9 years, 10 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 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 26 matching lines...) Expand all
37 'ENABLE_METER_TAG=1', 37 'ENABLE_METER_TAG=1',
38 'ENABLE_NOTIFICATIONS=1', 38 'ENABLE_NOTIFICATIONS=1',
39 'ENABLE_OFFLINE_WEB_APPLICATIONS=1', 39 'ENABLE_OFFLINE_WEB_APPLICATIONS=1',
40 'ENABLE_OPENTYPE_SANITIZER=1', 40 'ENABLE_OPENTYPE_SANITIZER=1',
41 'ENABLE_ORIENTATION_EVENTS=0', 41 'ENABLE_ORIENTATION_EVENTS=0',
42 'ENABLE_PROGRESS_TAG=1', 42 'ENABLE_PROGRESS_TAG=1',
43 'ENABLE_REQUEST_ANIMATION_FRAME=1', 43 'ENABLE_REQUEST_ANIMATION_FRAME=1',
44 'ENABLE_RUBY=1', 44 'ENABLE_RUBY=1',
45 'ENABLE_SANDBOX=1', 45 'ENABLE_SANDBOX=1',
46 'ENABLE_SHARED_WORKERS=1', 46 'ENABLE_SHARED_WORKERS=1',
47 'ENABLE_SKIA_GPU=<(use_skia_gpu)',
47 'ENABLE_SVG=<(enable_svg)', 48 'ENABLE_SVG=<(enable_svg)',
48 'ENABLE_SVG_ANIMATION=<(enable_svg)', 49 'ENABLE_SVG_ANIMATION=<(enable_svg)',
49 'ENABLE_SVG_AS_IMAGE=<(enable_svg)', 50 'ENABLE_SVG_AS_IMAGE=<(enable_svg)',
50 'ENABLE_SVG_FONTS=<(enable_svg)', 51 'ENABLE_SVG_FONTS=<(enable_svg)',
51 'ENABLE_SVG_FOREIGN_OBJECT=<(enable_svg)', 52 'ENABLE_SVG_FOREIGN_OBJECT=<(enable_svg)',
52 'ENABLE_SVG_USE=<(enable_svg)', 53 'ENABLE_SVG_USE=<(enable_svg)',
53 'ENABLE_TOUCH_EVENTS=<(enable_touch_events)', 54 'ENABLE_TOUCH_EVENTS=<(enable_touch_events)',
54 'ENABLE_V8_SCRIPT_DEBUG_SERVER=1', 55 'ENABLE_V8_SCRIPT_DEBUG_SERVER=1',
55 'ENABLE_VIDEO=1', 56 'ENABLE_VIDEO=1',
56 'ENABLE_WEB_SOCKETS=1', 57 'ENABLE_WEB_SOCKETS=1',
57 'ENABLE_WEB_TIMING=1', 58 'ENABLE_WEB_TIMING=1',
58 'ENABLE_WEBGL=1', 59 'ENABLE_WEBGL=1',
59 'ENABLE_WORKERS=1', 60 'ENABLE_WORKERS=1',
60 'ENABLE_XHR_RESPONSE_BLOB=1', 61 'ENABLE_XHR_RESPONSE_BLOB=1',
61 'ENABLE_XPATH=1', 62 'ENABLE_XPATH=1',
62 'ENABLE_XSLT=1', 63 'ENABLE_XSLT=1',
63 'WTF_USE_WEBP=1', 64 'WTF_USE_WEBP=1',
64 'WTF_USE_WEBKIT_IMAGE_DECODERS=1', 65 'WTF_USE_WEBKIT_IMAGE_DECODERS=1',
65 ], 66 ],
66 # We have to nest variables inside variables so that they can be overridden 67 # We have to nest variables inside variables so that they can be overridden
67 # through GYP_DEFINES. 68 # through GYP_DEFINES.
68 'variables': { 69 'variables': {
69 'use_accelerated_compositing%': 1, 70 'use_accelerated_compositing%': 1,
70 'enable_svg%': 1, 71 'enable_svg%': 1,
71 'enable_touch_events%': 1, 72 'enable_touch_events%': 1,
73 'use_skia_gpu%': 0,
72 }, 74 },
73 'use_accelerated_compositing%': '<(use_accelerated_compositing)', 75 'use_accelerated_compositing%': '<(use_accelerated_compositing)',
74 'enable_svg%': '<(enable_svg)', 76 'enable_svg%': '<(enable_svg)',
75 'enable_touch_events%': '<(enable_touch_events)', 77 'enable_touch_events%': '<(enable_touch_events)',
76 'conditions': [ 78 'conditions': [
77 ['(OS=="win" or OS=="linux" or OS=="mac") and use_accelerated_compositing= =1', { 79 ['(OS=="win" or OS=="linux" or OS=="mac") and use_accelerated_compositing= =1', {
78 'feature_defines': [ 80 'feature_defines': [
79 'WTF_USE_ACCELERATED_COMPOSITING=1', 81 'WTF_USE_ACCELERATED_COMPOSITING=1',
80 'ENABLE_3D_RENDERING=1', 82 'ENABLE_3D_RENDERING=1',
81 'ENABLE_ACCELERATED_2D_CANVAS=1', 83 'ENABLE_ACCELERATED_2D_CANVAS=1',
(...skipping 11 matching lines...) Expand all
93 # require changes in gyp. 95 # require changes in gyp.
94 }, 96 },
95 97
96 } 98 }
97 99
98 # Local Variables: 100 # Local Variables:
99 # tab-width:2 101 # tab-width:2
100 # indent-tabs-mode:nil 102 # indent-tabs-mode:nil
101 # End: 103 # End:
102 # vim: set expandtab tabstop=2 shiftwidth=2: 104 # 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