<!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>[196854] 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/196854">196854</a></dd>
<dt>Author</dt> <dd>cdumez@apple.com</dd>
<dt>Date</dt> <dd>2016-02-19 20:41:06 -0800 (Fri, 19 Feb 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Land release assertions to help track down a possible HTMLCollection lifetime bug
https://bugs.webkit.org/show_bug.cgi?id=154490
Reviewed by Ryosuke Niwa.
Land release assertions to help track down a possible HTMLCollection
lifetime bug: <rdar://problem/24457478>.
* bindings/js/JSHTMLCollectionCustom.cpp:
(WebCore::JSHTMLCollection::getOwnPropertyNames):
* html/HTMLCollection.cpp:
(WebCore::HTMLCollection::HTMLCollection):
(WebCore::HTMLCollection::~HTMLCollection):
* html/HTMLCollection.h:
(WebCore::HTMLCollection::wasDeletionStarted):
* html/HTMLCollection.idl:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorebindingsjsJSHTMLCollectionCustomcpp">trunk/Source/WebCore/bindings/js/JSHTMLCollectionCustom.cpp</a></li>
<li><a href="#trunkSourceWebCorehtmlHTMLCollectioncpp">trunk/Source/WebCore/html/HTMLCollection.cpp</a></li>
<li><a href="#trunkSourceWebCorehtmlHTMLCollectionh">trunk/Source/WebCore/html/HTMLCollection.h</a></li>
<li><a href="#trunkSourceWebCorehtmlHTMLCollectionidl">trunk/Source/WebCore/html/HTMLCollection.idl</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (196853 => 196854)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-02-20 04:17:12 UTC (rev 196853)
+++ trunk/Source/WebCore/ChangeLog 2016-02-20 04:41:06 UTC (rev 196854)
</span><span class="lines">@@ -1,3 +1,22 @@
</span><ins>+2016-02-19 Chris Dumez <cdumez@apple.com>
+
+ Land release assertions to help track down a possible HTMLCollection lifetime bug
+ https://bugs.webkit.org/show_bug.cgi?id=154490
+
+ Reviewed by Ryosuke Niwa.
+
+ Land release assertions to help track down a possible HTMLCollection
+ lifetime bug: <rdar://problem/24457478>.
+
+ * bindings/js/JSHTMLCollectionCustom.cpp:
+ (WebCore::JSHTMLCollection::getOwnPropertyNames):
+ * html/HTMLCollection.cpp:
+ (WebCore::HTMLCollection::HTMLCollection):
+ (WebCore::HTMLCollection::~HTMLCollection):
+ * html/HTMLCollection.h:
+ (WebCore::HTMLCollection::wasDeletionStarted):
+ * html/HTMLCollection.idl:
+
</ins><span class="cx"> 2016-02-19 Doug Russell <d_russell@apple.com>
</span><span class="cx">
</span><span class="cx"> Bug 154366 - AX: AXObjectCache::visiblePositionForTextMarkerData() doesn't account for equivalent visibly equivalent positions
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsjsJSHTMLCollectionCustomcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/js/JSHTMLCollectionCustom.cpp (196853 => 196854)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/js/JSHTMLCollectionCustom.cpp 2016-02-20 04:17:12 UTC (rev 196853)
+++ trunk/Source/WebCore/bindings/js/JSHTMLCollectionCustom.cpp 2016-02-20 04:41:06 UTC (rev 196854)
</span><span class="lines">@@ -77,4 +77,23 @@
</span><span class="cx"> return CREATE_DOM_WRAPPER(globalObject, HTMLCollection, collection);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+// FIXME: These custom bindings are only needed temporarily to add release assertions in order to help
+// track down a possible lifetime issue (rdar://problem/24457478).
+void JSHTMLCollection::getOwnPropertyNames(JSObject* object, ExecState* state, PropertyNameArray& propertyNames, EnumerationMode mode)
+{
+ auto* thisObject = jsDynamicCast<JSHTMLCollection*>(object);
+ RELEASE_ASSERT_WITH_MESSAGE(thisObject, "Bad cast from JSObject to JSHTMLCollection");
+ RELEASE_ASSERT_WITH_MESSAGE(thisObject->wrapped().refCount() > 0, "Wrapped object is dead");
+ RELEASE_ASSERT_WITH_MESSAGE(!thisObject->wrapped().wasDeletionStarted(), "Wrapped object is being destroyed");
+ RELEASE_ASSERT_WITH_MESSAGE(!currentWorld(state).isNormal() || thisObject->wrapped().wrapper(), "Wrapper is dead");
+
+ for (unsigned i = 0, count = thisObject->wrapped().length(); i < count; ++i)
+ propertyNames.add(Identifier::from(state, i));
+ if (mode.includeDontEnumProperties()) {
+ for (auto& propertyName : thisObject->wrapped().supportedPropertyNames())
+ propertyNames.add(Identifier::fromString(state, propertyName));
+ }
+ Base::getOwnPropertyNames(thisObject, state, propertyNames, mode);
+}
+
</ins><span class="cx"> } // namespace WebCore
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLCollectioncpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLCollection.cpp (196853 => 196854)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLCollection.cpp 2016-02-20 04:17:12 UTC (rev 196853)
+++ trunk/Source/WebCore/html/HTMLCollection.cpp 2016-02-20 04:41:06 UTC (rev 196854)
</span><span class="lines">@@ -109,6 +109,7 @@
</span><span class="cx"> , m_collectionType(type)
</span><span class="cx"> , m_invalidationType(invalidationTypeExcludingIdAndNameAttributes(type))
</span><span class="cx"> , m_rootType(rootTypeFromCollectionType(type))
</span><ins>+ , m_wasDeletionStarted(false)
</ins><span class="cx"> {
</span><span class="cx"> ASSERT(m_rootType == static_cast<unsigned>(rootTypeFromCollectionType(type)));
</span><span class="cx"> ASSERT(m_invalidationType == static_cast<unsigned>(invalidationTypeExcludingIdAndNameAttributes(type)));
</span><span class="lines">@@ -117,6 +118,8 @@
</span><span class="cx">
</span><span class="cx"> HTMLCollection::~HTMLCollection()
</span><span class="cx"> {
</span><ins>+ m_wasDeletionStarted = true;
+
</ins><span class="cx"> if (hasNamedElementCache())
</span><span class="cx"> document().collectionWillClearIdNameMap(*this);
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLCollectionh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLCollection.h (196853 => 196854)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLCollection.h 2016-02-20 04:17:12 UTC (rev 196853)
+++ trunk/Source/WebCore/html/HTMLCollection.h 2016-02-20 04:41:06 UTC (rev 196854)
</span><span class="lines">@@ -85,6 +85,8 @@
</span><span class="cx">
</span><span class="cx"> bool hasNamedElementCache() const;
</span><span class="cx">
</span><ins>+ bool wasDeletionStarted() { return m_wasDeletionStarted; }
+
</ins><span class="cx"> protected:
</span><span class="cx"> HTMLCollection(ContainerNode& base, CollectionType);
</span><span class="cx">
</span><span class="lines">@@ -108,6 +110,8 @@
</span><span class="cx"> const unsigned m_collectionType : 5;
</span><span class="cx"> const unsigned m_invalidationType : 4;
</span><span class="cx"> const unsigned m_rootType : 1;
</span><ins>+ // FIXME: This flag is here temporarily to help track down a possible lifetime issue (rdar://problem/24457478).
+ unsigned m_wasDeletionStarted : 1;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> inline ContainerNode& HTMLCollection::rootNode() const
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLCollectionidl"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLCollection.idl (196853 => 196854)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLCollection.idl 2016-02-20 04:17:12 UTC (rev 196853)
+++ trunk/Source/WebCore/html/HTMLCollection.idl 2016-02-20 04:41:06 UTC (rev 196854)
</span><span class="lines">@@ -23,6 +23,7 @@
</span><span class="cx"> GenerateIsReachable=ImplOwnerNodeRoot,
</span><span class="cx"> ObjCPolymorphic,
</span><span class="cx"> ReportExtraMemoryCost,
</span><ins>+ CustomEnumerateProperty
</ins><span class="cx"> ] interface HTMLCollection {
</span><span class="cx"> readonly attribute unsigned long length;
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>