Merge 141193

Source/WebKit/chromium/features.gypi

 #
 # Copyright (C) 2009 Google Inc. All rights reserved.
 # 
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are
 # met:
 # 
 #     * Redistributions of source code must retain the above copyright
 # notice, this list of conditions and the following disclaimer.
 #     * Redistributions in binary form must reproduce the above
@@ skipping 16 matching lines @@
 # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #
 
 {
   # The following defines turn WebKit features on and off.
   'variables': {
     'feature_defines': [
       'ENABLE_3D_PLUGIN=1',
       'ENABLE_BATTERY_STATUS=0',
-      'ENABLE_BINDING_INTEGRITY=0',
       'ENABLE_BLOB=1',
       'ENABLE_BLOB_SLICE=1',
       'ENABLE_CHANNEL_MESSAGING=1',
       'ENABLE_CSP_NEXT=1',
       'ENABLE_CSS3_CONDITIONAL_RULES=0',
       'ENABLE_CSS3_TEXT=0',
       'ENABLE_CSS_BOX_DECORATION_BREAK=1',
       'ENABLE_CSS_COMPOSITING=0',
       'ENABLE_CSS_DEVICE_ADAPTATION=0',
       'ENABLE_CSS_EXCLUSIONS=1',
@@ skipping 147 matching lines @@
           'ENABLE_MEDIA_CAPTURE=0',
           'ENABLE_MEDIA_STREAM=1',
           'ENABLE_NOTIFICATIONS=1',
           'ENABLE_ORIENTATION_EVENTS=0',
           'ENABLE_PAGE_POPUP=1',
           'ENABLE_PRINTING=1',
           'ENABLE_SHARED_WORKERS=1',
           'ENABLE_WEB_AUDIO=1',
         ],
       }],
+      ['OS=="linux"', {
+        'feature_defines': [
+          'ENABLE_BINDING_INTEGRITY=1',
+        ],
+      }, { # OS!="linux"
+        'feature_defines': [
+          'ENABLE_BINDING_INTEGRITY=0',
+        ],
+      }],
       ['use_accelerated_compositing==1', {
         'feature_defines': [
           'ENABLE_3D_RENDERING=1',
           'ENABLE_ACCELERATED_2D_CANVAS=1',
           'WTF_USE_ACCELERATED_COMPOSITING=1',
         ],
       }],
       # Mac OS X uses Accelerate.framework FFT by default instead of FFmpeg.
       ['OS!="mac" and OS!="android"', {
         'feature_defines': [
@@ skipping 32 matching lines @@
         ],
       }],
       ['use_default_render_theme==1', {
         'feature_defines': [
           'ENABLE_DEFAULT_RENDER_THEME=1',
         ],
       }],
     ],
   },
 }