Modified: trunk/Source/WebKit/chromium/features.gypi (95271 => 95272)
--- trunk/Source/WebKit/chromium/features.gypi 2011-09-16 05:41:19 UTC (rev 95271)
+++ trunk/Source/WebKit/chromium/features.gypi 2011-09-16 05:43:11 UTC (rev 95272)
@@ -38,7 +38,6 @@
'ENABLE_CHANNEL_MESSAGING=1',
'ENABLE_CLIENT_BASED_GEOLOCATION=1',
'ENABLE_DASHBOARD_SUPPORT=0',
- 'ENABLE_DATABASE=1',
'ENABLE_DATA_TRANSFER_ITEMS=1',
'ENABLE_DETAILS=1',
'ENABLE_DEVICE_ORIENTATION=1',
@@ -46,7 +45,6 @@
'ENABLE_DOM_STORAGE=1',
'ENABLE_DOWNLOAD_ATTRIBUTE=1',
'ENABLE_EVENTSOURCE=1',
- 'ENABLE_JAVASCRIPT_I18N_API=1',
'ENABLE_FILE_SYSTEM=1',
'ENABLE_FILTERS=1',
'ENABLE_FULLSCREEN_API=1',
@@ -57,12 +55,13 @@
'ENABLE_INDEXED_DATABASE=1',
'ENABLE_INPUT_SPEECH=1',
'ENABLE_JAVASCRIPT_DEBUGGER=1',
+ 'ENABLE_JAVASCRIPT_I18N_API=1',
'ENABLE_JSC_MULTIPLE_THREADS=0',
'ENABLE_LEVELDB=1',
'ENABLE_LINK_PREFETCH=1',
- 'ENABLE_METER_TAG=1',
'ENABLE_MEDIA_STATISTICS=1',
'ENABLE_MEDIA_STREAM=1',
+ 'ENABLE_METER_TAG=1',
'ENABLE_MHTML=1',
'ENABLE_NOTIFICATIONS=1',
'ENABLE_OFFLINE_WEB_APPLICATIONS=1',
@@ -77,15 +76,16 @@
'ENABLE_SHARED_WORKERS=1',
'ENABLE_SKIA_GPU=<(use_skia_gpu)',
'ENABLE_SMOOTH_SCROLLING=1',
+ 'ENABLE_SQL_DATABASE=1',
'ENABLE_SVG=<(enable_svg)',
'ENABLE_SVG_FONTS=<(enable_svg)',
'ENABLE_TOUCH_EVENTS=<(enable_touch_events)',
'ENABLE_TOUCH_ICON_LOADING=<(enable_touch_icon_loading)',
'ENABLE_V8_SCRIPT_DEBUG_SERVER=1',
'ENABLE_VIDEO=1',
+ 'ENABLE_WEBGL=1',
'ENABLE_WEB_SOCKETS=1',
'ENABLE_WEB_TIMING=1',
- 'ENABLE_WEBGL=1',
'ENABLE_WORKERS=1',
'ENABLE_XHR_RESPONSE_BLOB=1',
'ENABLE_XPATH=1',