Upstream version 7.36.149.0

[platform/framework/web/crosswalk.git] / src / third_party / WebKit / Source / config.gyp

diff --git a/src/third_party/WebKit/Source/config.gyp b/src/third_party/WebKit/Source/config.gyp
index 52da069..08fdfd1 100644 (file)
--- a/src/third_party/WebKit/Source/config.gyp
+++ b/src/third_party/WebKit/Source/config.gyp
@@ -32,6 +32,13 @@
     # If set to 1, doesn't compile debug symbols into webcore reducing the
     # size of the binary and increasing the speed of gdb.  gcc only.
     'remove_webcore_debug_symbols%': 0,
+    'enable_oilpan%': 0,
+    # If set to 1 (default) and using clang, the Blink GC plugin will check the
+    # usage of the garbage-collection infrastructure during compilation.
+    'blink_gc_plugin%': 1,
+    # If set to 1 together with blink_gc_plugin, the Blink GC plugin will dump
+    # points-to graph files for each compilation unit.
+    'blink_gc_plugin_dump_graph%': 0,
   },
   'targets': [
   {
@@ -43,8 +50,11 @@
         '..',
       ],
       'msvs_disabled_warnings': [
-        4138, 4244, 4291, 4305, 4344, 4355, 4521, 4099,
+        4305, 4324, 4714, 4800, 4996,
       ],
+      'variables': {
+        'chromium_code': 1,
+      },
       'conditions': [
         ['OS=="win" and component=="shared_library"', {
           'defines': [
@@ -65,11 +75,6 @@
             ['exclude', 'Mac\\.mm$'],
           ],
         }],
-        ['<(toolkit_uses_gtk) != 1', {
-            'sources/': [
-              ['exclude', 'Gtk\\.cpp$']
-            ]
-        }],
         ['OS!="android"', {
           'sources/': [
             ['exclude', 'Android\\.cpp$'],
@@ -89,18 +94,19 @@
           # timesNewRoman.unstatic.3258 and colorTransparent.unstatic.4879.
           'cflags': ['-Wno-uninitialized'],
         }],
-        ['OS!="win"', {
-          # TODO: Turn this on on all platforms, http://crbug.com/312287
-          'variables': {
-            'chromium_code': 1,
-          },
-        }],
         ['clang==1', {
           'cflags': ['-Wglobal-constructors'],
           'xcode_settings': {
             'WARNING_CFLAGS': ['-Wglobal-constructors'],
           },
         }],
+        # Only enable the blink_gc_plugin when using clang and chrome plugins.
+        ['blink_gc_plugin==1 and clang==1 and clang_use_chrome_plugins==1', {
+          'cflags': ['<!@(../../../tools/clang/scripts/blink_gc_plugin_flags.sh enable-oilpan=<(enable_oilpan) dump-graph=<(blink_gc_plugin_dump_graph))'],
+          'xcode_settings': {
+            'OTHER_CFLAGS': ['<!@(../../../tools/clang/scripts/blink_gc_plugin_flags.sh enable-oilpan=<(enable_oilpan) dump-graph=<(blink_gc_plugin_dump_graph))'],
+          },
+        }],
       ],
     },
   },
@@ -122,6 +128,9 @@
       'xcode_settings': {
         'WARNING_CFLAGS!': ['-Wglobal-constructors'],
       },
+      'variables': {
+        'chromium_code': 1,
+      },
     },
   }
   ],