Merge 136785

Source/WebKit/chromium/src/WebRuntimeFeatures.cpp

Index: Source/WebKit/chromium/src/WebRuntimeFeatures.cpp
===================================================================
--- Source/WebKit/chromium/src/WebRuntimeFeatures.cpp	(revision 137209)
+++ Source/WebKit/chromium/src/WebRuntimeFeatures.cpp	(working copy)
@@ -657,4 +657,22 @@
     return RuntimeEnabledFeatures::cssExclusionsEnabled();
 }
 
+void WebRuntimeFeatures::enableWebIntents(bool enable)
+{
+#if ENABLE(WEB_INTENTS)
+    RuntimeEnabledFeatures::setWebIntentsEnabled(enable);
+#else
+    UNUSED_PARAM(enable);
+#endif
+}
+
+bool WebRuntimeFeatures::isWebIntentsEnabled()
+{
+#if ENABLE(WEB_INTENTS)
+    return RuntimeEnabledFeatures::webkitStartActivityEnabled();
+#else
+    return false;
+#endif
+}
+
 } // namespace WebKit