diff options
| author | tkent@google.com <tkent@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-06-18 07:54:20 +0000 |
|---|---|---|
| committer | tkent@google.com <tkent@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-06-18 07:54:20 +0000 |
| commit | ed397d4d202b504fcd319206b8f1c7b36652fd6c (patch) | |
| tree | ee9fe0f68be9ed354cf16e9886fdea4dd1911149 /build/features_override.gypi | |
| parent | f3b61f9de846be52ecd105039c4d548e3053234c (diff) | |
| download | chromium_src-ed397d4d202b504fcd319206b8f1c7b36652fd6c.zip chromium_src-ed397d4d202b504fcd319206b8f1c7b36652fd6c.tar.gz chromium_src-ed397d4d202b504fcd319206b8f1c7b36652fd6c.tar.bz2 | |
- Webkit Roll 61360:61384
- Enable PROGRESS_TAG and METER_TAG
BUG=none
TEST=none
TBR=dglazkov,hclam
Review URL: http://codereview.chromium.org/2818015
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@50216 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'build/features_override.gypi')
| -rw-r--r-- | build/features_override.gypi | 22 |
1 files changed, 12 insertions, 10 deletions
diff --git a/build/features_override.gypi b/build/features_override.gypi index fa47429..6e203b0 100644 --- a/build/features_override.gypi +++ b/build/features_override.gypi @@ -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_EVENTSOURCE=1', - 'ENABLE_OFFLINE_WEB_APPLICATIONS=1', - 'ENABLE_DASHBOARD_SUPPORT=0', 'ENABLE_DOM_STORAGE=1', - 'ENABLE_INDEXED_DATABASE=1', + 'ENABLE_EVENTSOURCE=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_USE=<(enable_svg)', - 'ENABLE_SVG_FOREIGN_OBJECT=<(enable_svg)', 'ENABLE_SVG_FONTS=<(enable_svg)', + 'ENABLE_SVG_FOREIGN_OBJECT=<(enable_svg)', + 'ENABLE_SVG_USE=<(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. |