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

Side by Side Diff: Source/WebKit/chromium/features.gypi

Issue 12382019: Merge 143917 (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/1410/
Patch Set: Created 7 years, 9 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
« no previous file with comments | « no previous file | Source/WebKit/chromium/src/ChromeClientImpl.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 76 matching lines...) Expand 10 before | Expand all | Expand 10 after
87 'ENABLE_LINK_PREFETCH=1', 87 'ENABLE_LINK_PREFETCH=1',
88 'ENABLE_LINK_PRERENDER=1', 88 'ENABLE_LINK_PRERENDER=1',
89 'ENABLE_MATHML=0', 89 'ENABLE_MATHML=0',
90 'ENABLE_MEDIA_SOURCE=1', 90 'ENABLE_MEDIA_SOURCE=1',
91 'ENABLE_MEDIA_STATISTICS=1', 91 'ENABLE_MEDIA_STATISTICS=1',
92 'ENABLE_MEDIA_STREAM=<(enable_webrtc)', 92 'ENABLE_MEDIA_STREAM=<(enable_webrtc)',
93 'ENABLE_METER_ELEMENT=1', 93 'ENABLE_METER_ELEMENT=1',
94 'ENABLE_MHTML=1', 94 'ENABLE_MHTML=1',
95 'ENABLE_MICRODATA=0', 95 'ENABLE_MICRODATA=0',
96 'ENABLE_MOUSE_CURSOR_SCALE=1', 96 'ENABLE_MOUSE_CURSOR_SCALE=1',
97 'ENABLE_NAVIGATOR_CONTENT_UTILS=1',
98 'ENABLE_NOSNIFF=1', 97 'ENABLE_NOSNIFF=1',
99 'ENABLE_PAGE_VISIBILITY_API=1', 98 'ENABLE_PAGE_VISIBILITY_API=1',
100 'ENABLE_PERFORMANCE_TIMELINE=1', 99 'ENABLE_PERFORMANCE_TIMELINE=1',
101 'ENABLE_POINTER_LOCK=1', 100 'ENABLE_POINTER_LOCK=1',
102 'ENABLE_PROGRESS_ELEMENT=1', 101 'ENABLE_PROGRESS_ELEMENT=1',
103 'ENABLE_PROXIMITY_EVENTS=0', 102 'ENABLE_PROXIMITY_EVENTS=0',
104 'ENABLE_QUOTA=1', 103 'ENABLE_QUOTA=1',
105 'ENABLE_REQUEST_ANIMATION_FRAME=1', 104 'ENABLE_REQUEST_ANIMATION_FRAME=1',
106 'ENABLE_REQUEST_AUTOCOMPLETE=1', 105 'ENABLE_REQUEST_AUTOCOMPLETE=1',
107 'ENABLE_RESOLUTION_MEDIA_QUERY=0', 106 'ENABLE_RESOLUTION_MEDIA_QUERY=0',
(...skipping 60 matching lines...) Expand 10 before | Expand all | Expand 10 after
168 'ENABLE_FAST_MOBILE_SCROLLING=1', 167 'ENABLE_FAST_MOBILE_SCROLLING=1',
169 'ENABLE_INPUT_SPEECH=0', 168 'ENABLE_INPUT_SPEECH=0',
170 'ENABLE_INPUT_TYPE_COLOR=0', 169 'ENABLE_INPUT_TYPE_COLOR=0',
171 'ENABLE_INPUT_TYPE_WEEK=0', 170 'ENABLE_INPUT_TYPE_WEEK=0',
172 'ENABLE_LEGACY_NOTIFICATIONS=0', 171 'ENABLE_LEGACY_NOTIFICATIONS=0',
173 'ENABLE_MEDIA_CAPTURE=1', 172 'ENABLE_MEDIA_CAPTURE=1',
174 'ENABLE_NOTIFICATIONS=0', 173 'ENABLE_NOTIFICATIONS=0',
175 'ENABLE_ORIENTATION_EVENTS=1', 174 'ENABLE_ORIENTATION_EVENTS=1',
176 'ENABLE_PAGE_POPUP=0', 175 'ENABLE_PAGE_POPUP=0',
177 'ENABLE_PRINTING=0', 176 'ENABLE_PRINTING=0',
178 'ENABLE_REGISTER_PROTOCOL_HANDLER=0', 177 'ENABLE_NAVIGATOR_CONTENT_UTILS=0',
179 # FIXME: Disable once the linking error has been resolved. 178 # FIXME: Disable once the linking error has been resolved.
180 # https://bugs.webkit.org/show_bug.cgi?id=88636 179 # https://bugs.webkit.org/show_bug.cgi?id=88636
181 'ENABLE_SHARED_WORKERS=1', 180 'ENABLE_SHARED_WORKERS=1',
182 'ENABLE_WEB_AUDIO=0', 181 'ENABLE_WEB_AUDIO=0',
183 'WTF_USE_NATIVE_FULLSCREEN_VIDEO=1', 182 'WTF_USE_NATIVE_FULLSCREEN_VIDEO=1',
184 ], 183 ],
185 'enable_touch_icon_loading': 1, 184 'enable_touch_icon_loading': 1,
186 }, { # OS!="android" 185 }, { # OS!="android"
187 'feature_defines': [ 186 'feature_defines': [
188 'ENABLE_CALENDAR_PICKER=1', 187 'ENABLE_CALENDAR_PICKER=1',
189 'ENABLE_DATALIST_ELEMENT=1', 188 'ENABLE_DATALIST_ELEMENT=1',
190 'ENABLE_INPUT_SPEECH=1', 189 'ENABLE_INPUT_SPEECH=1',
191 'ENABLE_INPUT_TYPE_COLOR=1', 190 'ENABLE_INPUT_TYPE_COLOR=1',
192 'ENABLE_INPUT_TYPE_WEEK=1', 191 'ENABLE_INPUT_TYPE_WEEK=1',
193 'ENABLE_INPUT_MULTIPLE_FIELDS_UI=1', 192 'ENABLE_INPUT_MULTIPLE_FIELDS_UI=1',
194 'ENABLE_LEGACY_NOTIFICATIONS=1', 193 'ENABLE_LEGACY_NOTIFICATIONS=1',
195 'ENABLE_MEDIA_CAPTURE=0', 194 'ENABLE_MEDIA_CAPTURE=0',
195 'ENABLE_NAVIGATOR_CONTENT_UTILS=1',
196 'ENABLE_NOTIFICATIONS=1', 196 'ENABLE_NOTIFICATIONS=1',
197 'ENABLE_ORIENTATION_EVENTS=0', 197 'ENABLE_ORIENTATION_EVENTS=0',
198 'ENABLE_PAGE_POPUP=1', 198 'ENABLE_PAGE_POPUP=1',
199 'ENABLE_PRINTING=1', 199 'ENABLE_PRINTING=1',
200 'ENABLE_SHARED_WORKERS=1', 200 'ENABLE_SHARED_WORKERS=1',
201 'ENABLE_WEB_AUDIO=1', 201 'ENABLE_WEB_AUDIO=1',
202 ], 202 ],
203 }], 203 }],
204 ['OS=="linux" or OS=="mac"', { 204 ['OS=="linux" or OS=="mac"', {
205 'feature_defines': [ 205 'feature_defines': [
(...skipping 49 matching lines...) Expand 10 before | Expand all | Expand 10 after
255 ], 255 ],
256 }], 256 }],
257 ['use_default_render_theme==1', { 257 ['use_default_render_theme==1', {
258 'feature_defines': [ 258 'feature_defines': [
259 'ENABLE_DEFAULT_RENDER_THEME=1', 259 'ENABLE_DEFAULT_RENDER_THEME=1',
260 ], 260 ],
261 }], 261 }],
262 ], 262 ],
263 }, 263 },
264 } 264 }
OLDNEW
« no previous file with comments | « no previous file | Source/WebKit/chromium/src/ChromeClientImpl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698