<!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>[205033] trunk/Source/JavaScriptCore</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/205033">205033</a></dd>
<dt>Author</dt> <dd>joepeck@webkit.org</dd>
<dt>Date</dt> <dd>2016-08-26 13:22:21 -0700 (Fri, 26 Aug 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Web Inspector: HeapProfiler/ScriptProfiler do not destruct safely when JSContext is destroyed
https://bugs.webkit.org/show_bug.cgi?id=161027
<rdar://problem/27871349>
Reviewed by Mark Lam.
For JSContext inspection, when a frontend connects keep the target alive.
This means ref'ing the JSGlobalObject / VM when the first frontend
connects and deref'ing when the last frontend disconnects.
* inspector/JSGlobalObjectInspectorController.h:
* inspector/JSGlobalObjectInspectorController.cpp:
(Inspector::JSGlobalObjectInspectorController::globalObjectDestroyed):
(Inspector::JSGlobalObjectInspectorController::disconnectAllFrontends): Deleted.
Now that frontends keep the global object alive, when the global object
is destroyed that must mean that no frontends exist. Remove the now
stale code path.
(Inspector::JSGlobalObjectInspectorController::connectFrontend):
(Inspector::JSGlobalObjectInspectorController::disconnectFrontend):
Ref the target when the first frontend connects, deref when the last disconnects.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCoreinspectorJSGlobalObjectInspectorControllercpp">trunk/Source/JavaScriptCore/inspector/JSGlobalObjectInspectorController.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreinspectorJSGlobalObjectInspectorControllerh">trunk/Source/JavaScriptCore/inspector/JSGlobalObjectInspectorController.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (205032 => 205033)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2016-08-26 20:18:00 UTC (rev 205032)
+++ trunk/Source/JavaScriptCore/ChangeLog 2016-08-26 20:22:21 UTC (rev 205033)
</span><span class="lines">@@ -1,3 +1,27 @@
</span><ins>+2016-08-26 Joseph Pecoraro <pecoraro@apple.com>
+
+ Web Inspector: HeapProfiler/ScriptProfiler do not destruct safely when JSContext is destroyed
+ https://bugs.webkit.org/show_bug.cgi?id=161027
+ <rdar://problem/27871349>
+
+ Reviewed by Mark Lam.
+
+ For JSContext inspection, when a frontend connects keep the target alive.
+ This means ref'ing the JSGlobalObject / VM when the first frontend
+ connects and deref'ing when the last frontend disconnects.
+
+ * inspector/JSGlobalObjectInspectorController.h:
+ * inspector/JSGlobalObjectInspectorController.cpp:
+ (Inspector::JSGlobalObjectInspectorController::globalObjectDestroyed):
+ (Inspector::JSGlobalObjectInspectorController::disconnectAllFrontends): Deleted.
+ Now that frontends keep the global object alive, when the global object
+ is destroyed that must mean that no frontends exist. Remove the now
+ stale code path.
+
+ (Inspector::JSGlobalObjectInspectorController::connectFrontend):
+ (Inspector::JSGlobalObjectInspectorController::disconnectFrontend):
+ Ref the target when the first frontend connects, deref when the last disconnects.
+
</ins><span class="cx"> 2016-08-26 Yusuke Suzuki <utatane.tea@gmail.com>
</span><span class="cx">
</span><span class="cx"> [ES6] newPromiseCapabilities should check the given argument is constructor
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreinspectorJSGlobalObjectInspectorControllercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/inspector/JSGlobalObjectInspectorController.cpp (205032 => 205033)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/inspector/JSGlobalObjectInspectorController.cpp 2016-08-26 20:18:00 UTC (rev 205032)
+++ trunk/Source/JavaScriptCore/inspector/JSGlobalObjectInspectorController.cpp 2016-08-26 20:22:21 UTC (rev 205033)
</span><span class="lines">@@ -115,7 +115,7 @@
</span><span class="cx">
</span><span class="cx"> void JSGlobalObjectInspectorController::globalObjectDestroyed()
</span><span class="cx"> {
</span><del>- disconnectAllFrontends();
</del><ins>+ ASSERT(!m_frontendRouter->hasFrontends());
</ins><span class="cx">
</span><span class="cx"> m_injectedScriptManager->disconnect();
</span><span class="cx"> }
</span><span class="lines">@@ -132,6 +132,10 @@
</span><span class="cx"> if (!connectedFirstFrontend)
</span><span class="cx"> return;
</span><span class="cx">
</span><ins>+ // Keep the JSGlobalObject and VM alive while we are debugging it.
+ m_strongVM = &m_globalObject.vm();
+ m_strongGlobalObject.set(m_globalObject.vm(), &m_globalObject);
+
</ins><span class="cx"> // FIXME: change this to notify agents which frontend has connected (by id).
</span><span class="cx"> m_agents.didCreateFrontendAndBackend(nullptr, nullptr);
</span><span class="cx">
</span><span class="lines">@@ -162,21 +166,10 @@
</span><span class="cx"> if (m_augmentingClient)
</span><span class="cx"> m_augmentingClient->inspectorDisconnected();
</span><span class="cx"> #endif
</span><del>-}
</del><span class="cx">
</span><del>-void JSGlobalObjectInspectorController::disconnectAllFrontends()
-{
- // FIXME: change this to notify agents which frontend has disconnected (by id).
- m_agents.willDestroyFrontendAndBackend(DisconnectReason::InspectedTargetDestroyed);
-
- m_frontendRouter->disconnectAllFrontends();
-
- m_isAutomaticInspection = false;
-
-#if ENABLE(INSPECTOR_ALTERNATE_DISPATCHERS)
- if (m_augmentingClient)
- m_augmentingClient->inspectorDisconnected();
-#endif
</del><ins>+ // Remove our JSGlobalObject and VM references, we are done debugging it.
+ m_strongGlobalObject.clear();
+ m_strongVM = nullptr;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void JSGlobalObjectInspectorController::dispatchMessageFromFrontend(const String& message)
</span><span class="lines">@@ -315,4 +308,3 @@
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> } // namespace Inspector
</span><del>-
</del></span></pre></div>
<a id="trunkSourceJavaScriptCoreinspectorJSGlobalObjectInspectorControllerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/inspector/JSGlobalObjectInspectorController.h (205032 => 205033)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/inspector/JSGlobalObjectInspectorController.h 2016-08-26 20:18:00 UTC (rev 205032)
+++ trunk/Source/JavaScriptCore/inspector/JSGlobalObjectInspectorController.h 2016-08-26 20:22:21 UTC (rev 205033)
</span><span class="lines">@@ -42,7 +42,6 @@
</span><span class="cx"> class Exception;
</span><span class="cx"> class ExecState;
</span><span class="cx"> class JSGlobalObject;
</span><del>-class JSValue;
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> namespace Inspector {
</span><span class="lines">@@ -53,7 +52,6 @@
</span><span class="cx"> class InspectorAgent;
</span><span class="cx"> class InspectorConsoleAgent;
</span><span class="cx"> class InspectorDebuggerAgent;
</span><del>-class InspectorHeapAgent;
</del><span class="cx"> class InspectorScriptProfilerAgent;
</span><span class="cx"> class JSGlobalObjectConsoleClient;
</span><span class="cx"> class ScriptCallStack;
</span><span class="lines">@@ -72,7 +70,6 @@
</span><span class="cx">
</span><span class="cx"> void connectFrontend(FrontendChannel*, bool isAutomaticInspection);
</span><span class="cx"> void disconnectFrontend(FrontendChannel*);
</span><del>- void disconnectAllFrontends();
</del><span class="cx">
</span><span class="cx"> void dispatchMessageFromFrontend(const String&);
</span><span class="cx">
</span><span class="lines">@@ -121,6 +118,10 @@
</span><span class="cx"> Ref<FrontendRouter> m_frontendRouter;
</span><span class="cx"> Ref<BackendDispatcher> m_backendDispatcher;
</span><span class="cx">
</span><ins>+ // Used to keep the JSGlobalObject and VM alive while we are debugging it.
+ JSC::Strong<JSC::JSGlobalObject> m_strongGlobalObject;
+ RefPtr<JSC::VM> m_strongVM;
+
</ins><span class="cx"> bool m_includeNativeCallStackWithExceptions { true };
</span><span class="cx"> bool m_isAutomaticInspection { false };
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>