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

Side by Side Diff: Source/core/features.gypi

Issue 15178010: Remove ENABLE_ENCRYPTED_MEDIA #define as it's always enabled (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 7 years, 7 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 | « Source/core/dom/EventNames.in ('k') | Source/core/html/HTMLMediaElement.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 # 1 #
2 # Copyright (C) 2009 Google Inc. All rights reserved. 2 # Copyright (C) 2009 Google Inc. All rights reserved.
3 # 3 #
4 # Redistribution and use in source and binary forms, with or without 4 # Redistribution and use in source and binary forms, with or without
5 # modification, are permitted provided that the following conditions are 5 # modification, are permitted provided that the following conditions are
6 # met: 6 # met:
7 # 7 #
8 # * Redistributions of source code must retain the above copyright 8 # * Redistributions of source code must retain the above copyright
9 # notice, this list of conditions and the following disclaimer. 9 # notice, this list of conditions and the following disclaimer.
10 # * Redistributions in binary form must reproduce the above 10 # * Redistributions in binary form must reproduce the above
(...skipping 22 matching lines...) Expand all
33 'variables': { 33 'variables': {
34 'feature_defines': [ 34 'feature_defines': [
35 'ENABLE_3D_PLUGIN=1', 35 'ENABLE_3D_PLUGIN=1',
36 'ENABLE_BATTERY_STATUS=0', 36 'ENABLE_BATTERY_STATUS=0',
37 'ENABLE_CANVAS_USES_MAILBOX=0', # Requires crbug.com/230137 to be fixed 37 'ENABLE_CANVAS_USES_MAILBOX=0', # Requires crbug.com/230137 to be fixed
38 'ENABLE_CSS3_TEXT=0', 38 'ENABLE_CSS3_TEXT=0',
39 'ENABLE_CSS_DEVICE_ADAPTATION=0', 39 'ENABLE_CSS_DEVICE_ADAPTATION=0',
40 'ENABLE_CSS_EXCLUSIONS=1', 40 'ENABLE_CSS_EXCLUSIONS=1',
41 'ENABLE_CSS_REGIONS=1', 41 'ENABLE_CSS_REGIONS=1',
42 'ENABLE_CUSTOM_SCHEME_HANDLER=0', 42 'ENABLE_CUSTOM_SCHEME_HANDLER=0',
43 'ENABLE_ENCRYPTED_MEDIA=1',
44 'ENABLE_SVG=1', 43 'ENABLE_SVG=1',
45 'ENABLE_SVG_FONTS=1', 44 'ENABLE_SVG_FONTS=1',
46 'ENABLE_TOUCH_ICON_LOADING=<(enable_touch_icon_loading)', 45 'ENABLE_TOUCH_ICON_LOADING=<(enable_touch_icon_loading)',
47 'ENABLE_WEBGL=1', 46 'ENABLE_WEBGL=1',
48 'ENABLE_XHR_TIMEOUT=0', 47 'ENABLE_XHR_TIMEOUT=0',
49 # WTF_USE_DYNAMIC_ANNOTATIONS=1 may be defined in build/common.gypi 48 # WTF_USE_DYNAMIC_ANNOTATIONS=1 may be defined in build/common.gypi
50 # We can't define it here because it should be present only 49 # We can't define it here because it should be present only
51 # in Debug or release_valgrind_build=1 builds. 50 # in Debug or release_valgrind_build=1 builds.
52 ], 51 ],
53 # We have to nest variables inside variables so that they can be overridden 52 # We have to nest variables inside variables so that they can be overridden
(...skipping 86 matching lines...) Expand 10 before | Expand all | Expand 10 after
140 ], 139 ],
141 }], 140 }],
142 ['use_default_render_theme==1', { 141 ['use_default_render_theme==1', {
143 'feature_defines': [ 142 'feature_defines': [
144 'ENABLE_DEFAULT_RENDER_THEME=1', 143 'ENABLE_DEFAULT_RENDER_THEME=1',
145 ], 144 ],
146 }], 145 }],
147 ], 146 ],
148 }, 147 },
149 } 148 }
OLDNEW
« no previous file with comments | « Source/core/dom/EventNames.in ('k') | Source/core/html/HTMLMediaElement.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698