Diff
Modified: trunk/Source/WebKit2/ChangeLog (209442 => 209443)
--- trunk/Source/WebKit2/ChangeLog 2016-12-07 03:12:05 UTC (rev 209442)
+++ trunk/Source/WebKit2/ChangeLog 2016-12-07 04:24:02 UTC (rev 209443)
@@ -1,3 +1,25 @@
+2016-12-06 Dean Jackson <d...@apple.com>
+
+ Include default value in Experimental Feature information
+ https://bugs.webkit.org/show_bug.cgi?id=165509
+ <rdar://problems/29547177>
+
+ Reviewed by Tim Horton.
+
+ Add a defaultValue member variable to experimental
+ features, both the C++ and ObjC interfaces.
+
+ * UIProcess/API/APIExperimentalFeature.cpp:
+ (API::ExperimentalFeature::create):
+ (API::ExperimentalFeature::ExperimentalFeature):
+ * UIProcess/API/APIExperimentalFeature.h:
+ * UIProcess/API/Cocoa/_WKExperimentalFeature.h:
+ * UIProcess/API/Cocoa/_WKExperimentalFeature.mm:
+ (-[_WKExperimentalFeature description]):
+ (-[_WKExperimentalFeature defaultValue]):
+ * UIProcess/WebPreferences.cpp:
+ (WebKit::createExperimentalFeaturesVector):
+
2016-12-06 Commit Queue <commit-qu...@webkit.org>
Unreviewed, rolling out r209391.
Modified: trunk/Source/WebKit2/UIProcess/API/APIExperimentalFeature.cpp (209442 => 209443)
--- trunk/Source/WebKit2/UIProcess/API/APIExperimentalFeature.cpp 2016-12-07 03:12:05 UTC (rev 209442)
+++ trunk/Source/WebKit2/UIProcess/API/APIExperimentalFeature.cpp 2016-12-07 04:24:02 UTC (rev 209443)
@@ -28,15 +28,16 @@
namespace API {
-Ref<ExperimentalFeature> ExperimentalFeature::create(const WTF::String& name, const WTF::String& key, const WTF::String& details)
+Ref<ExperimentalFeature> ExperimentalFeature::create(const WTF::String& name, const WTF::String& key, const WTF::String& details, bool defaultValue)
{
- return adoptRef(*new ExperimentalFeature(name, key, details));
+ return adoptRef(*new ExperimentalFeature(name, key, details, defaultValue));
}
-ExperimentalFeature::ExperimentalFeature(const WTF::String& name, const WTF::String& key, const WTF::String& details)
+ExperimentalFeature::ExperimentalFeature(const WTF::String& name, const WTF::String& key, const WTF::String& details, bool defaultValue)
: m_name(name)
, m_key(key)
, m_details(details)
+ , m_defaultValue(defaultValue)
{
}
Modified: trunk/Source/WebKit2/UIProcess/API/APIExperimentalFeature.h (209442 => 209443)
--- trunk/Source/WebKit2/UIProcess/API/APIExperimentalFeature.h 2016-12-07 03:12:05 UTC (rev 209442)
+++ trunk/Source/WebKit2/UIProcess/API/APIExperimentalFeature.h 2016-12-07 04:24:02 UTC (rev 209443)
@@ -33,19 +33,21 @@
class ExperimentalFeature final : public ObjectImpl<Object::Type::ExperimentalFeature> {
public:
- static Ref<ExperimentalFeature> create(const WTF::String& name, const WTF::String& key, const WTF::String& details);
+ static Ref<ExperimentalFeature> create(const WTF::String& name, const WTF::String& key, const WTF::String& details, bool defaultValue);
virtual ~ExperimentalFeature();
WTF::String name() const { return m_name; }
WTF::String key() const { return m_key; }
WTF::String details() const { return m_details; }
+ bool defaultValue() const { return m_defaultValue; }
private:
- explicit ExperimentalFeature(const WTF::String& name, const WTF::String& key, const WTF::String& details);
+ explicit ExperimentalFeature(const WTF::String& name, const WTF::String& key, const WTF::String& details, bool defaultValue);
WTF::String m_name;
WTF::String m_key;
WTF::String m_details;
+ bool m_defaultValue;
};
}
Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/_WKExperimentalFeature.h (209442 => 209443)
--- trunk/Source/WebKit2/UIProcess/API/Cocoa/_WKExperimentalFeature.h 2016-12-07 03:12:05 UTC (rev 209442)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/_WKExperimentalFeature.h 2016-12-07 04:24:02 UTC (rev 209443)
@@ -35,6 +35,7 @@
@property (nonatomic, readonly, copy) NSString *key;
@property (nonatomic, readonly, copy) NSString *name;
@property (nonatomic, readonly, copy) NSString *details;
+@property (nonatomic, readonly) BOOL defaultValue;
@end
Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/_WKExperimentalFeature.mm (209442 => 209443)
--- trunk/Source/WebKit2/UIProcess/API/Cocoa/_WKExperimentalFeature.mm 2016-12-07 03:12:05 UTC (rev 209442)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/_WKExperimentalFeature.mm 2016-12-07 04:24:02 UTC (rev 209443)
@@ -39,7 +39,7 @@
- (NSString *)description
{
- return [NSString stringWithFormat:@"<%@: %p; name = %@; key = { %@ }>", NSStringFromClass(self.class), self, self.name, self.key];
+ return [NSString stringWithFormat:@"<%@: %p; name = %@; key = %@; defaultValue = %s >", NSStringFromClass(self.class), self, self.name, self.key, self.defaultValue ? "on" : "off"];
}
- (NSString *)name
@@ -57,6 +57,11 @@
return _experimentalFeature->details();
}
+- (BOOL)defaultValue
+{
+ return _experimentalFeature->defaultValue();
+}
+
#pragma mark WKObject protocol implementation
- (API::Object&)_apiObject
Modified: trunk/Source/WebKit2/UIProcess/WebPreferences.cpp (209442 => 209443)
--- trunk/Source/WebKit2/UIProcess/WebPreferences.cpp 2016-12-07 03:12:05 UTC (rev 209442)
+++ trunk/Source/WebKit2/UIProcess/WebPreferences.cpp 2016-12-07 04:24:02 UTC (rev 209443)
@@ -218,7 +218,7 @@
Vector<RefPtr<API::Object>> features;
#define ADD_EXPERIMENTAL_PREFERENCE_DESCRIPTION(KeyUpper, KeyLower, TypeName, Type, DefaultValue, HumanReadableName, HumanReadableDescription) \
- features.append(API::ExperimentalFeature::create(HumanReadableName, #KeyUpper, HumanReadableDescription)); \
+ features.append(API::ExperimentalFeature::create(HumanReadableName, #KeyUpper, HumanReadableDescription, DefaultValue)); \
FOR_EACH_WEBKIT_EXPERIMENTAL_FEATURE_PREFERENCE(ADD_EXPERIMENTAL_PREFERENCE_DESCRIPTION)
