2011-06-08 James Robinson <jamesr@chromium.org>
authorjamesr@google.com <jamesr@google.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 9 Jun 2011 06:37:25 +0000 (06:37 +0000)
committerjamesr@google.com <jamesr@google.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 9 Jun 2011 06:37:25 +0000 (06:37 +0000)
        Hopefully last change to features.gypi - set ENABLE_REGISTER_PROTOCOL_HANDLER based off of the the variable set
        in chromium's common.gypi. Should green up the chromium linux tester on build.webkit.org.

        * features.gypi:

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@88427 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Source/WebKit/chromium/ChangeLog
Source/WebKit/chromium/features.gypi

index 04aa554..a31757c 100755 (executable)
@@ -1,5 +1,12 @@
 2011-06-08  James Robinson  <jamesr@chromium.org>
 
+        Hopefully last change to features.gypi - set ENABLE_REGISTER_PROTOCOL_HANDLER based off of the the variable set
+        in chromium's common.gypi. Should green up the chromium linux tester on build.webkit.org.
+
+        * features.gypi:
+
+2011-06-08  James Robinson  <jamesr@chromium.org>
+
         Set ENABLE_REGISTER_PROTOCOL_HANDLER=1 for chromium. I didn't mean to turn that off...
 
         * features.gypi:
index 0168d12..d226752 100644 (file)
@@ -80,7 +80,6 @@
         'ENABLE_PAGE_VISIBILITY_API=1',
         'ENABLE_PROGRESS_TAG=1',
         'ENABLE_QUOTA=1',
-        'ENABLE_REGISTER_PROTOCOL_HANDLER=1',
         'ENABLE_REQUEST_ANIMATION_FRAME=1',
         'ENABLE_SHARED_WORKERS=1',
         'ENABLE_SPELLCHECK_API=1',
 
       'use_accelerated_compositing%': 1,
       'enable_svg%': 1,
+      'enable_register_protocol_handler%': 0,
+
     },
 
     'feature_defines%': '<(feature_defines)',
     'use_accelerated_compositing%': '<(use_accelerated_compositing)',
     'enable_svg%': '<(enable_svg)',
+    'enable_register_protocol_handler%': '<(enable_register_protocol_handler)',
+
+    'conditions': [
+      ['enable_register_protocol_handler==1', {
+        'feature_defines': [
+          'ENABLE_REGISTER_PROTOCOL_HANDLER=1',
+        ]
+      }],
+    ],
   },
 }