<!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>[202019] 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/202019">202019</a></dd>
<dt>Author</dt> <dd>beidson@apple.com</dd>
<dt>Date</dt> <dd>2016-06-13 17:34:11 -0700 (Mon, 13 Jun 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>storage/indexeddb/modern/leaks-1.html leaks the database connection handle.
https://bugs.webkit.org/show_bug.cgi?id=158643
Reviewed by Alex Christensen.
Source/WebCore:
Tested by changes to existing test.
* Modules/indexeddb/IDBDatabase.cpp:
(WebCore::IDBDatabase::hasPendingActivity):
* dom/EventTarget.h:
(WebCore::EventTarget::eventTargetData):
(WebCore::EventTarget::hasEventListeners):
LayoutTests:
* storage/indexeddb/modern/leak-1-expected.txt:
* storage/indexeddb/modern/resources/leak-1.js:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsstorageindexeddbmodernleak1expectedtxt">trunk/LayoutTests/storage/indexeddb/modern/leak-1-expected.txt</a></li>
<li><a href="#trunkLayoutTestsstorageindexeddbmodernresourcesleak1js">trunk/LayoutTests/storage/indexeddb/modern/resources/leak-1.js</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreModulesindexeddbIDBDatabasecpp">trunk/Source/WebCore/Modules/indexeddb/IDBDatabase.cpp</a></li>
<li><a href="#trunkSourceWebCoredomEventTargeth">trunk/Source/WebCore/dom/EventTarget.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (202018 => 202019)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2016-06-14 00:17:44 UTC (rev 202018)
+++ trunk/LayoutTests/ChangeLog 2016-06-14 00:34:11 UTC (rev 202019)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2016-06-13 Brady Eidson <beidson@apple.com>
+
+ storage/indexeddb/modern/leaks-1.html leaks the database connection handle.
+ https://bugs.webkit.org/show_bug.cgi?id=158643
+
+ Reviewed by Alex Christensen.
+
+ * storage/indexeddb/modern/leak-1-expected.txt:
+ * storage/indexeddb/modern/resources/leak-1.js:
+
</ins><span class="cx"> 2016-06-13 Adam Bergkvist <adam.bergkvist@ericsson.com>
</span><span class="cx">
</span><span class="cx"> WebRTC: Add test that verifies that RTCPeerConnection.addTrack can reuse an existing RTCRtpSender
</span></span></pre></div>
<a id="trunkLayoutTestsstorageindexeddbmodernleak1expectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/storage/indexeddb/modern/leak-1-expected.txt (202018 => 202019)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/storage/indexeddb/modern/leak-1-expected.txt 2016-06-14 00:17:44 UTC (rev 202018)
+++ trunk/LayoutTests/storage/indexeddb/modern/leak-1-expected.txt 2016-06-14 00:34:11 UTC (rev 202019)
</span><span class="lines">@@ -12,6 +12,10 @@
</span><span class="cx"> Observing GC on the transaction and request.
</span><span class="cx"> PASS txObserver.wasCollected is true
</span><span class="cx"> PASS reqObserver.wasCollected is true
</span><ins>+PASS versionChangeObserver.wasCollected is true
+PASS dbObserver.wasCollected is true
+PASS openRequestObserver.wasCollected is true
+PASS objectStoreObserver.wasCollected is true
</ins><span class="cx"> PASS successfullyParsed is true
</span><span class="cx">
</span><span class="cx"> TEST COMPLETE
</span></span></pre></div>
<a id="trunkLayoutTestsstorageindexeddbmodernresourcesleak1js"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/storage/indexeddb/modern/resources/leak-1.js (202018 => 202019)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/storage/indexeddb/modern/resources/leak-1.js 2016-06-14 00:17:44 UTC (rev 202018)
+++ trunk/LayoutTests/storage/indexeddb/modern/resources/leak-1.js 2016-06-14 00:34:11 UTC (rev 202019)
</span><span class="lines">@@ -19,13 +19,22 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> var db;
</span><ins>+var versionChangeObserver;
+var dbObserver;
+var openRequestObserver;
+var objectStoreObserver;
</ins><span class="cx">
</span><span class="cx"> function prepareDatabase(event)
</span><span class="cx"> {
</span><span class="cx"> debug("Initial upgrade needed: Old version - " + event.oldVersion + " New version - " + event.newVersion);
</span><span class="cx">
</span><ins>+ versionChangeObserver = internals.observeGC(event.target.transaction);
+ dbObserver = internals.observeGC(event.target.result);
+ openRequestObserver = internals.observeGC(event.target);
+
</ins><span class="cx"> db = event.target.result;
</span><del>- db.createObjectStore("foo");
</del><ins>+ objectStoreObserver = internals.observeGC(db.createObjectStore("foo"));
+
</ins><span class="cx"> event.target.onsuccess = function() {
</span><span class="cx"> testGenerator = testSteps();
</span><span class="cx"> testGenerator.next();
</span><span class="lines">@@ -51,6 +60,7 @@
</span><span class="cx">
</span><span class="cx"> tx = null;
</span><span class="cx"> req = null;
</span><ins>+ db = null;
</ins><span class="cx">
</span><span class="cx"> // Make sure we are no longer handling any IDB events.
</span><span class="cx"> asyncNext();
</span><span class="lines">@@ -60,6 +70,10 @@
</span><span class="cx">
</span><span class="cx"> shouldBeTrue("txObserver.wasCollected");
</span><span class="cx"> shouldBeTrue("reqObserver.wasCollected");
</span><ins>+ shouldBeTrue("versionChangeObserver.wasCollected");
+ shouldBeTrue("dbObserver.wasCollected");
+ shouldBeTrue("openRequestObserver.wasCollected");
+ shouldBeTrue("objectStoreObserver.wasCollected");
</ins><span class="cx">
</span><span class="cx"> finishJSTest();
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (202018 => 202019)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-06-14 00:17:44 UTC (rev 202018)
+++ trunk/Source/WebCore/ChangeLog 2016-06-14 00:34:11 UTC (rev 202019)
</span><span class="lines">@@ -1,3 +1,20 @@
</span><ins>+2016-06-13 Brady Eidson <beidson@apple.com>
+
+ storage/indexeddb/modern/leaks-1.html leaks the database connection handle.
+ https://bugs.webkit.org/show_bug.cgi?id=158643
+
+ Reviewed by Alex Christensen.
+
+ Tested by changes to existing test.
+
+ * Modules/indexeddb/IDBDatabase.cpp:
+ (WebCore::IDBDatabase::hasPendingActivity):
+
+ * dom/EventTarget.h:
+ (WebCore::EventTarget::eventTargetData):
+ (WebCore::EventTarget::hasEventListeners):
+
+
</ins><span class="cx"> 2016-06-13 Enrica Casucci <enrica@apple.com>
</span><span class="cx">
</span><span class="cx"> REGRESSION(r201956): Failure to initialize new internal settings produced random test failures in release.
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesindexeddbIDBDatabasecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/indexeddb/IDBDatabase.cpp (202018 => 202019)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/indexeddb/IDBDatabase.cpp 2016-06-14 00:17:44 UTC (rev 202018)
+++ trunk/Source/WebCore/Modules/indexeddb/IDBDatabase.cpp 2016-06-14 00:34:11 UTC (rev 202019)
</span><span class="lines">@@ -68,7 +68,14 @@
</span><span class="cx"> bool IDBDatabase::hasPendingActivity() const
</span><span class="cx"> {
</span><span class="cx"> ASSERT(currentThread() == originThreadID());
</span><del>- return !m_closedInServer;
</del><ins>+
+ if (m_closedInServer)
+ return false;
+
+ if (!m_activeTransactions.isEmpty() || !m_committingTransactions.isEmpty() || !m_abortingTransactions.isEmpty())
+ return true;
+
+ return hasEventListeners(eventNames().abortEvent) || hasEventListeners(eventNames().errorEvent) || hasEventListeners(eventNames().versionchangeEvent);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> const String IDBDatabase::name() const
</span></span></pre></div>
<a id="trunkSourceWebCoredomEventTargeth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/EventTarget.h (202018 => 202019)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/EventTarget.h 2016-06-14 00:17:44 UTC (rev 202018)
+++ trunk/Source/WebCore/dom/EventTarget.h 2016-06-14 00:34:11 UTC (rev 202019)
</span><span class="lines">@@ -158,7 +158,7 @@
</span><span class="cx"> EventListener* getAttributeEventListener(const AtomicString& eventType);
</span><span class="cx">
</span><span class="cx"> bool hasEventListeners() const;
</span><del>- bool hasEventListeners(const AtomicString& eventType);
</del><ins>+ bool hasEventListeners(const AtomicString& eventType) const;
</ins><span class="cx"> bool hasCapturingEventListeners(const AtomicString& eventType);
</span><span class="cx"> bool hasActiveEventListeners(const AtomicString& eventType) const;
</span><span class="cx"> const EventListenerVector& getEventListeners(const AtomicString& eventType);
</span><span class="lines">@@ -176,6 +176,10 @@
</span><span class="cx">
</span><span class="cx"> virtual EventTargetData* eventTargetData() = 0;
</span><span class="cx"> virtual EventTargetData& ensureEventTargetData() = 0;
</span><ins>+ const EventTargetData* eventTargetData() const
+ {
+ return const_cast<EventTarget*>(this)->eventTargetData();
+ }
</ins><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> virtual void refEventTarget() = 0;
</span><span class="lines">@@ -217,9 +221,9 @@
</span><span class="cx"> return !d->eventListenerMap.isEmpty();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-inline bool EventTarget::hasEventListeners(const AtomicString& eventType)
</del><ins>+inline bool EventTarget::hasEventListeners(const AtomicString& eventType) const
</ins><span class="cx"> {
</span><del>- EventTargetData* d = eventTargetData();
</del><ins>+ const EventTargetData* d = eventTargetData();
</ins><span class="cx"> if (!d)
</span><span class="cx"> return false;
</span><span class="cx"> return d->eventListenerMap.contains(eventType);
</span></span></pre>
</div>
</div>
</body>
</html>