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

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

Issue 100103008: Remove ENCRYPTED_MEDIA_V2 as it is always set. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 7 years 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
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 15 matching lines...) Expand all
26 # THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 26 # THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
27 # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE 27 # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
28 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 28 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
29 # 29 #
30 30
31 { 31 {
32 # The following defines turn WebKit features on and off. 32 # The following defines turn WebKit features on and off.
33 'variables': { 33 'variables': {
34 'feature_defines': [ 34 'feature_defines': [
35 'ENABLE_CUSTOM_SCHEME_HANDLER=0', 35 'ENABLE_CUSTOM_SCHEME_HANDLER=0',
36 'ENABLE_ENCRYPTED_MEDIA_V2=1',
37 'ENABLE_SVG_FONTS=1', 36 'ENABLE_SVG_FONTS=1',
38 'ENABLE_GDI_FONTS_ON_WINDOWS=0', 37 'ENABLE_GDI_FONTS_ON_WINDOWS=0',
39 'ENABLE_HARFBUZZ_ON_WINDOWS=1', 38 'ENABLE_HARFBUZZ_ON_WINDOWS=1',
40 'ENABLE_TOUCH_ICON_LOADING=<(enable_touch_icon_loading)', 39 'ENABLE_TOUCH_ICON_LOADING=<(enable_touch_icon_loading)',
41 # WTF_USE_DYNAMIC_ANNOTATIONS=1 may be defined in build/common.gypi 40 # WTF_USE_DYNAMIC_ANNOTATIONS=1 may be defined in build/common.gypi
42 # We can't define it here because it should be present only 41 # We can't define it here because it should be present only
43 # in Debug or release_valgrind_build=1 builds. 42 # in Debug or release_valgrind_build=1 builds.
44 ], 43 ],
45 # We have to nest variables inside variables so that they can be overridden 44 # We have to nest variables inside variables so that they can be overridden
46 # through GYP_DEFINES. 45 # through GYP_DEFINES.
(...skipping 52 matching lines...) Expand 10 before | Expand all | Expand 10 after
99 ], 98 ],
100 }], 99 }],
101 ['enable_oilpan==1', { 100 ['enable_oilpan==1', {
102 'feature_defines': [ 101 'feature_defines': [
103 'ENABLE_OILPAN=1', 102 'ENABLE_OILPAN=1',
104 ], 103 ],
105 }], 104 }],
106 ], 105 ],
107 }, 106 },
108 } 107 }
OLDNEW
« no previous file with comments | « no previous file | Source/core/events/EventTargetFactory.in » ('j') | Source/core/html/HTMLMediaElement.cpp » ('J')

Powered by Google App Engine
This is Rietveld 408576698