<!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>[200467] 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/200467">200467</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2016-05-05 12:01:40 -0700 (Thu, 05 May 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Crash if you type "debugger" in the console and continue
https://bugs.webkit.org/show_bug.cgi?id=156924
<rdar://problem/25884189>
Patch by Joseph Pecoraro <pecoraro@apple.com> on 2016-05-05
Reviewed by Mark Lam.
Source/JavaScriptCore:
* inspector/agents/InspectorDebuggerAgent.cpp:
(Inspector::InspectorDebuggerAgent::evaluateOnCallFrame):
Bail with an error when we are not paused.
* inspector/agents/InspectorRuntimeAgent.cpp:
(Inspector::InspectorRuntimeAgent::callFunctionOn):
(Inspector::InspectorRuntimeAgent::getProperties):
(Inspector::InspectorRuntimeAgent::getDisplayableProperties):
(Inspector::InspectorRuntimeAgent::getCollectionEntries):
(Inspector::InspectorRuntimeAgent::saveResult):
Update poor error message.
Source/WebInspectorUI:
* UserInterface/Test/InspectorProtocol.js:
(InspectorProtocol.sendCommand):
Simplify sending a command with no parameters.
LayoutTests:
* inspector/debugger/evaluateOnCallFrame-errors-expected.txt: Added.
* inspector/debugger/evaluateOnCallFrame-errors.html: Added.
* inspector/protocol/backend-dispatcher-argument-errors-expected.txt:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsinspectorprotocolbackenddispatcherargumenterrorsexpectedtxt">trunk/LayoutTests/inspector/protocol/backend-dispatcher-argument-errors-expected.txt</a></li>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCoreinspectoragentsInspectorDebuggerAgentcpp">trunk/Source/JavaScriptCore/inspector/agents/InspectorDebuggerAgent.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreinspectoragentsInspectorRuntimeAgentcpp">trunk/Source/JavaScriptCore/inspector/agents/InspectorRuntimeAgent.cpp</a></li>
<li><a href="#trunkSourceWebInspectorUIChangeLog">trunk/Source/WebInspectorUI/ChangeLog</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceTestInspectorProtocoljs">trunk/Source/WebInspectorUI/UserInterface/Test/InspectorProtocol.js</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsinspectordebuggerevaluateOnCallFrameerrorsexpectedtxt">trunk/LayoutTests/inspector/debugger/evaluateOnCallFrame-errors-expected.txt</a></li>
<li><a href="#trunkLayoutTestsinspectordebuggerevaluateOnCallFrameerrorshtml">trunk/LayoutTests/inspector/debugger/evaluateOnCallFrame-errors.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (200466 => 200467)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2016-05-05 18:51:50 UTC (rev 200466)
+++ trunk/LayoutTests/ChangeLog 2016-05-05 19:01:40 UTC (rev 200467)
</span><span class="lines">@@ -1,3 +1,15 @@
</span><ins>+2016-05-05 Joseph Pecoraro <pecoraro@apple.com>
+
+ Crash if you type "debugger" in the console and continue
+ https://bugs.webkit.org/show_bug.cgi?id=156924
+ <rdar://problem/25884189>
+
+ Reviewed by Mark Lam.
+
+ * inspector/debugger/evaluateOnCallFrame-errors-expected.txt: Added.
+ * inspector/debugger/evaluateOnCallFrame-errors.html: Added.
+ * inspector/protocol/backend-dispatcher-argument-errors-expected.txt:
+
</ins><span class="cx"> 2016-05-04 Simon Fraser <simon.fraser@apple.com>
</span><span class="cx">
</span><span class="cx"> Comments on wired.com are blurry
</span></span></pre></div>
<a id="trunkLayoutTestsinspectordebuggerevaluateOnCallFrameerrorsexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/inspector/debugger/evaluateOnCallFrame-errors-expected.txt (0 => 200467)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/inspector/debugger/evaluateOnCallFrame-errors-expected.txt (rev 0)
+++ trunk/LayoutTests/inspector/debugger/evaluateOnCallFrame-errors-expected.txt 2016-05-05 19:01:40 UTC (rev 200467)
</span><span class="lines">@@ -0,0 +1,14 @@
</span><ins>+Calling Debugger.evaluateOnCallFrame protocol error cases.
+
+
+== Running test suite: Debugger.evaluateOnCallFrame.errors
+-- Running test case: EvaluateOnCallFrameNotPaused
+PASS: Paused
+PASS: Resumed
+PASS: Should be an error: Not paused
+
+-- Running test case: EvaluateOnCallFrameBadCallFrameIdentifier
+PASS: Paused
+PASS: Should be an error: Could not find InjectedScript for callFrameId
+PASS: Resumed
+
</ins></span></pre></div>
<a id="trunkLayoutTestsinspectordebuggerevaluateOnCallFrameerrorshtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/inspector/debugger/evaluateOnCallFrame-errors.html (0 => 200467)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/inspector/debugger/evaluateOnCallFrame-errors.html (rev 0)
+++ trunk/LayoutTests/inspector/debugger/evaluateOnCallFrame-errors.html 2016-05-05 19:01:40 UTC (rev 200467)
</span><span class="lines">@@ -0,0 +1,70 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<head>
+<script src="../../http/tests/inspector/resources/protocol-test.js"></script>
+<script>
+function triggerPause() {
+ debugger;
+}
+
+function test()
+{
+ InspectorProtocol.sendCommand("Debugger.enable");
+ InspectorProtocol.sendCommand("Debugger.setBreakpointsActive", {active: true});
+
+ let suite = ProtocolTest.createAsyncSuite("Debugger.evaluateOnCallFrame.errors");
+
+ suite.addTestCase({
+ name: "EvaluateOnCallFrameNotPaused",
+ description: "Triggering evaluate on call frame when not paused should issue an error.",
+ test: (resolve, reject) => {
+ ProtocolTest.evaluateInPage("triggerPause()");
+
+ let callFrameIdentifier;
+
+ InspectorProtocol.eventHandler["Debugger.paused"] = (messageObject) => {
+ ProtocolTest.pass("Paused");
+ InspectorProtocol.sendCommand("Debugger.resume");
+ callFrameIdentifier = messageObject.params.callFrames[0].callFrameId;
+ };
+
+ InspectorProtocol.eventHandler["Debugger.resumed"] = (messageObject) => {
+ ProtocolTest.pass("Resumed");
+ InspectorProtocol.sendCommand("Debugger.evaluateOnCallFrame", {callFrameId: callFrameIdentifier, expression: "this"}, (messageObject) => {
+ ProtocolTest.expectThat(messageObject.error, `Should be an error: ${messageObject.error ? messageObject.error.message : ""}`);
+ resolve();
+ });
+ };
+ }
+ });
+
+ suite.addTestCase({
+ name: "EvaluateOnCallFrameBadCallFrameIdentifier",
+ description: "Triggering evaluate on call frame with a bad call frame identifier should issue an error.",
+ test: (resolve, reject) => {
+ ProtocolTest.evaluateInPage("triggerPause()");
+
+ InspectorProtocol.eventHandler["Debugger.paused"] = (messageObject) => {
+ ProtocolTest.pass("Paused");
+
+ InspectorProtocol.sendCommand("Debugger.evaluateOnCallFrame", {callFrameId: "BAD-CALL-FRAME-ID", expression: "this"}, (messageObject) => {
+ ProtocolTest.expectThat(messageObject.error, `Should be an error: ${messageObject.error ? messageObject.error.message : ""}`);
+ InspectorProtocol.sendCommand("Debugger.resume");
+ });
+ };
+
+ InspectorProtocol.eventHandler["Debugger.resumed"] = (messageObject) => {
+ ProtocolTest.pass("Resumed");
+ resolve();
+ };
+ }
+ });
+
+ suite.runTestCasesAndFinish();
+}
+</script>
+</head>
+<body onload="runTest()">
+<p>Calling Debugger.evaluateOnCallFrame protocol error cases.</p>
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkLayoutTestsinspectorprotocolbackenddispatcherargumenterrorsexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/inspector/protocol/backend-dispatcher-argument-errors-expected.txt (200466 => 200467)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/inspector/protocol/backend-dispatcher-argument-errors-expected.txt 2016-05-05 18:51:50 UTC (rev 200466)
+++ trunk/LayoutTests/inspector/protocol/backend-dispatcher-argument-errors-expected.txt 2016-05-05 19:01:40 UTC (rev 200467)
</span><span class="lines">@@ -55,6 +55,6 @@
</span><span class="cx"> PASS: the backend should send a protocol error when receiving an invalid message.
</span><span class="cx"> PASS: the reported error should be "ServerError" (-32000)
</span><span class="cx"> Actual error code: -32000
</span><del>-Actual error message: Inspected frame has gone
-Actual error data: [{"code":-32000,"message":"Inspected frame has gone"}]
</del><ins>+Actual error message: Could not find InjectedScript for objectId
+Actual error data: [{"code":-32000,"message":"Could not find InjectedScript for objectId"}]
</ins><span class="cx">
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (200466 => 200467)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2016-05-05 18:51:50 UTC (rev 200466)
+++ trunk/Source/JavaScriptCore/ChangeLog 2016-05-05 19:01:40 UTC (rev 200467)
</span><span class="lines">@@ -1,3 +1,23 @@
</span><ins>+2016-05-05 Joseph Pecoraro <pecoraro@apple.com>
+
+ Crash if you type "debugger" in the console and continue
+ https://bugs.webkit.org/show_bug.cgi?id=156924
+ <rdar://problem/25884189>
+
+ Reviewed by Mark Lam.
+
+ * inspector/agents/InspectorDebuggerAgent.cpp:
+ (Inspector::InspectorDebuggerAgent::evaluateOnCallFrame):
+ Bail with an error when we are not paused.
+
+ * inspector/agents/InspectorRuntimeAgent.cpp:
+ (Inspector::InspectorRuntimeAgent::callFunctionOn):
+ (Inspector::InspectorRuntimeAgent::getProperties):
+ (Inspector::InspectorRuntimeAgent::getDisplayableProperties):
+ (Inspector::InspectorRuntimeAgent::getCollectionEntries):
+ (Inspector::InspectorRuntimeAgent::saveResult):
+ Update poor error message.
+
</ins><span class="cx"> 2016-05-05 Keith Miller <keith_miller@apple.com>
</span><span class="cx">
</span><span class="cx"> Add support for delete by value to the DFG
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreinspectoragentsInspectorDebuggerAgentcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/inspector/agents/InspectorDebuggerAgent.cpp (200466 => 200467)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/inspector/agents/InspectorDebuggerAgent.cpp 2016-05-05 18:51:50 UTC (rev 200466)
+++ trunk/Source/JavaScriptCore/inspector/agents/InspectorDebuggerAgent.cpp 2016-05-05 19:01:40 UTC (rev 200467)
</span><span class="lines">@@ -565,9 +565,14 @@
</span><span class="cx">
</span><span class="cx"> void InspectorDebuggerAgent::evaluateOnCallFrame(ErrorString& errorString, const String& callFrameId, const String& expression, const String* const objectGroup, const bool* const includeCommandLineAPI, const bool* const doNotPauseOnExceptionsAndMuteConsole, const bool* const returnByValue, const bool* generatePreview, const bool* saveResult, RefPtr<Inspector::Protocol::Runtime::RemoteObject>& result, Inspector::Protocol::OptOutput<bool>* wasThrown, Inspector::Protocol::OptOutput<int>* savedResultIndex)
</span><span class="cx"> {
</span><ins>+ if (m_currentCallStack.hasNoValue()) {
+ errorString = ASCIILiteral("Not paused");
+ return;
+ }
+
</ins><span class="cx"> InjectedScript injectedScript = m_injectedScriptManager.injectedScriptForObjectId(callFrameId);
</span><span class="cx"> if (injectedScript.hasNoValue()) {
</span><del>- errorString = ASCIILiteral("Inspected frame has gone");
</del><ins>+ errorString = ASCIILiteral("Could not find InjectedScript for callFrameId");
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreinspectoragentsInspectorRuntimeAgentcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/inspector/agents/InspectorRuntimeAgent.cpp (200466 => 200467)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/inspector/agents/InspectorRuntimeAgent.cpp 2016-05-05 18:51:50 UTC (rev 200466)
+++ trunk/Source/JavaScriptCore/inspector/agents/InspectorRuntimeAgent.cpp 2016-05-05 19:01:40 UTC (rev 200467)
</span><span class="lines">@@ -137,7 +137,7 @@
</span><span class="cx"> {
</span><span class="cx"> InjectedScript injectedScript = m_injectedScriptManager.injectedScriptForObjectId(objectId);
</span><span class="cx"> if (injectedScript.hasNoValue()) {
</span><del>- errorString = ASCIILiteral("Inspected frame has gone");
</del><ins>+ errorString = ASCIILiteral("Could not find InjectedScript for objectId");
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -163,7 +163,7 @@
</span><span class="cx"> {
</span><span class="cx"> InjectedScript injectedScript = m_injectedScriptManager.injectedScriptForObjectId(objectId);
</span><span class="cx"> if (injectedScript.hasNoValue()) {
</span><del>- errorString = ASCIILiteral("Inspected frame has gone");
</del><ins>+ errorString = ASCIILiteral("Could not find InjectedScript for objectId");
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -181,7 +181,7 @@
</span><span class="cx"> {
</span><span class="cx"> InjectedScript injectedScript = m_injectedScriptManager.injectedScriptForObjectId(objectId);
</span><span class="cx"> if (injectedScript.hasNoValue()) {
</span><del>- errorString = ASCIILiteral("Inspected frame has gone");
</del><ins>+ errorString = ASCIILiteral("Could not find InjectedScript for objectId");
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -199,7 +199,7 @@
</span><span class="cx"> {
</span><span class="cx"> InjectedScript injectedScript = m_injectedScriptManager.injectedScriptForObjectId(objectId);
</span><span class="cx"> if (injectedScript.hasNoValue()) {
</span><del>- errorString = ASCIILiteral("Inspected frame has gone");
</del><ins>+ errorString = ASCIILiteral("Could not find InjectedScript for objectId");
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -217,7 +217,7 @@
</span><span class="cx"> if (callArgument.getString(ASCIILiteral("objectId"), objectId)) {
</span><span class="cx"> injectedScript = m_injectedScriptManager.injectedScriptForObjectId(objectId);
</span><span class="cx"> if (injectedScript.hasNoValue()) {
</span><del>- errorString = ASCIILiteral("Inspected frame has gone");
</del><ins>+ errorString = ASCIILiteral("Could not find InjectedScript for objectId");
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx"> } else {
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/ChangeLog (200466 => 200467)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/ChangeLog 2016-05-05 18:51:50 UTC (rev 200466)
+++ trunk/Source/WebInspectorUI/ChangeLog 2016-05-05 19:01:40 UTC (rev 200467)
</span><span class="lines">@@ -1,3 +1,15 @@
</span><ins>+2016-05-05 Joseph Pecoraro <pecoraro@apple.com>
+
+ Crash if you type "debugger" in the console and continue
+ https://bugs.webkit.org/show_bug.cgi?id=156924
+ <rdar://problem/25884189>
+
+ Reviewed by Mark Lam.
+
+ * UserInterface/Test/InspectorProtocol.js:
+ (InspectorProtocol.sendCommand):
+ Simplify sending a command with no parameters.
+
</ins><span class="cx"> 2016-05-04 Nikita Vasilyev <nvasilyev@apple.com>
</span><span class="cx">
</span><span class="cx"> REGRESSION (r200401): Web Inspector: TypeError: undefined is not an object (evaluating 'messageElement.classList')
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceTestInspectorProtocoljs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Test/InspectorProtocol.js (200466 => 200467)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Test/InspectorProtocol.js 2016-05-05 18:51:50 UTC (rev 200466)
+++ trunk/Source/WebInspectorUI/UserInterface/Test/InspectorProtocol.js 2016-05-05 19:01:40 UTC (rev 200467)
</span><span class="lines">@@ -36,6 +36,8 @@
</span><span class="cx"> let method = methodOrObject;
</span><span class="cx"> if (typeof methodOrObject === "object")
</span><span class="cx"> ({method, params, handler} = methodOrObject);
</span><ins>+ else if (!params)
+ params = {};
</ins><span class="cx">
</span><span class="cx"> this._dispatchTable[++this._requestId] = handler;
</span><span class="cx"> let messageObject = {method, params, id: this._requestId};
</span></span></pre>
</div>
</div>
</body>
</html>