<!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>[210253] trunk</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/210253">210253</a></dd>
<dt>Author</dt> <dd>weinig@apple.com</dd>
<dt>Date</dt> <dd>2017-01-03 15:18:45 -0800 (Tue, 03 Jan 2017)</dd>
</dl>
<h3>Log Message</h3>
<pre>Make WTF::Expected support Ref template parameters
https://bugs.webkit.org/show_bug.cgi?id=166662
Reviewed by Alex Christensen.
Source/WTF:
Tests: Added to TestWebKitAPI/Expected.cpp
* wtf/Expected.h:
(WTF::UnexpectedType::value):
Add overloads based on this value type to allow getting at the value
as an rvalue for moving the error into the Expected.
(WTF::Expected::Expected):
Add overload that takes an ErrorType/UnexpectedType<ErrorType> as an rvalue.
(WTF::Expected::swap):
Move the temporary value/error rather than copying.
Tools:
* TestWebKitAPI/Tests/WTF/Expected.cpp:
(TestWebKitAPI::TEST):
Add tests for using Ref with Expected.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWTFChangeLog">trunk/Source/WTF/ChangeLog</a></li>
<li><a href="#trunkSourceWTFwtfExpectedh">trunk/Source/WTF/wtf/Expected.h</a></li>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsTestWebKitAPITestsWTFExpectedcpp">trunk/Tools/TestWebKitAPI/Tests/WTF/Expected.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWTFChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/ChangeLog (210252 => 210253)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/ChangeLog 2017-01-03 23:06:52 UTC (rev 210252)
+++ trunk/Source/WTF/ChangeLog 2017-01-03 23:18:45 UTC (rev 210253)
</span><span class="lines">@@ -1,3 +1,23 @@
</span><ins>+2017-01-03 Sam Weinig <sam@webkit.org>
+
+ Make WTF::Expected support Ref template parameters
+ https://bugs.webkit.org/show_bug.cgi?id=166662
+
+ Reviewed by Alex Christensen.
+
+ Tests: Added to TestWebKitAPI/Expected.cpp
+
+ * wtf/Expected.h:
+ (WTF::UnexpectedType::value):
+ Add overloads based on this value type to allow getting at the value
+ as an rvalue for moving the error into the Expected.
+
+ (WTF::Expected::Expected):
+ Add overload that takes an ErrorType/UnexpectedType<ErrorType> as an rvalue.
+
+ (WTF::Expected::swap):
+ Move the temporary value/error rather than copying.
+
</ins><span class="cx"> 2017-01-02 Julien Brianceau <jbriance@cisco.com>
</span><span class="cx">
</span><span class="cx"> Remove sh4 specific code from JavaScriptCore
</span></span></pre></div>
<a id="trunkSourceWTFwtfExpectedh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/wtf/Expected.h (210252 => 210253)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/wtf/Expected.h 2017-01-03 23:06:52 UTC (rev 210252)
+++ trunk/Source/WTF/wtf/Expected.h 2017-01-03 23:18:45 UTC (rev 210253)
</span><span class="lines">@@ -46,8 +46,9 @@
</span><span class="cx"> UnexpectedType() = delete;
</span><span class="cx"> constexpr explicit UnexpectedType(const E& e) : val(e) { }
</span><span class="cx"> constexpr explicit UnexpectedType(E&& e) : val(std::forward<E>(e)) { }
</span><del>- constexpr const E& value() const { return val; }
- RELAXED_CONSTEXPR E& value() { return val; }
</del><ins>+ constexpr const E& value() const& { return val; }
+ RELAXED_CONSTEXPR E& value() & { return val; }
+ RELAXED_CONSTEXPR E&& value() && { return WTFMove(val); }
</ins><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> E val;
</span><span class="lines">@@ -199,6 +200,7 @@
</span><span class="cx"> constexpr ConstexprBase(ValueTagType tag) : s(tag), has(true) { }
</span><span class="cx"> constexpr ConstexprBase(ErrorTagType tag) : s(tag), has(false) { }
</span><span class="cx"> constexpr ConstexprBase(ErrorTagType tag, const ErrorType& err) : s(tag, err), has(false) { }
</span><ins>+ constexpr ConstexprBase(ErrorTagType tag, ErrorType&& err) : s(tag, std::forward<ErrorType>(err)), has(false) { }
</ins><span class="cx"> ~ConstexprBase() = default;
</span><span class="cx"> };
</span><span class="cx">
</span><span class="lines">@@ -212,6 +214,7 @@
</span><span class="cx"> constexpr Base(ValueTagType tag) : s(tag), has(true) { }
</span><span class="cx"> constexpr Base(ErrorTagType tag) : s(tag), has(false) { }
</span><span class="cx"> constexpr Base(ErrorTagType tag, const ErrorType& err) : s(tag, err), has(false) { }
</span><ins>+ constexpr Base(ErrorTagType tag, ErrorType&& err) : s(tag, std::forward<ErrorType>(err)), has(false) { }
</ins><span class="cx"> Base(const Base& o)
</span><span class="cx"> : has(o.has)
</span><span class="cx"> {
</span><span class="lines">@@ -263,6 +266,7 @@
</span><span class="cx"> // template <class... Args> constexpr explicit Expected(in_place_t, Args&&...);
</span><span class="cx"> // template <class U, class... Args> constexpr explicit Expected(in_place_t, std::initializer_list<U>, Args&&...);
</span><span class="cx"> constexpr Expected(UnexpectedType<ErrorType> const& u) : base(ExpectedDetail::ErrorTag, u.value()) { }
</span><ins>+ constexpr Expected(UnexpectedType<ErrorType>&& u) : base(ExpectedDetail::ErrorTag, std::forward<UnexpectedType<E>>(u).value()) { }
</ins><span class="cx"> template <class Err> constexpr Expected(UnexpectedType<Err> const& u) : base(ExpectedDetail::ErrorTag, u.value()) { }
</span><span class="cx"> // template <class... Args> constexpr explicit Expected(UnexpectTag, Args&&...);
</span><span class="cx"> // template <class U, class... Args> constexpr explicit Expected(UnexpectTag, std::initializer_list<U>, Args&&...);
</span><span class="lines">@@ -285,12 +289,12 @@
</span><span class="cx"> else if (base::has && !o.has) {
</span><span class="cx"> ErrorType e(WTFMove(o.s.err));
</span><span class="cx"> ::new (&o.s.val) ValueType(WTFMove(base::s.val));
</span><del>- ::new (&base::s.err) ErrorType(e);
</del><ins>+ ::new (&base::s.err) ErrorType(WTFMove(e));
</ins><span class="cx"> swap(base::has, o.has);
</span><span class="cx"> } else if (!base::has && o.has) {
</span><span class="cx"> ValueType v(WTFMove(o.s.val));
</span><span class="cx"> ::new (&o.s.err) ErrorType(WTFMove(base::s.err));
</span><del>- ::new (&base::s.val) ValueType(v);
</del><ins>+ ::new (&base::s.val) ValueType(WTFMove(v));
</ins><span class="cx"> swap(base::has, o.has);
</span><span class="cx"> } else
</span><span class="cx"> swap(base::s.err, o.s.err);
</span><span class="lines">@@ -336,6 +340,7 @@
</span><span class="cx"> Expected(Expected&&) = default;
</span><span class="cx"> // constexpr explicit Expected(in_place_t);
</span><span class="cx"> constexpr Expected(UnexpectedType<E> const& u) : base(ExpectedDetail::ErrorTag, u.value()) { }
</span><ins>+ constexpr Expected(UnexpectedType<E>&& u) : base(ExpectedDetail::ErrorTag, std::forward<UnexpectedType<E>>(u).value()) { }
</ins><span class="cx"> template <class Err> constexpr Expected(UnexpectedType<Err> const& u) : base(ExpectedDetail::ErrorTag, u.value()) { }
</span><span class="cx">
</span><span class="cx"> ~Expected() = default;
</span></span></pre></div>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (210252 => 210253)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2017-01-03 23:06:52 UTC (rev 210252)
+++ trunk/Tools/ChangeLog 2017-01-03 23:18:45 UTC (rev 210253)
</span><span class="lines">@@ -1,3 +1,14 @@
</span><ins>+2017-01-03 Sam Weinig <sam@webkit.org>
+
+ Make WTF::Expected support Ref template parameters
+ https://bugs.webkit.org/show_bug.cgi?id=166662
+
+ Reviewed by Alex Christensen.
+
+ * TestWebKitAPI/Tests/WTF/Expected.cpp:
+ (TestWebKitAPI::TEST):
+ Add tests for using Ref with Expected.
+
</ins><span class="cx"> 2017-01-03 Michael Catanzaro <mcatanzaro@igalia.com>
</span><span class="cx">
</span><span class="cx"> [GTK] Expose WebKitSecurityOrigin API
</span></span></pre></div>
<a id="trunkToolsTestWebKitAPITestsWTFExpectedcpp"></a>
<div class="modfile"><h4>Modified: trunk/Tools/TestWebKitAPI/Tests/WTF/Expected.cpp (210252 => 210253)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/TestWebKitAPI/Tests/WTF/Expected.cpp 2017-01-03 23:06:52 UTC (rev 210252)
+++ trunk/Tools/TestWebKitAPI/Tests/WTF/Expected.cpp 2017-01-03 23:18:45 UTC (rev 210253)
</span><span class="lines">@@ -25,10 +25,13 @@
</span><span class="cx">
</span><span class="cx"> #include "config.h"
</span><span class="cx">
</span><ins>+#include "RefLogger.h"
+
</ins><span class="cx"> #include <string>
</span><span class="cx"> #include <unordered_map>
</span><span class="cx">
</span><span class="cx"> #include <wtf/Expected.h>
</span><ins>+#include <wtf/Ref.h>
</ins><span class="cx">
</span><span class="cx"> namespace WTF {
</span><span class="cx">
</span><span class="lines">@@ -467,4 +470,43 @@
</span><span class="cx"> EXPECT_EQ(m[E(makeUnexpected(foof))], 0xf00f);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+TEST(WTF_Expected, Ref)
+{
+ {
+ RefLogger a("a");
+ Expected<Ref<RefLogger>, int> expected = Ref<RefLogger>(a);
+ EXPECT_TRUE(expected.hasValue());
+ EXPECT_EQ(&a, expected.value().ptr());
+ }
+
+ ASSERT_STREQ("ref(a) deref(a) ", takeLogStr().c_str());
+
+ {
+ RefLogger a("a");
+ Expected<Ref<RefLogger>, int> expected = makeExpected<Ref<RefLogger>, int>(Ref<RefLogger>(a));
+ EXPECT_TRUE(expected.hasValue());
+ EXPECT_EQ(&a, expected.value().ptr());
+ }
+
+ ASSERT_STREQ("ref(a) deref(a) ", takeLogStr().c_str());
+
+ {
+ RefLogger a("a");
+ Expected<int, Ref<RefLogger>> expected = makeUnexpected(Ref<RefLogger>(a));
+ EXPECT_FALSE(expected.hasValue());
+ EXPECT_EQ(&a, expected.error().ptr());
+ }
+
+ ASSERT_STREQ("ref(a) deref(a) ", takeLogStr().c_str());
+
+ {
+ RefLogger a("a");
+ Expected<void, Ref<RefLogger>> expected = makeUnexpected(Ref<RefLogger>(a));
+ EXPECT_FALSE(expected.hasValue());
+ EXPECT_EQ(&a, expected.error().ptr());
+ }
+
+ ASSERT_STREQ("ref(a) deref(a) ", takeLogStr().c_str());
+}
+
</ins><span class="cx"> } // namespace TestWebkitAPI
</span></span></pre>
</div>
</div>
</body>
</html>