Upstream version 7.36.149.0

[platform/framework/web/crosswalk.git] / src / third_party / WebKit / Source / build / features.gypi

diff --git a/src/third_party/WebKit/Source/build/features.gypi b/src/third_party/WebKit/Source/build/features.gypi
index 3991bbb..0961881 100644 (file)
--- a/src/third_party/WebKit/Source/build/features.gypi
+++ b/src/third_party/WebKit/Source/build/features.gypi
@@ -42,7 +42,8 @@
     # through GYP_DEFINES.
     'variables': {
       # Enables the Oilpan garbage-collection infrastructure.
-      'enable_oilpan%': 0
+      'enable_oilpan%': 0,
+      'gc_tracing%': 0
     },
     'conditions': [
       ['use_concatenated_impulse_responses==1', {
@@ -52,12 +53,10 @@
       ['OS=="android"', {
         'feature_defines': [
           'ENABLE_FAST_MOBILE_SCROLLING=1',
-          'ENABLE_INPUT_SPEECH=0',
           'ENABLE_MEDIA_CAPTURE=1'
         ],
       }, { # OS!="android"
         'feature_defines': [
-          'ENABLE_INPUT_SPEECH=1',
           'ENABLE_INPUT_MULTIPLE_FIELDS_UI=1',
           'ENABLE_MEDIA_CAPTURE=0',
           'ENABLE_WEB_AUDIO=1'
@@ -93,6 +92,11 @@
           'ENABLE_OILPAN=1',
         ],
       }],
+      ['gc_tracing==1', {
+        'feature_defines': [
+          'ENABLE_GC_TRACING=1',
+        ],
+      }],
     ],
   },
 }