<!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>[210257] trunk/Source/WebCore</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/210257">210257</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2017-01-03 16:33:39 -0800 (Tue, 03 Jan 2017)</dd>
</dl>
<h3>Log Message</h3>
<pre>Re-implement ExceptionOr on top of WTF::Expected
https://bugs.webkit.org/show_bug.cgi?id=166668
Patch by Sam Weinig <sam@webkit.org> on 2017-01-03
Reviewed by Alex Christensen.
As a first step towards using WTF::Expected instead of ExceptionOr,
use Expected as an implementation detail, rather than Variant/std::optional.
* crypto/algorithms/CryptoAlgorithmAES_KW.cpp:
* crypto/algorithms/CryptoAlgorithmHMAC.cpp:
* crypto/algorithms/CryptoAlgorithmRSAES_PKCS1_v1_5.cpp:
* crypto/algorithms/CryptoAlgorithmRSASSA_PKCS1_v1_5.cpp:
* crypto/algorithms/CryptoAlgorithmRSA_OAEP.cpp:
Add missing #include of Variant.h
* dom/ExceptionOr.h:
(WebCore::ExceptionOr<ReturnType>::ExceptionOr):
(WebCore::ExceptionOr<ReturnType>::hasException):
(WebCore::ExceptionOr<ReturnType>::releaseException):
(WebCore::ExceptionOr<ReturnType>::releaseReturnValue):
(WebCore::ExceptionOr<void>::ExceptionOr):
(WebCore::ExceptionOr<void>::hasException):
(WebCore::ExceptionOr<void>::releaseException):
Re-implement on top of Expected.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorecryptoalgorithmsCryptoAlgorithmAES_KWcpp">trunk/Source/WebCore/crypto/algorithms/CryptoAlgorithmAES_KW.cpp</a></li>
<li><a href="#trunkSourceWebCorecryptoalgorithmsCryptoAlgorithmHMACcpp">trunk/Source/WebCore/crypto/algorithms/CryptoAlgorithmHMAC.cpp</a></li>
<li><a href="#trunkSourceWebCorecryptoalgorithmsCryptoAlgorithmRSAES_PKCS1_v1_5cpp">trunk/Source/WebCore/crypto/algorithms/CryptoAlgorithmRSAES_PKCS1_v1_5.cpp</a></li>
<li><a href="#trunkSourceWebCorecryptoalgorithmsCryptoAlgorithmRSASSA_PKCS1_v1_5cpp">trunk/Source/WebCore/crypto/algorithms/CryptoAlgorithmRSASSA_PKCS1_v1_5.cpp</a></li>
<li><a href="#trunkSourceWebCorecryptoalgorithmsCryptoAlgorithmRSA_OAEPcpp">trunk/Source/WebCore/crypto/algorithms/CryptoAlgorithmRSA_OAEP.cpp</a></li>
<li><a href="#trunkSourceWebCoredomExceptionOrh">trunk/Source/WebCore/dom/ExceptionOr.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (210256 => 210257)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2017-01-04 00:26:45 UTC (rev 210256)
+++ trunk/Source/WebCore/ChangeLog 2017-01-04 00:33:39 UTC (rev 210257)
</span><span class="lines">@@ -1,3 +1,30 @@
</span><ins>+2017-01-03 Sam Weinig <sam@webkit.org>
+
+ Re-implement ExceptionOr on top of WTF::Expected
+ https://bugs.webkit.org/show_bug.cgi?id=166668
+
+ Reviewed by Alex Christensen.
+
+ As a first step towards using WTF::Expected instead of ExceptionOr,
+ use Expected as an implementation detail, rather than Variant/std::optional.
+
+ * crypto/algorithms/CryptoAlgorithmAES_KW.cpp:
+ * crypto/algorithms/CryptoAlgorithmHMAC.cpp:
+ * crypto/algorithms/CryptoAlgorithmRSAES_PKCS1_v1_5.cpp:
+ * crypto/algorithms/CryptoAlgorithmRSASSA_PKCS1_v1_5.cpp:
+ * crypto/algorithms/CryptoAlgorithmRSA_OAEP.cpp:
+ Add missing #include of Variant.h
+
+ * dom/ExceptionOr.h:
+ (WebCore::ExceptionOr<ReturnType>::ExceptionOr):
+ (WebCore::ExceptionOr<ReturnType>::hasException):
+ (WebCore::ExceptionOr<ReturnType>::releaseException):
+ (WebCore::ExceptionOr<ReturnType>::releaseReturnValue):
+ (WebCore::ExceptionOr<void>::ExceptionOr):
+ (WebCore::ExceptionOr<void>::hasException):
+ (WebCore::ExceptionOr<void>::releaseException):
+ Re-implement on top of Expected.
+
</ins><span class="cx"> 2017-01-03 Chris Dumez <cdumez@apple.com>
</span><span class="cx">
</span><span class="cx"> Make setting Event's cancelBubble to false a no-op
</span></span></pre></div>
<a id="trunkSourceWebCorecryptoalgorithmsCryptoAlgorithmAES_KWcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/crypto/algorithms/CryptoAlgorithmAES_KW.cpp (210256 => 210257)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/crypto/algorithms/CryptoAlgorithmAES_KW.cpp 2017-01-04 00:26:45 UTC (rev 210256)
+++ trunk/Source/WebCore/crypto/algorithms/CryptoAlgorithmAES_KW.cpp 2017-01-04 00:33:39 UTC (rev 210257)
</span><span class="lines">@@ -33,6 +33,7 @@
</span><span class="cx"> #include "CryptoKeyAES.h"
</span><span class="cx"> #include "CryptoKeyDataOctetSequence.h"
</span><span class="cx"> #include "ExceptionCode.h"
</span><ins>+#include <wtf/Variant.h>
</ins><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorecryptoalgorithmsCryptoAlgorithmHMACcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/crypto/algorithms/CryptoAlgorithmHMAC.cpp (210256 => 210257)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/crypto/algorithms/CryptoAlgorithmHMAC.cpp 2017-01-04 00:26:45 UTC (rev 210256)
+++ trunk/Source/WebCore/crypto/algorithms/CryptoAlgorithmHMAC.cpp 2017-01-04 00:33:39 UTC (rev 210257)
</span><span class="lines">@@ -34,6 +34,7 @@
</span><span class="cx"> #include "CryptoKeyDataOctetSequence.h"
</span><span class="cx"> #include "CryptoKeyHMAC.h"
</span><span class="cx"> #include "ExceptionCode.h"
</span><ins>+#include <wtf/Variant.h>
</ins><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorecryptoalgorithmsCryptoAlgorithmRSAES_PKCS1_v1_5cpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/crypto/algorithms/CryptoAlgorithmRSAES_PKCS1_v1_5.cpp (210256 => 210257)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/crypto/algorithms/CryptoAlgorithmRSAES_PKCS1_v1_5.cpp 2017-01-04 00:26:45 UTC (rev 210256)
+++ trunk/Source/WebCore/crypto/algorithms/CryptoAlgorithmRSAES_PKCS1_v1_5.cpp 2017-01-04 00:33:39 UTC (rev 210257)
</span><span class="lines">@@ -35,6 +35,7 @@
</span><span class="cx"> #include "CryptoKeyPair.h"
</span><span class="cx"> #include "CryptoKeyRSA.h"
</span><span class="cx"> #include "ExceptionCode.h"
</span><ins>+#include <wtf/Variant.h>
</ins><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorecryptoalgorithmsCryptoAlgorithmRSASSA_PKCS1_v1_5cpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/crypto/algorithms/CryptoAlgorithmRSASSA_PKCS1_v1_5.cpp (210256 => 210257)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/crypto/algorithms/CryptoAlgorithmRSASSA_PKCS1_v1_5.cpp 2017-01-04 00:26:45 UTC (rev 210256)
+++ trunk/Source/WebCore/crypto/algorithms/CryptoAlgorithmRSASSA_PKCS1_v1_5.cpp 2017-01-04 00:33:39 UTC (rev 210257)
</span><span class="lines">@@ -37,6 +37,7 @@
</span><span class="cx"> #include "CryptoKeyPair.h"
</span><span class="cx"> #include "CryptoKeyRSA.h"
</span><span class="cx"> #include "ExceptionCode.h"
</span><ins>+#include <wtf/Variant.h>
</ins><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorecryptoalgorithmsCryptoAlgorithmRSA_OAEPcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/crypto/algorithms/CryptoAlgorithmRSA_OAEP.cpp (210256 => 210257)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/crypto/algorithms/CryptoAlgorithmRSA_OAEP.cpp 2017-01-04 00:26:45 UTC (rev 210256)
+++ trunk/Source/WebCore/crypto/algorithms/CryptoAlgorithmRSA_OAEP.cpp 2017-01-04 00:33:39 UTC (rev 210257)
</span><span class="lines">@@ -37,6 +37,7 @@
</span><span class="cx"> #include "CryptoKeyPair.h"
</span><span class="cx"> #include "CryptoKeyRSA.h"
</span><span class="cx"> #include "ExceptionCode.h"
</span><ins>+#include <wtf/Variant.h>
</ins><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoredomExceptionOrh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/ExceptionOr.h (210256 => 210257)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/ExceptionOr.h 2017-01-04 00:26:45 UTC (rev 210256)
+++ trunk/Source/WebCore/dom/ExceptionOr.h 2017-01-04 00:33:39 UTC (rev 210257)
</span><span class="lines">@@ -27,8 +27,7 @@
</span><span class="cx"> #pragma once
</span><span class="cx">
</span><span class="cx"> #include "Exception.h"
</span><del>-#include <wtf/Optional.h>
-#include <wtf/Variant.h>
</del><ins>+#include <wtf/Expected.h>
</ins><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><span class="lines">@@ -43,7 +42,7 @@
</span><span class="cx"> ReturnType&& releaseReturnValue();
</span><span class="cx">
</span><span class="cx"> private:
</span><del>- Variant<Exception, ReturnType> m_value;
</del><ins>+ Expected<ReturnType, Exception> m_value;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> template<typename ReturnReferenceType> class ExceptionOr<ReturnReferenceType&> {
</span><span class="lines">@@ -68,13 +67,13 @@
</span><span class="cx"> Exception&& releaseException();
</span><span class="cx">
</span><span class="cx"> private:
</span><del>- std::optional<Exception> m_exception;
</del><ins>+ Expected<void, Exception> m_value;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> ExceptionOr<void> isolatedCopy(ExceptionOr<void>&&);
</span><span class="cx">
</span><span class="cx"> template<typename ReturnType> inline ExceptionOr<ReturnType>::ExceptionOr(Exception&& exception)
</span><del>- : m_value(WTFMove(exception))
</del><ins>+ : m_value(makeUnexpected(WTFMove(exception)))
</ins><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -90,17 +89,17 @@
</span><span class="cx">
</span><span class="cx"> template<typename ReturnType> inline bool ExceptionOr<ReturnType>::hasException() const
</span><span class="cx"> {
</span><del>- return WTF::holds_alternative<Exception>(m_value);
</del><ins>+ return !m_value.hasValue();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> template<typename ReturnType> inline Exception&& ExceptionOr<ReturnType>::releaseException()
</span><span class="cx"> {
</span><del>- return WTF::get<Exception>(WTFMove(m_value));
</del><ins>+ return WTFMove(m_value.error());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> template<typename ReturnType> inline ReturnType&& ExceptionOr<ReturnType>::releaseReturnValue()
</span><span class="cx"> {
</span><del>- return WTF::get<ReturnType>(WTFMove(m_value));
</del><ins>+ return WTFMove(m_value.value());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> template<typename ReturnReferenceType> inline ExceptionOr<ReturnReferenceType&>::ExceptionOr(Exception&& exception)
</span><span class="lines">@@ -129,18 +128,18 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> inline ExceptionOr<void>::ExceptionOr(Exception&& exception)
</span><del>- : m_exception(WTFMove(exception))
</del><ins>+ : m_value(makeUnexpected(WTFMove(exception)))
</ins><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> inline bool ExceptionOr<void>::hasException() const
</span><span class="cx"> {
</span><del>- return !!m_exception;
</del><ins>+ return !m_value.hasValue();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> inline Exception&& ExceptionOr<void>::releaseException()
</span><span class="cx"> {
</span><del>- return WTFMove(m_exception.value());
</del><ins>+ return WTFMove(m_value.error());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> inline ExceptionOr<void> isolatedCopy(ExceptionOr<void>&& value)
</span></span></pre>
</div>
</div>
</body>
</html>