Modified: trunk/Source/WebKit/chromium/ChangeLog (88426 => 88427)
--- trunk/Source/WebKit/chromium/ChangeLog 2011-06-09 06:07:55 UTC (rev 88426)
+++ trunk/Source/WebKit/chromium/ChangeLog 2011-06-09 06:37:25 UTC (rev 88427)
@@ -1,5 +1,12 @@
2011-06-08 James Robinson <jam...@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 <jam...@chromium.org>
+
Set ENABLE_REGISTER_PROTOCOL_HANDLER=1 for chromium. I didn't mean to turn that off...
* features.gypi:
Modified: trunk/Source/WebKit/chromium/features.gypi (88426 => 88427)
--- trunk/Source/WebKit/chromium/features.gypi 2011-06-09 06:07:55 UTC (rev 88426)
+++ trunk/Source/WebKit/chromium/features.gypi 2011-06-09 06:37:25 UTC (rev 88427)
@@ -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',
@@ -108,10 +107,21 @@
'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',
+ ]
+ }],
+ ],
},
}
