Webkit Roll 61360:61384

build/features_override.gypi

Index: build/features_override.gypi
===================================================================
--- build/features_override.gypi	(revision 50181)
+++ build/features_override.gypi	(working copy)
@@ -13,38 +13,40 @@
       'ENABLE_3D_CANVAS=1',
       'ENABLE_BLOB_SLICE=1',
       'ENABLE_CHANNEL_MESSAGING=1',
+      'ENABLE_DASHBOARD_SUPPORT=0',
       'ENABLE_DATABASE=1',
       'ENABLE_DATAGRID=0',
+      'ENABLE_DOM_STORAGE=1',
       'ENABLE_EVENTSOURCE=1',
-      'ENABLE_OFFLINE_WEB_APPLICATIONS=1',
-      'ENABLE_DASHBOARD_SUPPORT=0',
-      'ENABLE_DOM_STORAGE=1',
-      'ENABLE_INDEXED_DATABASE=1',
       'ENABLE_FILE_READER=1',
       'ENABLE_FILTERS=1',
       'ENABLE_GEOLOCATION=1',
+      'ENABLE_ICONDATABASE=0',
+      'ENABLE_INDEXED_DATABASE=1',
       'ENABLE_JAVASCRIPT_DEBUGGER=1',
       'ENABLE_JSC_MULTIPLE_THREADS=0',
-      'ENABLE_ICONDATABASE=0',
+      'ENABLE_METER_TAG=1',
       'ENABLE_NOTIFICATIONS=1',
+      'ENABLE_OFFLINE_WEB_APPLICATIONS=1',
       'ENABLE_OPENTYPE_SANITIZER=1',
       'ENABLE_ORIENTATION_EVENTS=0',
+      'ENABLE_PROGRESS_TAG=1',
       'ENABLE_RUBY=1',
       'ENABLE_SANDBOX=1',
-      'ENABLE_XSLT=1',
-      'ENABLE_XPATH=1',
       'ENABLE_SHARED_WORKERS=1',
       'ENABLE_SVG=<(enable_svg)',
       'ENABLE_SVG_ANIMATION=<(enable_svg)',
       'ENABLE_SVG_AS_IMAGE=<(enable_svg)',
+      'ENABLE_SVG_FONTS=<(enable_svg)',
+      'ENABLE_SVG_FOREIGN_OBJECT=<(enable_svg)',
       'ENABLE_SVG_USE=<(enable_svg)',
-      'ENABLE_SVG_FOREIGN_OBJECT=<(enable_svg)',
-      'ENABLE_SVG_FONTS=<(enable_svg)',
       'ENABLE_TOUCH_EVENTS=<(enable_touch_events)',
+      'ENABLE_V8_SCRIPT_DEBUG_SERVER=1',
       'ENABLE_VIDEO=1',
       'ENABLE_WEB_SOCKETS=1',
       'ENABLE_WORKERS=1',
-      'ENABLE_V8_SCRIPT_DEBUG_SERVER=1',
+      'ENABLE_XPATH=1',
+      'ENABLE_XSLT=1',
     ],
     # We have to nest variables inside variables so that they can be overridden
     # through GYP_DEFINES.