<!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>[166971] 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/166971">166971</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2014-04-08 15:46:10 -0700 (Tue, 08 Apr 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Web Inspector: Address stale FIXMEs concerning console in JSContext inspection
https://bugs.webkit.org/show_bug.cgi?id=131398
Patch by Joseph Pecoraro <pecoraro@apple.com> on 2014-04-08
Reviewed by Timothy Hatcher.
* inspector/InjectedScriptSource.js:
The console object can be deleted from a page or JSContext,
so keep code that expects that it could have been deleted
to be resilient in those cases.
* inspector/JSGlobalObjectScriptDebugServer.h:
* inspector/agents/JSGlobalObjectDebuggerAgent.h:
* inspector/agents/JSGlobalObjectRuntimeAgent.h:
Change the FIXMEs to NOTEs that explain why these functions
have empty implementations for JSContext inspection.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCoreinspectorInjectedScriptSourcejs">trunk/Source/JavaScriptCore/inspector/InjectedScriptSource.js</a></li>
<li><a href="#trunkSourceJavaScriptCoreinspectorJSGlobalObjectScriptDebugServerh">trunk/Source/JavaScriptCore/inspector/JSGlobalObjectScriptDebugServer.h</a></li>
<li><a href="#trunkSourceJavaScriptCoreinspectoragentsJSGlobalObjectDebuggerAgenth">trunk/Source/JavaScriptCore/inspector/agents/JSGlobalObjectDebuggerAgent.h</a></li>
<li><a href="#trunkSourceJavaScriptCoreinspectoragentsJSGlobalObjectRuntimeAgenth">trunk/Source/JavaScriptCore/inspector/agents/JSGlobalObjectRuntimeAgent.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (166970 => 166971)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2014-04-08 22:44:39 UTC (rev 166970)
+++ trunk/Source/JavaScriptCore/ChangeLog 2014-04-08 22:46:10 UTC (rev 166971)
</span><span class="lines">@@ -1,3 +1,21 @@
</span><ins>+2014-04-08 Joseph Pecoraro <pecoraro@apple.com>
+
+ Web Inspector: Address stale FIXMEs concerning console in JSContext inspection
+ https://bugs.webkit.org/show_bug.cgi?id=131398
+
+ Reviewed by Timothy Hatcher.
+
+ * inspector/InjectedScriptSource.js:
+ The console object can be deleted from a page or JSContext,
+ so keep code that expects that it could have been deleted
+ to be resilient in those cases.
+
+ * inspector/JSGlobalObjectScriptDebugServer.h:
+ * inspector/agents/JSGlobalObjectDebuggerAgent.h:
+ * inspector/agents/JSGlobalObjectRuntimeAgent.h:
+ Change the FIXMEs to NOTEs that explain why these functions
+ have empty implementations for JSContext inspection.
+
</ins><span class="cx"> 2014-04-08 Filip Pizlo <fpizlo@apple.com>
</span><span class="cx">
</span><span class="cx"> Unreviewed, fix a goofy assertion to fix debug.
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreinspectorInjectedScriptSourcejs"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/inspector/InjectedScriptSource.js (166970 => 166971)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/inspector/InjectedScriptSource.js 2014-04-08 22:44:39 UTC (rev 166970)
+++ trunk/Source/JavaScriptCore/inspector/InjectedScriptSource.js 2014-04-08 22:46:10 UTC (rev 166971)
</span><span class="lines">@@ -209,7 +209,6 @@
</span><span class="cx"> var argsArray = InjectedScriptHost.evaluate("(" + args + ")");
</span><span class="cx"> var result = this[methodName].apply(this, argsArray);
</span><span class="cx"> if (typeof result === "undefined") {
</span><del>- // FIXME: JS Context inspection currently does not have a global.console object.
</del><span class="cx"> if (inspectedGlobalObject.console)
</span><span class="cx"> inspectedGlobalObject.console.error("Web Inspector error: InjectedScript.%s returns undefined", methodName);
</span><span class="cx"> result = null;
</span><span class="lines">@@ -557,7 +556,6 @@
</span><span class="cx"> // When not evaluating on a call frame we use a 'with' statement to allow var and function statements to leak
</span><span class="cx"> // into the global scope. This allow them to stick around between evaluations.
</span><span class="cx">
</span><del>- // FIXME: JS Context inspection currently does not have a global.console object.
</del><span class="cx"> try {
</span><span class="cx"> if (commandLineAPI) {
</span><span class="cx"> if (inspectedGlobalObject.console)
</span><span class="lines">@@ -672,7 +670,6 @@
</span><span class="cx"> delete this._modules[name];
</span><span class="cx"> var moduleFunction = InjectedScriptHost.evaluate("(" + source + ")");
</span><span class="cx"> if (typeof moduleFunction !== "function") {
</span><del>- // FIXME: JS Context inspection currently does not have a global.console object.
</del><span class="cx"> if (inspectedGlobalObject.console)
</span><span class="cx"> inspectedGlobalObject.console.error("Web Inspector error: A function was expected for module %s evaluation", name);
</span><span class="cx"> return null;
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreinspectorJSGlobalObjectScriptDebugServerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/inspector/JSGlobalObjectScriptDebugServer.h (166970 => 166971)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/inspector/JSGlobalObjectScriptDebugServer.h 2014-04-08 22:44:39 UTC (rev 166970)
+++ trunk/Source/JavaScriptCore/inspector/JSGlobalObjectScriptDebugServer.h 2014-04-08 22:46:10 UTC (rev 166971)
</span><span class="lines">@@ -53,7 +53,9 @@
</span><span class="cx"> virtual void runEventLoopWhilePaused() override;
</span><span class="cx"> virtual bool isContentScript(JSC::ExecState*) const override { return false; }
</span><span class="cx">
</span><del>- // FIXME: JavaScript inspection has no Console yet.
</del><ins>+ // NOTE: Currently all exceptions are reported at the API boundary through reportAPIException.
+ // Until a time comes where an exception can be caused outside of the API (e.g. setTimeout
+ // or some other async operation in a pure JSContext) we can ignore exceptions reported here.
</ins><span class="cx"> virtual void reportException(JSC::ExecState*, JSC::JSValue) const override { }
</span><span class="cx">
</span><span class="cx"> ListenerSet m_listeners;
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreinspectoragentsJSGlobalObjectDebuggerAgenth"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/inspector/agents/JSGlobalObjectDebuggerAgent.h (166970 => 166971)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/inspector/agents/JSGlobalObjectDebuggerAgent.h 2014-04-08 22:44:39 UTC (rev 166970)
+++ trunk/Source/JavaScriptCore/inspector/agents/JSGlobalObjectDebuggerAgent.h 2014-04-08 22:46:10 UTC (rev 166971)
</span><span class="lines">@@ -50,7 +50,8 @@
</span><span class="cx">
</span><span class="cx"> virtual void breakpointActionLog(JSC::ExecState*, const String&) override;
</span><span class="cx">
</span><del>- // FIXME: JavaScript inspector does not yet have a console object to mute.
</del><ins>+ // NOTE: JavaScript inspector does not yet need to mute a console because no messages
+ // are sent to the console outside of the API boundary or console object.
</ins><span class="cx"> virtual void muteConsole() override { }
</span><span class="cx"> virtual void unmuteConsole() override { }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreinspectoragentsJSGlobalObjectRuntimeAgenth"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/inspector/agents/JSGlobalObjectRuntimeAgent.h (166970 => 166971)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/inspector/agents/JSGlobalObjectRuntimeAgent.h 2014-04-08 22:44:39 UTC (rev 166970)
+++ trunk/Source/JavaScriptCore/inspector/agents/JSGlobalObjectRuntimeAgent.h 2014-04-08 22:46:10 UTC (rev 166971)
</span><span class="lines">@@ -47,7 +47,8 @@
</span><span class="cx"> virtual JSC::VM& globalVM() override;
</span><span class="cx"> virtual InjectedScript injectedScriptForEval(ErrorString*, const int* executionContextId) override;
</span><span class="cx">
</span><del>- // FIXME: JavaScript inspector does not yet have a console object to mute.
</del><ins>+ // NOTE: JavaScript inspector does not yet need to mute a console because no messages
+ // are sent to the console outside of the API boundary or console object.
</ins><span class="cx"> virtual void muteConsole() override { }
</span><span class="cx"> virtual void unmuteConsole() override { }
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>