<!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>[177585] trunk/Source</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/177585">177585</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2014-12-19 11:37:19 -0800 (Fri, 19 Dec 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Web Inspector: CRASH inspector-protocol/debugger/breakpoint-action-detach.html
https://bugs.webkit.org/show_bug.cgi?id=139797
Patch by Joseph Pecoraro <pecoraro@apple.com> on 2014-12-19
Reviewed by Mark Lam.
Source/JavaScriptCore:
* debugger/Debugger.h:
* debugger/Debugger.cpp:
(JSC::Debugger::isAttached):
Check if we are the debugger for a particular global object.
(JSC::Debugger::pauseIfNeeded):
Pass the global object on when hitting a brekapoint.
* inspector/ScriptDebugServer.h:
* inspector/ScriptDebugServer.cpp:
(Inspector::ScriptDebugServer::handleBreakpointHit):
Stop evaluting breakpoint actions if a previous action caused the
debugger to detach from this global object.
(Inspector::ScriptDebugServer::handlePause):
Standardize on passing JSGlobalObject parameter first.
Source/WebKit/mac:
* WebView/WebScriptDebugger.h:
* WebView/WebScriptDebugger.mm:
(WebScriptDebugger::handlePause):
Standardize on passing JSGlobalObject parameter first.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCoredebuggerDebuggercpp">trunk/Source/JavaScriptCore/debugger/Debugger.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoredebuggerDebuggerh">trunk/Source/JavaScriptCore/debugger/Debugger.h</a></li>
<li><a href="#trunkSourceJavaScriptCoreinspectorScriptDebugServercpp">trunk/Source/JavaScriptCore/inspector/ScriptDebugServer.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreinspectorScriptDebugServerh">trunk/Source/JavaScriptCore/inspector/ScriptDebugServer.h</a></li>
<li><a href="#trunkSourceWebKitmacChangeLog">trunk/Source/WebKit/mac/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitmacWebViewWebScriptDebuggerh">trunk/Source/WebKit/mac/WebView/WebScriptDebugger.h</a></li>
<li><a href="#trunkSourceWebKitmacWebViewWebScriptDebuggermm">trunk/Source/WebKit/mac/WebView/WebScriptDebugger.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (177584 => 177585)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2014-12-19 19:34:19 UTC (rev 177584)
+++ trunk/Source/JavaScriptCore/ChangeLog 2014-12-19 19:37:19 UTC (rev 177585)
</span><span class="lines">@@ -1,3 +1,25 @@
</span><ins>+2014-12-19 Joseph Pecoraro <pecoraro@apple.com>
+
+ Web Inspector: CRASH inspector-protocol/debugger/breakpoint-action-detach.html
+ https://bugs.webkit.org/show_bug.cgi?id=139797
+
+ Reviewed by Mark Lam.
+
+ * debugger/Debugger.h:
+ * debugger/Debugger.cpp:
+ (JSC::Debugger::isAttached):
+ Check if we are the debugger for a particular global object.
+ (JSC::Debugger::pauseIfNeeded):
+ Pass the global object on when hitting a brekapoint.
+
+ * inspector/ScriptDebugServer.h:
+ * inspector/ScriptDebugServer.cpp:
+ (Inspector::ScriptDebugServer::handleBreakpointHit):
+ Stop evaluting breakpoint actions if a previous action caused the
+ debugger to detach from this global object.
+ (Inspector::ScriptDebugServer::handlePause):
+ Standardize on passing JSGlobalObject parameter first.
+
</ins><span class="cx"> 2014-12-19 Mark Lam <mark.lam@apple.com>
</span><span class="cx">
</span><span class="cx"> [Win] Endless compiler warnings created by DFGEdge.h.
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoredebuggerDebuggercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/debugger/Debugger.cpp (177584 => 177585)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/debugger/Debugger.cpp 2014-12-19 19:34:19 UTC (rev 177584)
+++ trunk/Source/JavaScriptCore/debugger/Debugger.cpp 2014-12-19 19:37:19 UTC (rev 177585)
</span><span class="lines">@@ -206,6 +206,11 @@
</span><span class="cx"> m_vm = nullptr;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+bool Debugger::isAttached(JSGlobalObject* globalObject)
+{
+ return globalObject->debugger() == this;
+}
+
</ins><span class="cx"> class Debugger::SetSteppingModeFunctor {
</span><span class="cx"> public:
</span><span class="cx"> SetSteppingModeFunctor(Debugger* debugger, SteppingMode mode)
</span><span class="lines">@@ -660,14 +665,14 @@
</span><span class="cx"> m_pauseOnNextStatement = false;
</span><span class="cx">
</span><span class="cx"> if (didHitBreakpoint) {
</span><del>- handleBreakpointHit(breakpoint);
</del><ins>+ handleBreakpointHit(vmEntryGlobalObject, breakpoint);
</ins><span class="cx"> // Note that the actions can potentially stop the debugger, so we need to check that
</span><span class="cx"> // we still have a current call frame when we get back.
</span><span class="cx"> if (breakpoint.autoContinue || !m_currentCallFrame)
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- handlePause(m_reasonForPause, vmEntryGlobalObject);
</del><ins>+ handlePause(vmEntryGlobalObject, m_reasonForPause);
</ins><span class="cx">
</span><span class="cx"> if (!m_pauseOnNextStatement && !m_pauseOnCallFrame) {
</span><span class="cx"> setSteppingMode(SteppingModeDisabled);
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoredebuggerDebuggerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/debugger/Debugger.h (177584 => 177585)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/debugger/Debugger.h 2014-12-19 19:34:19 UTC (rev 177584)
+++ trunk/Source/JavaScriptCore/debugger/Debugger.h 2014-12-19 19:37:19 UTC (rev 177585)
</span><span class="lines">@@ -60,12 +60,13 @@
</span><span class="cx">
</span><span class="cx"> bool needsExceptionCallbacks() const { return m_pauseOnExceptionsState != DontPauseOnExceptions; }
</span><span class="cx">
</span><del>- void attach(JSGlobalObject*);
</del><span class="cx"> enum ReasonForDetach {
</span><span class="cx"> TerminatingDebuggingSession,
</span><span class="cx"> GlobalObjectIsDestructing
</span><span class="cx"> };
</span><del>- virtual void detach(JSGlobalObject*, ReasonForDetach);
</del><ins>+ void attach(JSGlobalObject*);
+ void detach(JSGlobalObject*, ReasonForDetach);
+ bool isAttached(JSGlobalObject*);
</ins><span class="cx">
</span><span class="cx"> BreakpointID setBreakpoint(Breakpoint, unsigned& actualLine, unsigned& actualColumn);
</span><span class="cx"> void removeBreakpoint(BreakpointID);
</span><span class="lines">@@ -89,7 +90,7 @@
</span><span class="cx"> void stepOverStatement();
</span><span class="cx"> void stepOutOfFunction();
</span><span class="cx">
</span><del>- bool isPaused() { return m_isPaused; }
</del><ins>+ bool isPaused() const { return m_isPaused; }
</ins><span class="cx"> bool isStepping() const { return m_steppingMode == SteppingModeEnabled; }
</span><span class="cx">
</span><span class="cx"> virtual void sourceParsed(ExecState*, SourceProvider*, int errorLineNumber, const WTF::String& errorMessage) = 0;
</span><span class="lines">@@ -108,7 +109,7 @@
</span><span class="cx">
</span><span class="cx"> protected:
</span><span class="cx"> virtual bool needPauseHandling(JSGlobalObject*) { return false; }
</span><del>- virtual void handleBreakpointHit(const Breakpoint&) { }
</del><ins>+ virtual void handleBreakpointHit(JSGlobalObject*, const Breakpoint&) { }
</ins><span class="cx"> virtual void handleExceptionInBreakpointCondition(ExecState*, JSValue exception) const { UNUSED_PARAM(exception); }
</span><span class="cx">
</span><span class="cx"> enum ReasonForPause {
</span><span class="lines">@@ -124,7 +125,7 @@
</span><span class="cx">
</span><span class="cx"> ReasonForPause reasonForPause() const { return m_reasonForPause; }
</span><span class="cx">
</span><del>- virtual void handlePause(ReasonForPause, JSGlobalObject*) { }
</del><ins>+ virtual void handlePause(JSGlobalObject*, ReasonForPause) { }
</ins><span class="cx"> virtual void notifyDoneProcessingDebuggerEvents() { }
</span><span class="cx">
</span><span class="cx"> private:
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreinspectorScriptDebugServercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/inspector/ScriptDebugServer.cpp (177584 => 177585)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/inspector/ScriptDebugServer.cpp 2014-12-19 19:34:19 UTC (rev 177584)
+++ trunk/Source/JavaScriptCore/inspector/ScriptDebugServer.cpp 2014-12-19 19:37:19 UTC (rev 177585)
</span><span class="lines">@@ -286,15 +286,20 @@
</span><span class="cx"> m_doneProcessingDebuggerEvents = true;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void ScriptDebugServer::handleBreakpointHit(const JSC::Breakpoint& breakpoint)
</del><ins>+void ScriptDebugServer::handleBreakpointHit(JSC::JSGlobalObject* globalObject, const JSC::Breakpoint& breakpoint)
</ins><span class="cx"> {
</span><ins>+ ASSERT(isAttached(globalObject));
+
</ins><span class="cx"> m_currentProbeBatchId++;
</span><ins>+
</ins><span class="cx"> BreakpointIDToActionsMap::iterator it = m_breakpointIDToActions.find(breakpoint.id);
</span><span class="cx"> if (it != m_breakpointIDToActions.end()) {
</span><del>- BreakpointActions& actions = it->value;
</del><ins>+ BreakpointActions actions = it->value;
</ins><span class="cx"> for (size_t i = 0; i < actions.size(); ++i) {
</span><span class="cx"> if (!evaluateBreakpointAction(actions[i]))
</span><span class="cx"> return;
</span><ins>+ if (!isAttached(globalObject))
+ return;
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="lines">@@ -304,7 +309,7 @@
</span><span class="cx"> reportException(exec, exception);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void ScriptDebugServer::handlePause(Debugger::ReasonForPause, JSGlobalObject* vmEntryGlobalObject)
</del><ins>+void ScriptDebugServer::handlePause(JSGlobalObject* vmEntryGlobalObject, Debugger::ReasonForPause)
</ins><span class="cx"> {
</span><span class="cx"> dispatchFunctionToListeners(&ScriptDebugServer::dispatchDidPause);
</span><span class="cx"> didPause(vmEntryGlobalObject);
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreinspectorScriptDebugServerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/inspector/ScriptDebugServer.h (177584 => 177585)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/inspector/ScriptDebugServer.h 2014-12-19 19:34:19 UTC (rev 177584)
+++ trunk/Source/JavaScriptCore/inspector/ScriptDebugServer.h 2014-12-19 19:37:19 UTC (rev 177585)
</span><span class="lines">@@ -100,9 +100,9 @@
</span><span class="cx">
</span><span class="cx"> virtual void sourceParsed(JSC::ExecState*, JSC::SourceProvider*, int errorLine, const String& errorMsg) override final;
</span><span class="cx"> virtual bool needPauseHandling(JSC::JSGlobalObject*) override final { return true; }
</span><del>- virtual void handleBreakpointHit(const JSC::Breakpoint&) override final;
</del><ins>+ virtual void handleBreakpointHit(JSC::JSGlobalObject*, const JSC::Breakpoint&) override final;
</ins><span class="cx"> virtual void handleExceptionInBreakpointCondition(JSC::ExecState*, JSC::JSValue exception) const override final;
</span><del>- virtual void handlePause(JSC::Debugger::ReasonForPause, JSC::JSGlobalObject*) override final;
</del><ins>+ virtual void handlePause(JSC::JSGlobalObject*, JSC::Debugger::ReasonForPause) override final;
</ins><span class="cx"> virtual void notifyDoneProcessingDebuggerEvents() override final;
</span><span class="cx">
</span><span class="cx"> Deprecated::ScriptValue exceptionOrCaughtValue(JSC::ExecState*);
</span></span></pre></div>
<a id="trunkSourceWebKitmacChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/ChangeLog (177584 => 177585)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/ChangeLog 2014-12-19 19:34:19 UTC (rev 177584)
+++ trunk/Source/WebKit/mac/ChangeLog 2014-12-19 19:37:19 UTC (rev 177585)
</span><span class="lines">@@ -1,3 +1,15 @@
</span><ins>+2014-12-19 Joseph Pecoraro <pecoraro@apple.com>
+
+ Web Inspector: CRASH inspector-protocol/debugger/breakpoint-action-detach.html
+ https://bugs.webkit.org/show_bug.cgi?id=139797
+
+ Reviewed by Mark Lam.
+
+ * WebView/WebScriptDebugger.h:
+ * WebView/WebScriptDebugger.mm:
+ (WebScriptDebugger::handlePause):
+ Standardize on passing JSGlobalObject parameter first.
+
</ins><span class="cx"> 2014-12-19 Commit Queue <commit-queue@webkit.org>
</span><span class="cx">
</span><span class="cx"> Unreviewed, rolling out r177574.
</span></span></pre></div>
<a id="trunkSourceWebKitmacWebViewWebScriptDebuggerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/WebView/WebScriptDebugger.h (177584 => 177585)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/WebView/WebScriptDebugger.h 2014-12-19 19:34:19 UTC (rev 177584)
+++ trunk/Source/WebKit/mac/WebView/WebScriptDebugger.h 2014-12-19 19:37:19 UTC (rev 177585)
</span><span class="lines">@@ -56,7 +56,7 @@
</span><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> virtual void sourceParsed(JSC::ExecState*, JSC::SourceProvider*, int errorLine, const WTF::String& errorMsg) override;
</span><del>- virtual void handlePause(JSC::Debugger::ReasonForPause, JSC::JSGlobalObject*) override;
</del><ins>+ virtual void handlePause(JSC::JSGlobalObject*, JSC::Debugger::ReasonForPause) override;
</ins><span class="cx"> virtual bool needPauseHandling(JSC::JSGlobalObject*) override { return true; }
</span><span class="cx">
</span><span class="cx"> bool m_callingDelegate;
</span></span></pre></div>
<a id="trunkSourceWebKitmacWebViewWebScriptDebuggermm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/WebView/WebScriptDebugger.mm (177584 => 177585)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/WebView/WebScriptDebugger.mm 2014-12-19 19:34:19 UTC (rev 177584)
+++ trunk/Source/WebKit/mac/WebView/WebScriptDebugger.mm 2014-12-19 19:37:19 UTC (rev 177585)
</span><span class="lines">@@ -118,7 +118,7 @@
</span><span class="cx"> m_callingDelegate = false;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void WebScriptDebugger::handlePause(Debugger::ReasonForPause reason, JSGlobalObject* globalObject)
</del><ins>+void WebScriptDebugger::handlePause(JSGlobalObject* globalObject, Debugger::ReasonForPause reason)
</ins><span class="cx"> {
</span><span class="cx"> if (m_callingDelegate)
</span><span class="cx"> return;
</span></span></pre>
</div>
</div>
</body>
</html>