<!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>[164091] 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/164091">164091</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2014-02-13 20:03:59 -0800 (Thu, 13 Feb 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>[MSE] Move PublicURLManager shutdown logic so ActiveDOMObjects associated with public URLs won't leak.
https://bugs.webkit.org/show_bug.cgi?id=128532
Patch by Byungseon Shin <sun.shin@lge.com> on 2014-02-13
Reviewed by Jer Noble.
This fixes a leak of DOM objects by breaking the circular reference
between Document, PublicURLManager, and MediaSource.
Instead of clearing PublicURLManager at destruction-time,
which is delayed indefinitely because of the circular reference,
clear the PublicURLManager during ActiveDOMObject::stop().
Frome Blink <a href="http://trac.webkit.org/projects/webkit/changeset/151890">r151890</a> by <acolwell@chromium.org>
<https://src.chromium.org/viewvc/blink?view=rev&revision=151890>
* dom/ScriptExecutionContext.cpp:
(WebCore::ScriptExecutionContext::~ScriptExecutionContext):
(WebCore::ScriptExecutionContext::publicURLManager):
* html/DOMURL.h:
* html/PublicURLManager.cpp:
(WebCore::PublicURLManager::create):
(WebCore::PublicURLManager::PublicURLManager):
(WebCore::PublicURLManager::registerURL):
(WebCore::PublicURLManager::stop):
* html/PublicURLManager.h:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoredomScriptExecutionContextcpp">trunk/Source/WebCore/dom/ScriptExecutionContext.cpp</a></li>
<li><a href="#trunkSourceWebCorehtmlDOMURLh">trunk/Source/WebCore/html/DOMURL.h</a></li>
<li><a href="#trunkSourceWebCorehtmlPublicURLManagercpp">trunk/Source/WebCore/html/PublicURLManager.cpp</a></li>
<li><a href="#trunkSourceWebCorehtmlPublicURLManagerh">trunk/Source/WebCore/html/PublicURLManager.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (164090 => 164091)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-02-14 03:35:13 UTC (rev 164090)
+++ trunk/Source/WebCore/ChangeLog 2014-02-14 04:03:59 UTC (rev 164091)
</span><span class="lines">@@ -1,3 +1,30 @@
</span><ins>+2014-02-13 Byungseon Shin <sun.shin@lge.com>
+
+ [MSE] Move PublicURLManager shutdown logic so ActiveDOMObjects associated with public URLs won't leak.
+ https://bugs.webkit.org/show_bug.cgi?id=128532
+
+ Reviewed by Jer Noble.
+
+ This fixes a leak of DOM objects by breaking the circular reference
+ between Document, PublicURLManager, and MediaSource.
+ Instead of clearing PublicURLManager at destruction-time,
+ which is delayed indefinitely because of the circular reference,
+ clear the PublicURLManager during ActiveDOMObject::stop().
+
+ Frome Blink r151890 by <acolwell@chromium.org>
+ <https://src.chromium.org/viewvc/blink?view=rev&revision=151890>
+
+ * dom/ScriptExecutionContext.cpp:
+ (WebCore::ScriptExecutionContext::~ScriptExecutionContext):
+ (WebCore::ScriptExecutionContext::publicURLManager):
+ * html/DOMURL.h:
+ * html/PublicURLManager.cpp:
+ (WebCore::PublicURLManager::create):
+ (WebCore::PublicURLManager::PublicURLManager):
+ (WebCore::PublicURLManager::registerURL):
+ (WebCore::PublicURLManager::stop):
+ * html/PublicURLManager.h:
+
</ins><span class="cx"> 2014-02-13 Myles C. Maxfield <mmaxfield@apple.com>
</span><span class="cx">
</span><span class="cx"> Remove position:sticky runtime flag
</span></span></pre></div>
<a id="trunkSourceWebCoredomScriptExecutionContextcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/ScriptExecutionContext.cpp (164090 => 164091)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/ScriptExecutionContext.cpp 2014-02-14 03:35:13 UTC (rev 164090)
+++ trunk/Source/WebCore/dom/ScriptExecutionContext.cpp 2014-02-14 04:03:59 UTC (rev 164091)
</span><span class="lines">@@ -117,10 +117,6 @@
</span><span class="cx"> ASSERT((*iter)->scriptExecutionContext() == this);
</span><span class="cx"> (*iter)->contextDestroyed();
</span><span class="cx"> }
</span><del>-#if ENABLE(BLOB)
- if (m_publicURLManager)
- m_publicURLManager->contextDestroyed();
-#endif
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void ScriptExecutionContext::processMessagePortMessagesSoon()
</span><span class="lines">@@ -367,7 +363,7 @@
</span><span class="cx"> PublicURLManager& ScriptExecutionContext::publicURLManager()
</span><span class="cx"> {
</span><span class="cx"> if (!m_publicURLManager)
</span><del>- m_publicURLManager = PublicURLManager::create();
</del><ins>+ m_publicURLManager = PublicURLManager::create(this);
</ins><span class="cx"> return *m_publicURLManager;
</span><span class="cx"> }
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlDOMURLh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/DOMURL.h (164090 => 164091)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/DOMURL.h 2014-02-14 03:35:13 UTC (rev 164090)
+++ trunk/Source/WebCore/html/DOMURL.h 2014-02-14 04:03:59 UTC (rev 164091)
</span><span class="lines">@@ -53,8 +53,6 @@
</span><span class="cx"> void setHref(const String&, ExceptionCode&);
</span><span class="cx">
</span><span class="cx"> #if ENABLE(BLOB)
</span><del>- static void contextDestroyed(ScriptExecutionContext*);
-
</del><span class="cx"> static String createObjectURL(ScriptExecutionContext*, Blob*);
</span><span class="cx"> static void revokeObjectURL(ScriptExecutionContext*, const String&);
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlPublicURLManagercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/PublicURLManager.cpp (164090 => 164091)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/PublicURLManager.cpp 2014-02-14 03:35:13 UTC (rev 164090)
+++ trunk/Source/WebCore/html/PublicURLManager.cpp 2014-02-14 04:03:59 UTC (rev 164091)
</span><span class="lines">@@ -35,8 +35,24 @@
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><ins>+PassOwnPtr<PublicURLManager> PublicURLManager::create(ScriptExecutionContext* context)
+{
+ OwnPtr<PublicURLManager> publicURLManager(adoptPtr(new PublicURLManager(context)));
+ publicURLManager->suspendIfNeeded();
+ return publicURLManager.release();
+}
+
+PublicURLManager::PublicURLManager(ScriptExecutionContext* context)
+ : ActiveDOMObject(context)
+ , m_isStopped(false)
+{
+}
+
</ins><span class="cx"> void PublicURLManager::registerURL(SecurityOrigin* origin, const URL& url, URLRegistrable* registrable)
</span><span class="cx"> {
</span><ins>+ if (m_isStopped)
+ return;
+
</ins><span class="cx"> RegistryURLMap::iterator found = m_registryToURL.add(&registrable->registry(), URLSet()).iterator;
</span><span class="cx"> found->key->registerURL(origin, url, registrable);
</span><span class="cx"> found->value.add(url.string());
</span><span class="lines">@@ -53,8 +69,12 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void PublicURLManager::contextDestroyed()
</del><ins>+void PublicURLManager::stop()
</ins><span class="cx"> {
</span><ins>+ if (m_isStopped)
+ return;
+
+ m_isStopped = true;
</ins><span class="cx"> for (RegistryURLMap::iterator i = m_registryToURL.begin(); i != m_registryToURL.end(); ++i) {
</span><span class="cx"> for (URLSet::iterator j = i->value.begin(); j != i->value.end(); ++j)
</span><span class="cx"> i->key->unregisterURL(URL(ParsedURLString, *j));
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlPublicURLManagerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/PublicURLManager.h (164090 => 164091)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/PublicURLManager.h 2014-02-14 03:35:13 UTC (rev 164090)
+++ trunk/Source/WebCore/html/PublicURLManager.h 2014-02-14 04:03:59 UTC (rev 164091)
</span><span class="lines">@@ -27,6 +27,7 @@
</span><span class="cx"> #define PublicURLManager_h
</span><span class="cx">
</span><span class="cx"> #if ENABLE(BLOB)
</span><ins>+#include "ActiveDOMObject.h"
</ins><span class="cx"> #include <wtf/HashMap.h>
</span><span class="cx"> #include <wtf/HashSet.h>
</span><span class="cx"> #include <wtf/PassOwnPtr.h>
</span><span class="lines">@@ -41,19 +42,23 @@
</span><span class="cx"> class URLRegistry;
</span><span class="cx"> class URLRegistrable;
</span><span class="cx">
</span><del>-class PublicURLManager {
</del><ins>+class PublicURLManager : public ActiveDOMObject {
</ins><span class="cx"> WTF_MAKE_FAST_ALLOCATED;
</span><span class="cx"> public:
</span><del>- static OwnPtr<PublicURLManager> create() { return adoptPtr(new PublicURLManager); }
</del><ins>+ static PassOwnPtr<PublicURLManager> create(ScriptExecutionContext*);
</ins><span class="cx">
</span><span class="cx"> void registerURL(SecurityOrigin*, const URL&, URLRegistrable*);
</span><span class="cx"> void revoke(const URL&);
</span><del>- void contextDestroyed();
</del><span class="cx">
</span><ins>+ // ActiveDOMObject interface.
+ virtual void stop() override;
</ins><span class="cx"> private:
</span><ins>+ PublicURLManager(ScriptExecutionContext*);
+
</ins><span class="cx"> typedef HashSet<String> URLSet;
</span><span class="cx"> typedef HashMap<URLRegistry*, URLSet > RegistryURLMap;
</span><span class="cx"> RegistryURLMap m_registryToURL;
</span><ins>+ bool m_isStopped;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span></span></pre>
</div>
</div>
</body>
</html>