<!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>[210292] 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/210292">210292</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2017-01-04 15:00:00 -0800 (Wed, 04 Jan 2017)</dd>
</dl>
<h3>Log Message</h3>
<pre>Add Exception accessor to ExceptionOr to remove unnecessary releases
https://bugs.webkit.org/show_bug.cgi?id=166692
Patch by Sam Weinig <sam@webkit.org> on 2017-01-04
Reviewed by Alex Christensen.
* Modules/webdatabase/DatabaseManager.cpp:
(WebCore::DatabaseManager::openDatabaseBackend):
Use new exception() function.
* dom/ExceptionOr.h:
(WebCore::ExceptionOr<ReturnType>::exception):
(WebCore::ExceptionOr<void>::exception):
Add exception() function which returns the exception without releasing it.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreModuleswebdatabaseDatabaseManagercpp">trunk/Source/WebCore/Modules/webdatabase/DatabaseManager.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 (210291 => 210292)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2017-01-04 22:56:07 UTC (rev 210291)
+++ trunk/Source/WebCore/ChangeLog 2017-01-04 23:00:00 UTC (rev 210292)
</span><span class="lines">@@ -1,3 +1,19 @@
</span><ins>+2017-01-04 Sam Weinig <sam@webkit.org>
+
+ Add Exception accessor to ExceptionOr to remove unnecessary releases
+ https://bugs.webkit.org/show_bug.cgi?id=166692
+
+ Reviewed by Alex Christensen.
+
+ * Modules/webdatabase/DatabaseManager.cpp:
+ (WebCore::DatabaseManager::openDatabaseBackend):
+ Use new exception() function.
+
+ * dom/ExceptionOr.h:
+ (WebCore::ExceptionOr<ReturnType>::exception):
+ (WebCore::ExceptionOr<void>::exception):
+ Add exception() function which returns the exception without releasing it.
+
</ins><span class="cx"> 2016-01-04 Brent Fulgham <bfulgham@apple.com>
</span><span class="cx">
</span><span class="cx"> Correct DOMWindow handling during FrameLoader::clear
</span></span></pre></div>
<a id="trunkSourceWebCoreModuleswebdatabaseDatabaseManagercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/webdatabase/DatabaseManager.cpp (210291 => 210292)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/webdatabase/DatabaseManager.cpp 2017-01-04 22:56:07 UTC (rev 210291)
+++ trunk/Source/WebCore/Modules/webdatabase/DatabaseManager.cpp 2017-01-04 23:00:00 UTC (rev 210292)
</span><span class="lines">@@ -114,8 +114,7 @@
</span><span class="cx">
</span><span class="cx"> static void logOpenDatabaseError(ScriptExecutionContext& context, const String& name)
</span><span class="cx"> {
</span><del>- LOG(StorageAPI, "Database %s for origin %s not allowed to be established", name.utf8().data(),
- context.securityOrigin()->toString().utf8().data());
</del><ins>+ LOG(StorageAPI, "Database %s for origin %s not allowed to be established", name.utf8().data(), context.securityOrigin()->toString().utf8().data());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #endif
</span><span class="lines">@@ -127,10 +126,7 @@
</span><span class="cx"> auto backend = tryToOpenDatabaseBackend(databaseContext, name, expectedVersion, displayName, estimatedSize, setVersionInNewDatabase, FirstTryToOpenDatabase);
</span><span class="cx">
</span><span class="cx"> if (backend.hasException()) {
</span><del>- auto exception = backend.releaseException();
- if (exception.code() != QUOTA_EXCEEDED_ERR)
- backend = WTFMove(exception); // FIXME: Bad to have to move exception out and back in.
- else {
</del><ins>+ if (backend.exception().code() == QUOTA_EXCEEDED_ERR) {
</ins><span class="cx"> // Notify the client that we've exceeded the database quota.
</span><span class="cx"> // The client may want to increase the quota, and we'll give it
</span><span class="cx"> // one more try after if that is the case.
</span><span class="lines">@@ -144,12 +140,10 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (backend.hasException()) {
</span><del>- auto exception = backend.releaseException();
- if (exception.code() == INVALID_STATE_ERR)
- logErrorMessage(context, exception.message());
</del><ins>+ if (backend.exception().code() == INVALID_STATE_ERR)
+ logErrorMessage(context, backend.exception().message());
</ins><span class="cx"> else
</span><span class="cx"> logOpenDatabaseError(context, name);
</span><del>- backend = WTFMove(exception); // FIXME: Bad to have to move exception out and back in.
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> return backend;
</span></span></pre></div>
<a id="trunkSourceWebCoredomExceptionOrh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/ExceptionOr.h (210291 => 210292)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/ExceptionOr.h 2017-01-04 22:56:07 UTC (rev 210291)
+++ trunk/Source/WebCore/dom/ExceptionOr.h 2017-01-04 23:00:00 UTC (rev 210292)
</span><span class="lines">@@ -38,6 +38,7 @@
</span><span class="cx"> template<typename OtherType> ExceptionOr(const OtherType&, typename std::enable_if<std::is_scalar<OtherType>::value && std::is_convertible<OtherType, ReturnType>::value>::type* = nullptr);
</span><span class="cx">
</span><span class="cx"> bool hasException() const;
</span><ins>+ const Exception& exception() const;
</ins><span class="cx"> Exception&& releaseException();
</span><span class="cx"> ReturnType&& releaseReturnValue();
</span><span class="cx">
</span><span class="lines">@@ -51,6 +52,7 @@
</span><span class="cx"> ExceptionOr(ReturnReferenceType&);
</span><span class="cx">
</span><span class="cx"> bool hasException() const;
</span><ins>+ const Exception& exception() const;
</ins><span class="cx"> Exception&& releaseException();
</span><span class="cx"> ReturnReferenceType& releaseReturnValue();
</span><span class="cx">
</span><span class="lines">@@ -64,6 +66,7 @@
</span><span class="cx"> ExceptionOr() = default;
</span><span class="cx">
</span><span class="cx"> bool hasException() const;
</span><ins>+ const Exception& exception() const;
</ins><span class="cx"> Exception&& releaseException();
</span><span class="cx">
</span><span class="cx"> private:
</span><span class="lines">@@ -97,6 +100,11 @@
</span><span class="cx"> return WTFMove(m_value.error());
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+template<typename ReturnType> inline const Exception& ExceptionOr<ReturnType>::exception() const
+{
+ return m_value.error();
+}
+
</ins><span class="cx"> template<typename ReturnType> inline ReturnType&& ExceptionOr<ReturnType>::releaseReturnValue()
</span><span class="cx"> {
</span><span class="cx"> return WTFMove(m_value.value());
</span><span class="lines">@@ -117,6 +125,11 @@
</span><span class="cx"> return m_value.hasException();
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+template<typename ReturnReferenceType> inline const Exception& ExceptionOr<ReturnReferenceType&>::exception() const
+{
+ return m_value.exception();
+}
+
</ins><span class="cx"> template<typename ReturnReferenceType> inline Exception&& ExceptionOr<ReturnReferenceType&>::releaseException()
</span><span class="cx"> {
</span><span class="cx"> return m_value.releaseException();
</span><span class="lines">@@ -137,6 +150,11 @@
</span><span class="cx"> return !m_value.hasValue();
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+inline const Exception& ExceptionOr<void>::exception() const
+{
+ return m_value.error();
+}
+
</ins><span class="cx"> inline Exception&& ExceptionOr<void>::releaseException()
</span><span class="cx"> {
</span><span class="cx"> return WTFMove(m_value.error());
</span></span></pre>
</div>
</div>
</body>
</html>