<!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>[196349] 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/196349">196349</a></dd>
<dt>Author</dt> <dd>beidson@apple.com</dd>
<dt>Date</dt> <dd>2016-02-09 17:15:09 -0800 (Tue, 09 Feb 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Modern IDB: TransactionOperation objects leak.
https://bugs.webkit.org/show_bug.cgi?id=154054
Reviewed by Alex Christensen.
No new tests (Currently untestable).
* Modules/indexeddb/client/IDBTransactionImpl.cpp:
(WebCore::IDBClient::IDBTransaction::abortOnServerAndCancelRequests): Remove the TransactionOperation from
the map, as this operation doesn't complete "normally" like most others.
(WebCore::IDBClient::IDBTransaction::commitOnServer): Ditto.
* Modules/indexeddb/client/TransactionOperation.h:
(WebCore::IDBClient::TransactionOperation::perform): Clear the m_performFunction after use,
as it holds a lambda that holds a RefPtr to the IDBTransaction, as well as a self-ref.
(WebCore::IDBClient::TransactionOperation::completed): Clear m_completeFunction for the same reasons.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreModulesindexeddbclientIDBTransactionImplcpp">trunk/Source/WebCore/Modules/indexeddb/client/IDBTransactionImpl.cpp</a></li>
<li><a href="#trunkSourceWebCoreModulesindexeddbclientTransactionOperationh">trunk/Source/WebCore/Modules/indexeddb/client/TransactionOperation.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (196348 => 196349)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog        2016-02-10 01:13:39 UTC (rev 196348)
+++ trunk/Source/WebCore/ChangeLog        2016-02-10 01:15:09 UTC (rev 196349)
</span><span class="lines">@@ -1,3 +1,22 @@
</span><ins>+2016-02-09 Brady Eidson <beidson@apple.com>
+
+ Modern IDB: TransactionOperation objects leak.
+ https://bugs.webkit.org/show_bug.cgi?id=154054
+
+ Reviewed by Alex Christensen.
+
+ No new tests (Currently untestable).
+
+ * Modules/indexeddb/client/IDBTransactionImpl.cpp:
+ (WebCore::IDBClient::IDBTransaction::abortOnServerAndCancelRequests): Remove the TransactionOperation from
+ the map, as this operation doesn't complete "normally" like most others.
+ (WebCore::IDBClient::IDBTransaction::commitOnServer): Ditto.
+
+ * Modules/indexeddb/client/TransactionOperation.h:
+ (WebCore::IDBClient::TransactionOperation::perform): Clear the m_performFunction after use,
+ as it holds a lambda that holds a RefPtr to the IDBTransaction, as well as a self-ref.
+ (WebCore::IDBClient::TransactionOperation::completed): Clear m_completeFunction for the same reasons.
+
</ins><span class="cx"> 2016-02-09 Jer Noble <jer.noble@apple.com>
</span><span class="cx">
</span><span class="cx"> [Mac] Graphical corruption in videos when enabling custom loading path
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesindexeddbclientIDBTransactionImplcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/indexeddb/client/IDBTransactionImpl.cpp (196348 => 196349)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/indexeddb/client/IDBTransactionImpl.cpp        2016-02-10 01:13:39 UTC (rev 196348)
+++ trunk/Source/WebCore/Modules/indexeddb/client/IDBTransactionImpl.cpp        2016-02-10 01:15:09 UTC (rev 196349)
</span><span class="lines">@@ -201,7 +201,7 @@
</span><span class="cx"> scheduleOperation(WTFMove(operation));
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void IDBTransaction::abortOnServerAndCancelRequests(TransactionOperation&)
</del><ins>+void IDBTransaction::abortOnServerAndCancelRequests(TransactionOperation& operation)
</ins><span class="cx"> {
</span><span class="cx"> LOG(IndexedDB, "IDBTransaction::abortOnServerAndCancelRequests");
</span><span class="cx">
</span><span class="lines">@@ -209,6 +209,9 @@
</span><span class="cx">
</span><span class="cx"> serverConnection().abortTransaction(*this);
</span><span class="cx">
</span><ins>+ ASSERT(m_transactionOperationMap.contains(operation.identifier()));
+ m_transactionOperationMap.remove(operation.identifier());
+
</ins><span class="cx"> IDBError error(IDBDatabaseException::AbortError);
</span><span class="cx"> for (auto& operation : m_abortQueue)
</span><span class="cx"> operation->completed(IDBResultData::error(operation->identifier(), error));
</span><span class="lines">@@ -323,10 +326,13 @@
</span><span class="cx"> scheduleOperation(WTFMove(operation));
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void IDBTransaction::commitOnServer(TransactionOperation&)
</del><ins>+void IDBTransaction::commitOnServer(TransactionOperation& operation)
</ins><span class="cx"> {
</span><span class="cx"> LOG(IndexedDB, "IDBTransaction::commitOnServer");
</span><span class="cx"> serverConnection().commitTransaction(*this);
</span><ins>+
+ ASSERT(m_transactionOperationMap.contains(operation.identifier()));
+ m_transactionOperationMap.remove(operation.identifier());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void IDBTransaction::finishAbortOrCommit()
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesindexeddbclientTransactionOperationh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/indexeddb/client/TransactionOperation.h (196348 => 196349)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/indexeddb/client/TransactionOperation.h        2016-02-10 01:13:39 UTC (rev 196348)
+++ trunk/Source/WebCore/Modules/indexeddb/client/TransactionOperation.h        2016-02-10 01:15:09 UTC (rev 196349)
</span><span class="lines">@@ -46,13 +46,17 @@
</span><span class="cx"> public:
</span><span class="cx"> void perform()
</span><span class="cx"> {
</span><ins>+ ASSERT(m_performFunction);
</ins><span class="cx"> m_performFunction();
</span><ins>+ m_performFunction = { };
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void completed(const IDBResultData& data)
</span><span class="cx"> {
</span><ins>+ ASSERT(m_completeFunction);
</ins><span class="cx"> m_completeFunction(data);
</span><span class="cx"> m_transaction->operationDidComplete(*this);
</span><ins>+ m_completeFunction = { };
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> const IDBResourceIdentifier& identifier() const { return m_identifier; }
</span><span class="lines">@@ -90,31 +94,38 @@
</span><span class="cx"> {
</span><span class="cx"> relaxAdoptionRequirement();
</span><span class="cx"> RefPtr<TransactionOperation> self(this);
</span><ins>+
+ ASSERT(performMethod);
</ins><span class="cx"> m_performFunction = [self, this, performMethod, arguments...] {
</span><span class="cx"> (&m_transaction.get()->*performMethod)(*this, arguments...);
</span><span class="cx"> };
</span><span class="cx">
</span><del>- m_completeFunction = [self, this, completeMethod](const IDBResultData& resultData) {
- if (completeMethod)
- (&m_transaction.get()->*completeMethod)(resultData);
- };
</del><ins>+ if (completeMethod) {
+ m_completeFunction = [self, this, completeMethod](const IDBResultData& resultData) {
+ if (completeMethod)
+ (&m_transaction.get()->*completeMethod)(resultData);
+ };
+ }
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> TransactionOperationImpl(IDBTransaction& transaction, IDBRequest& request, void (IDBTransaction::*completeMethod)(IDBRequest&, const IDBResultData&), void (IDBTransaction::*performMethod)(TransactionOperation&, Arguments...), Arguments&&... arguments)
</span><span class="cx"> : TransactionOperation(transaction, request)
</span><span class="cx"> {
</span><span class="cx"> relaxAdoptionRequirement();
</span><ins>+ RefPtr<TransactionOperation> self(this);
</ins><span class="cx">
</span><del>- RefPtr<TransactionOperation> self(this);
</del><ins>+ ASSERT(performMethod);
</ins><span class="cx"> m_performFunction = [self, this, performMethod, arguments...] {
</span><span class="cx"> (&m_transaction.get()->*performMethod)(*this, arguments...);
</span><span class="cx"> };
</span><span class="cx">
</span><del>- RefPtr<IDBRequest> refRequest(&request);
- m_completeFunction = [self, this, refRequest, completeMethod](const IDBResultData& resultData) {
- if (completeMethod)
- (&m_transaction.get()->*completeMethod)(*refRequest, resultData);
- };
</del><ins>+ if (completeMethod) {
+ RefPtr<IDBRequest> refRequest(&request);
+ m_completeFunction = [self, this, refRequest, completeMethod](const IDBResultData& resultData) {
+ if (completeMethod)
+ (&m_transaction.get()->*completeMethod)(*refRequest, resultData);
+ };
+ }
</ins><span class="cx"> }
</span><span class="cx"> };
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>