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

Side by Side Diff: build/features_override.gypi

Issue 6576066: Update expectation for V8 roll and turn builtin utf8 codec on by default to match upstream (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 | webkit/tools/layout_tests/test_expectations.txt » ('j') | 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 44 matching lines...) Expand 10 before | Expand all | Expand 10 after
55 'ENABLE_TOUCH_EVENTS=<(enable_touch_events)', 55 'ENABLE_TOUCH_EVENTS=<(enable_touch_events)',
56 'ENABLE_V8_SCRIPT_DEBUG_SERVER=1', 56 'ENABLE_V8_SCRIPT_DEBUG_SERVER=1',
57 'ENABLE_VIDEO=1', 57 'ENABLE_VIDEO=1',
58 'ENABLE_WEB_SOCKETS=1', 58 'ENABLE_WEB_SOCKETS=1',
59 'ENABLE_WEB_TIMING=1', 59 'ENABLE_WEB_TIMING=1',
60 'ENABLE_WEBGL=1', 60 'ENABLE_WEBGL=1',
61 'ENABLE_WORKERS=1', 61 'ENABLE_WORKERS=1',
62 'ENABLE_XHR_RESPONSE_BLOB=1', 62 'ENABLE_XHR_RESPONSE_BLOB=1',
63 'ENABLE_XPATH=1', 63 'ENABLE_XPATH=1',
64 'ENABLE_XSLT=1', 64 'ENABLE_XSLT=1',
65 'WTF_USE_BUILTIN_UTF8_CODEC=1',
65 'WTF_USE_WEBP=1', 66 'WTF_USE_WEBP=1',
66 'WTF_USE_WEBKIT_IMAGE_DECODERS=1', 67 'WTF_USE_WEBKIT_IMAGE_DECODERS=1',
67 ], 68 ],
68 # We have to nest variables inside variables so that they can be overridden 69 # We have to nest variables inside variables so that they can be overridden
69 # through GYP_DEFINES. 70 # through GYP_DEFINES.
70 'variables': { 71 'variables': {
71 'use_accelerated_compositing%': 1, 72 'use_accelerated_compositing%': 1,
72 'enable_svg%': 1, 73 'enable_svg%': 1,
73 'enable_touch_events%': 1, 74 'enable_touch_events%': 1,
74 'use_skia_gpu%': 0, 75 'use_skia_gpu%': 0,
(...skipping 21 matching lines...) Expand all
96 # require changes in gyp. 97 # require changes in gyp.
97 }, 98 },
98 99
99 } 100 }
100 101
101 # Local Variables: 102 # Local Variables:
102 # tab-width:2 103 # tab-width:2
103 # indent-tabs-mode:nil 104 # indent-tabs-mode:nil
104 # End: 105 # End:
105 # vim: set expandtab tabstop=2 shiftwidth=2: 106 # vim: set expandtab tabstop=2 shiftwidth=2:
OLDNEW
« no previous file with comments | « no previous file | webkit/tools/layout_tests/test_expectations.txt » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698