Enable dynamic annotations in WebKit if release_valgrind_build is 1.

TEST=build with Valgrind flags, then `nm out/Release/chrome | grep WTFAnnotate`
BUG=70085

Review URL: http://codereview.chromium.org/6792018

git-svn-id: http://src.chromium.org/svn/trunk/src/build@80423 4ff67af0-8c30-449e-8e8b-ad334ec8d88c

common.gypi

@@ -851,7 +851,10 @@
       },
       'Debug_Base': {
         'abstract': 1,
-        'defines': ['DYNAMIC_ANNOTATIONS_ENABLED=1'],
+        'defines': [
+          'DYNAMIC_ANNOTATIONS_ENABLED=1',
+          'WTF_USE_DYNAMIC_ANNOTATIONS=1',
+        ],
         'xcode_settings': {
           'COPY_PHASE_STRIP': 'NO',
           'GCC_OPTIMIZATION_LEVEL': '<(mac_debug_optimization)',
@@ -927,9 +930,15 @@
         },
         'conditions': [
           ['release_valgrind_build==0', {
-            'defines': ['NVALGRIND', 'DYNAMIC_ANNOTATIONS_ENABLED=0'],
+            'defines': [
+              'NVALGRIND',
+              'DYNAMIC_ANNOTATIONS_ENABLED=0',
+            ],
           }, {
-            'defines': ['DYNAMIC_ANNOTATIONS_ENABLED=1'],
+            'defines': [
+              'DYNAMIC_ANNOTATIONS_ENABLED=1',
+              'WTF_USE_DYNAMIC_ANNOTATIONS=1',
+            ],
           }],
           ['win_use_allocator_shim==0', {
             'defines': ['NO_TCMALLOC'],

features_override.gypi

@@ -64,6 +64,9 @@
       'ENABLE_XPATH=1',
       'ENABLE_XSLT=1',
       'WTF_USE_BUILTIN_UTF8_CODEC=1',
+      # WTF_USE_DYNAMIC_ANNOTATIONS=1 may be defined in build/common.gypi
+      # We can't define it here because it should be present only
+      # in Debug or release_valgrind_build=1 builds.
       'WTF_USE_WEBP=1',
       'WTF_USE_WEBKIT_IMAGE_DECODERS=1',
     ],