Merge 136785

Source/WebCore/bindings/generic/RuntimeEnabledFeatures.h

Index: Source/WebCore/bindings/generic/RuntimeEnabledFeatures.h
===================================================================
--- Source/WebCore/bindings/generic/RuntimeEnabledFeatures.h	(revision 137209)
+++ Source/WebCore/bindings/generic/RuntimeEnabledFeatures.h	(working copy)
@@ -259,6 +259,13 @@
     // The lang attribute support is incomplete and should only be turned on for tests.
     static void setLangAttributeAwareFormControlUIEnabled(bool isEnabled) { isLangAttributeAwareFormControlUIEnabled = isEnabled; }
 
+#if ENABLE(WEB_INTENTS)
+    static bool webkitStartActivityEnabled() { return isWebIntentsEnabled; }
+    static bool webkitIntentEnabled() { return isWebIntentsEnabled; }
+    static bool webKitIntentEnabled() { return isWebIntentsEnabled; }
+    static void setWebIntentsEnabled(bool isEnabled) { isWebIntentsEnabled = isEnabled; }
+#endif
+
 private:
     // Never instantiate.
     RuntimeEnabledFeatures() { }
@@ -359,6 +366,11 @@
 #if ENABLE(DIALOG_ELEMENT)
     static bool isDialogElementEnabled;
 #endif
+
+#if ENABLE(WEB_INTENTS)
+    static bool isWebIntentsEnabled;
+#endif
+
 };
 
 } // namespace WebCore