<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[209443] trunk/Source/WebKit2</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/209443">209443</a></dd>
<dt>Author</dt> <dd>dino@apple.com</dd>
<dt>Date</dt> <dd>2016-12-06 20:24:02 -0800 (Tue, 06 Dec 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>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):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPIAPIExperimentalFeaturecpp">trunk/Source/WebKit2/UIProcess/API/APIExperimentalFeature.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPIAPIExperimentalFeatureh">trunk/Source/WebKit2/UIProcess/API/APIExperimentalFeature.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPICocoa_WKExperimentalFeatureh">trunk/Source/WebKit2/UIProcess/API/Cocoa/_WKExperimentalFeature.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPICocoa_WKExperimentalFeaturemm">trunk/Source/WebKit2/UIProcess/API/Cocoa/_WKExperimentalFeature.mm</a></li>
<li><a href="#trunkSourceWebKit2UIProcessWebPreferencescpp">trunk/Source/WebKit2/UIProcess/WebPreferences.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (209442 => 209443)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -1,3 +1,25 @@
</span><ins>+2016-12-06 Dean Jackson <dino@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):
+
</ins><span class="cx"> 2016-12-06 Commit Queue <commit-queue@webkit.org>
</span><span class="cx">
</span><span class="cx"> Unreviewed, rolling out r209391.
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPIAPIExperimentalFeaturecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/APIExperimentalFeature.cpp (209442 => 209443)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -28,15 +28,16 @@
</span><span class="cx">
</span><span class="cx"> namespace API {
</span><span class="cx">
</span><del>-Ref<ExperimentalFeature> ExperimentalFeature::create(const WTF::String& name, const WTF::String& key, const WTF::String& details)
</del><ins>+Ref<ExperimentalFeature> ExperimentalFeature::create(const WTF::String& name, const WTF::String& key, const WTF::String& details, bool defaultValue)
</ins><span class="cx"> {
</span><del>- return adoptRef(*new ExperimentalFeature(name, key, details));
</del><ins>+ return adoptRef(*new ExperimentalFeature(name, key, details, defaultValue));
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-ExperimentalFeature::ExperimentalFeature(const WTF::String& name, const WTF::String& key, const WTF::String& details)
</del><ins>+ExperimentalFeature::ExperimentalFeature(const WTF::String& name, const WTF::String& key, const WTF::String& details, bool defaultValue)
</ins><span class="cx"> : m_name(name)
</span><span class="cx"> , m_key(key)
</span><span class="cx"> , m_details(details)
</span><ins>+ , m_defaultValue(defaultValue)
</ins><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPIAPIExperimentalFeatureh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/APIExperimentalFeature.h (209442 => 209443)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -33,19 +33,21 @@
</span><span class="cx">
</span><span class="cx"> class ExperimentalFeature final : public ObjectImpl<Object::Type::ExperimentalFeature> {
</span><span class="cx"> public:
</span><del>- static Ref<ExperimentalFeature> create(const WTF::String& name, const WTF::String& key, const WTF::String& details);
</del><ins>+ static Ref<ExperimentalFeature> create(const WTF::String& name, const WTF::String& key, const WTF::String& details, bool defaultValue);
</ins><span class="cx"> virtual ~ExperimentalFeature();
</span><span class="cx">
</span><span class="cx"> WTF::String name() const { return m_name; }
</span><span class="cx"> WTF::String key() const { return m_key; }
</span><span class="cx"> WTF::String details() const { return m_details; }
</span><ins>+ bool defaultValue() const { return m_defaultValue; }
</ins><span class="cx">
</span><span class="cx"> private:
</span><del>- explicit ExperimentalFeature(const WTF::String& name, const WTF::String& key, const WTF::String& details);
</del><ins>+ explicit ExperimentalFeature(const WTF::String& name, const WTF::String& key, const WTF::String& details, bool defaultValue);
</ins><span class="cx">
</span><span class="cx"> WTF::String m_name;
</span><span class="cx"> WTF::String m_key;
</span><span class="cx"> WTF::String m_details;
</span><ins>+ bool m_defaultValue;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICocoa_WKExperimentalFeatureh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/_WKExperimentalFeature.h (209442 => 209443)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -35,6 +35,7 @@
</span><span class="cx"> @property (nonatomic, readonly, copy) NSString *key;
</span><span class="cx"> @property (nonatomic, readonly, copy) NSString *name;
</span><span class="cx"> @property (nonatomic, readonly, copy) NSString *details;
</span><ins>+@property (nonatomic, readonly) BOOL defaultValue;
</ins><span class="cx">
</span><span class="cx"> @end
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICocoa_WKExperimentalFeaturemm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/_WKExperimentalFeature.mm (209442 => 209443)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -39,7 +39,7 @@
</span><span class="cx">
</span><span class="cx"> - (NSString *)description
</span><span class="cx"> {
</span><del>- return [NSString stringWithFormat:@"<%@: %p; name = %@; key = { %@ }>", NSStringFromClass(self.class), self, self.name, self.key];
</del><ins>+ return [NSString stringWithFormat:@"<%@: %p; name = %@; key = %@; defaultValue = %s >", NSStringFromClass(self.class), self, self.name, self.key, self.defaultValue ? "on" : "off"];
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> - (NSString *)name
</span><span class="lines">@@ -57,6 +57,11 @@
</span><span class="cx"> return _experimentalFeature->details();
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+- (BOOL)defaultValue
+{
+ return _experimentalFeature->defaultValue();
+}
+
</ins><span class="cx"> #pragma mark WKObject protocol implementation
</span><span class="cx">
</span><span class="cx"> - (API::Object&)_apiObject
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebPreferencescpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebPreferences.cpp (209442 => 209443)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -218,7 +218,7 @@
</span><span class="cx"> Vector<RefPtr<API::Object>> features;
</span><span class="cx">
</span><span class="cx"> #define ADD_EXPERIMENTAL_PREFERENCE_DESCRIPTION(KeyUpper, KeyLower, TypeName, Type, DefaultValue, HumanReadableName, HumanReadableDescription) \
</span><del>- features.append(API::ExperimentalFeature::create(HumanReadableName, #KeyUpper, HumanReadableDescription)); \
</del><ins>+ features.append(API::ExperimentalFeature::create(HumanReadableName, #KeyUpper, HumanReadableDescription, DefaultValue)); \
</ins><span class="cx">
</span><span class="cx"> FOR_EACH_WEBKIT_EXPERIMENTAL_FEATURE_PREFERENCE(ADD_EXPERIMENTAL_PREFERENCE_DESCRIPTION)
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>