<!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>[201222] trunk/Source/WebInspectorUI</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/201222">201222</a></dd>
<dt>Author</dt> <dd>nvasilyev@apple.com</dd>
<dt>Date</dt> <dd>2016-05-20 12:36:01 -0700 (Fri, 20 May 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Web Inspector: Split Console is auto opening all the time when using Inspect Element context menu
https://bugs.webkit.org/show_bug.cgi?id=157910
<rdar://problem/26374066>
Reviewed by Timothy Hatcher.
Currently, "synthetic" property is only used to decide whether adding a console message should
open the console or not. Replace it with "shouldRevealConsole".
* UserInterface/Controllers/DOMTreeManager.js:
(WebInspector.DOMTreeManager.prototype.inspectNodeObject.nodeAvailable):
(WebInspector.DOMTreeManager.prototype.inspectNodeObject):
* UserInterface/Controllers/JavaScriptLogViewController.js:
(WebInspector.JavaScriptLogViewController.prototype.appendImmediateExecutionWithResult.saveResultCallback):
(WebInspector.JavaScriptLogViewController.prototype.appendImmediateExecutionWithResult):
(WebInspector.JavaScriptLogViewController.prototype.consolePromptTextCommitted.printResult):
(WebInspector.JavaScriptLogViewController.prototype.consolePromptTextCommitted):
(WebInspector.JavaScriptLogViewController.prototype._appendConsoleMessageView):
* UserInterface/Models/ConsoleCommandResultMessage.js:
(WebInspector.ConsoleCommandResultMessage):
(WebInspector.ConsoleCommandResultMessage.prototype.get shouldRevealConsole):
(WebInspector.ConsoleCommandResultMessage.prototype.get synthetic): Deleted.
* UserInterface/Views/HeapSnapshotInstanceDataGridNode.js:
(WebInspector.HeapSnapshotInstanceDataGridNode.logHeapSnapshotNode.node.shortestGCRootPath.):
(WebInspector.HeapSnapshotInstanceDataGridNode.logHeapSnapshotNode):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebInspectorUIChangeLog">trunk/Source/WebInspectorUI/ChangeLog</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceControllersDOMTreeManagerjs">trunk/Source/WebInspectorUI/UserInterface/Controllers/DOMTreeManager.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceControllersJavaScriptLogViewControllerjs">trunk/Source/WebInspectorUI/UserInterface/Controllers/JavaScriptLogViewController.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceModelsConsoleCommandResultMessagejs">trunk/Source/WebInspectorUI/UserInterface/Models/ConsoleCommandResultMessage.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceViewsHeapSnapshotInstanceDataGridNodejs">trunk/Source/WebInspectorUI/UserInterface/Views/HeapSnapshotInstanceDataGridNode.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebInspectorUIChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/ChangeLog (201221 => 201222)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/ChangeLog 2016-05-20 19:13:03 UTC (rev 201221)
+++ trunk/Source/WebInspectorUI/ChangeLog 2016-05-20 19:36:01 UTC (rev 201222)
</span><span class="lines">@@ -1,3 +1,31 @@
</span><ins>+2016-05-20 Nikita Vasilyev <nvasilyev@apple.com>
+
+ Web Inspector: Split Console is auto opening all the time when using Inspect Element context menu
+ https://bugs.webkit.org/show_bug.cgi?id=157910
+ <rdar://problem/26374066>
+
+ Reviewed by Timothy Hatcher.
+
+ Currently, "synthetic" property is only used to decide whether adding a console message should
+ open the console or not. Replace it with "shouldRevealConsole".
+
+ * UserInterface/Controllers/DOMTreeManager.js:
+ (WebInspector.DOMTreeManager.prototype.inspectNodeObject.nodeAvailable):
+ (WebInspector.DOMTreeManager.prototype.inspectNodeObject):
+ * UserInterface/Controllers/JavaScriptLogViewController.js:
+ (WebInspector.JavaScriptLogViewController.prototype.appendImmediateExecutionWithResult.saveResultCallback):
+ (WebInspector.JavaScriptLogViewController.prototype.appendImmediateExecutionWithResult):
+ (WebInspector.JavaScriptLogViewController.prototype.consolePromptTextCommitted.printResult):
+ (WebInspector.JavaScriptLogViewController.prototype.consolePromptTextCommitted):
+ (WebInspector.JavaScriptLogViewController.prototype._appendConsoleMessageView):
+ * UserInterface/Models/ConsoleCommandResultMessage.js:
+ (WebInspector.ConsoleCommandResultMessage):
+ (WebInspector.ConsoleCommandResultMessage.prototype.get shouldRevealConsole):
+ (WebInspector.ConsoleCommandResultMessage.prototype.get synthetic): Deleted.
+ * UserInterface/Views/HeapSnapshotInstanceDataGridNode.js:
+ (WebInspector.HeapSnapshotInstanceDataGridNode.logHeapSnapshotNode.node.shortestGCRootPath.):
+ (WebInspector.HeapSnapshotInstanceDataGridNode.logHeapSnapshotNode):
+
</ins><span class="cx"> 2016-05-19 Joseph Pecoraro <pecoraro@apple.com>
</span><span class="cx">
</span><span class="cx"> Web Inspector: Can't resume Debugger after breaking on exception in Promise
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceControllersDOMTreeManagerjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Controllers/DOMTreeManager.js (201221 => 201222)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Controllers/DOMTreeManager.js 2016-05-20 19:13:03 UTC (rev 201221)
+++ trunk/Source/WebInspectorUI/UserInterface/Controllers/DOMTreeManager.js 2016-05-20 19:36:01 UTC (rev 201222)
</span><span class="lines">@@ -336,8 +336,8 @@
</span><span class="cx"> if (!remoteObject)
</span><span class="cx"> return;
</span><span class="cx"> let specialLogStyles = true;
</span><del>- let synthetic = true;
- WebInspector.consoleLogViewController.appendImmediateExecutionWithResult(WebInspector.UIString("Selected Element"), remoteObject, specialLogStyles, synthetic);
</del><ins>+ let shouldRevealConsole = false;
+ WebInspector.consoleLogViewController.appendImmediateExecutionWithResult(WebInspector.UIString("Selected Element"), remoteObject, specialLogStyles, shouldRevealConsole);
</ins><span class="cx"> });
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceControllersJavaScriptLogViewControllerjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Controllers/JavaScriptLogViewController.js (201221 => 201222)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Controllers/JavaScriptLogViewController.js 2016-05-20 19:13:03 UTC (rev 201221)
+++ trunk/Source/WebInspectorUI/UserInterface/Controllers/JavaScriptLogViewController.js 2016-05-20 19:36:01 UTC (rev 201222)
</span><span class="lines">@@ -118,7 +118,7 @@
</span><span class="cx"> consoleSession.element.scrollIntoView();
</span><span class="cx"> }
</span><span class="cx">
</span><del>- appendImmediateExecutionWithResult(text, result, addSpecialUserLogClass, synthetic)
</del><ins>+ appendImmediateExecutionWithResult(text, result, addSpecialUserLogClass, shouldRevealConsole)
</ins><span class="cx"> {
</span><span class="cx"> console.assert(result instanceof WebInspector.RemoteObject);
</span><span class="cx">
</span><span class="lines">@@ -127,7 +127,7 @@
</span><span class="cx">
</span><span class="cx"> function saveResultCallback(savedResultIndex)
</span><span class="cx"> {
</span><del>- let commandResultMessage = new WebInspector.ConsoleCommandResultMessage(result, false, savedResultIndex, synthetic);
</del><ins>+ let commandResultMessage = new WebInspector.ConsoleCommandResultMessage(result, false, savedResultIndex, shouldRevealConsole);
</ins><span class="cx"> let commandResultMessageView = new WebInspector.ConsoleMessageView(commandResultMessage);
</span><span class="cx"> this._appendConsoleMessageView(commandResultMessageView, true);
</span><span class="cx"> }
</span><span class="lines">@@ -225,8 +225,8 @@
</span><span class="cx"> if (!result || this._cleared)
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- let synthetic = false;
- let commandResultMessage = new WebInspector.ConsoleCommandResultMessage(result, wasThrown, savedResultIndex, synthetic);
</del><ins>+ let shouldRevealConsole = true;
+ let commandResultMessage = new WebInspector.ConsoleCommandResultMessage(result, wasThrown, savedResultIndex, shouldRevealConsole);
</ins><span class="cx"> let commandResultMessageView = new WebInspector.ConsoleMessageView(commandResultMessage);
</span><span class="cx"> this._appendConsoleMessageView(commandResultMessageView, true);
</span><span class="cx"> }
</span><span class="lines">@@ -269,9 +269,7 @@
</span><span class="cx"> if (WebInspector.consoleContentView.visible)
</span><span class="cx"> this.renderPendingMessagesSoon();
</span><span class="cx">
</span><del>- // We only auto show the console if the message is a non-synthetic result.
- // This is when the user evaluated something directly in the prompt.
- if (!WebInspector.isShowingConsoleTab() && messageView.message && (messageView.message.type === WebInspector.ConsoleMessage.MessageType.Result || messageView.message.synthetic))
</del><ins>+ if (!WebInspector.isShowingConsoleTab() && messageView.message && messageView.message.shouldRevealConsole)
</ins><span class="cx"> WebInspector.showSplitConsole();
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceModelsConsoleCommandResultMessagejs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Models/ConsoleCommandResultMessage.js (201221 => 201222)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Models/ConsoleCommandResultMessage.js 2016-05-20 19:13:03 UTC (rev 201221)
+++ trunk/Source/WebInspectorUI/UserInterface/Models/ConsoleCommandResultMessage.js 2016-05-20 19:36:01 UTC (rev 201222)
</span><span class="lines">@@ -29,7 +29,7 @@
</span><span class="cx">
</span><span class="cx"> WebInspector.ConsoleCommandResultMessage = class ConsoleCommandResult extends WebInspector.ConsoleMessage
</span><span class="cx"> {
</span><del>- constructor(result, wasThrown, savedResultIndex, synthetic)
</del><ins>+ constructor(result, wasThrown, savedResultIndex, shouldRevealConsole = true)
</ins><span class="cx"> {
</span><span class="cx"> let source = WebInspector.ConsoleMessage.MessageSource.JS;
</span><span class="cx"> let level = (wasThrown ? WebInspector.ConsoleMessage.MessageLevel.Error : WebInspector.ConsoleMessage.MessageLevel.Log);
</span><span class="lines">@@ -38,7 +38,7 @@
</span><span class="cx"> super(source, level, "", type, undefined, undefined, undefined, 0, [result], undefined, undefined);
</span><span class="cx">
</span><span class="cx"> this._savedResultIndex = savedResultIndex;
</span><del>- this._synthetic = synthetic || false;
</del><ins>+ this._shouldRevealConsole = shouldRevealConsole;
</ins><span class="cx">
</span><span class="cx"> if (this._savedResultIndex && this._savedResultIndex > WebInspector.ConsoleCommandResultMessage.maximumSavedResultIndex)
</span><span class="cx"> WebInspector.ConsoleCommandResultMessage.maximumSavedResultIndex = this._savedResultIndex;
</span><span class="lines">@@ -58,9 +58,9 @@
</span><span class="cx"> return this._savedResultIndex;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- get synthetic()
</del><ins>+ get shouldRevealConsole()
</ins><span class="cx"> {
</span><del>- return this._synthetic;
</del><ins>+ return this._shouldRevealConsole;
</ins><span class="cx"> }
</span><span class="cx"> };
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceViewsHeapSnapshotInstanceDataGridNodejs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Views/HeapSnapshotInstanceDataGridNode.js (201221 => 201222)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Views/HeapSnapshotInstanceDataGridNode.js 2016-05-20 19:13:03 UTC (rev 201221)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/HeapSnapshotInstanceDataGridNode.js 2016-05-20 19:36:01 UTC (rev 201222)
</span><span class="lines">@@ -53,7 +53,7 @@
</span><span class="cx"> static logHeapSnapshotNode(node)
</span><span class="cx"> {
</span><span class="cx"> let heapObjectIdentifier = node.id;
</span><del>- let synthetic = true;
</del><ins>+ let shouldRevealConsole = true;
</ins><span class="cx"> let text = WebInspector.UIString("Heap Snapshot Object (@%d)").format(heapObjectIdentifier);
</span><span class="cx">
</span><span class="cx"> node.shortestGCRootPath((gcRootPath) => {
</span><span class="lines">@@ -73,21 +73,19 @@
</span><span class="cx"> heapSnapshotRootPath = heapSnapshotRootPath.appendEdge(component);
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if (!heapSnapshotRootPath.isFullPathImpossible()) {
- synthetic = false;
</del><ins>+ if (!heapSnapshotRootPath.isFullPathImpossible())
</ins><span class="cx"> text = heapSnapshotRootPath.fullPath;
</span><del>- }
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (node.className === "string") {
</span><span class="cx"> HeapAgent.getPreview(heapObjectIdentifier, function(error, string, functionDetails, objectPreviewPayload) {
</span><span class="cx"> let remoteObject = error ? WebInspector.RemoteObject.fromPrimitiveValue(undefined) : WebInspector.RemoteObject.fromPrimitiveValue(string);
</span><del>- WebInspector.consoleLogViewController.appendImmediateExecutionWithResult(text, remoteObject, synthetic);
</del><ins>+ WebInspector.consoleLogViewController.appendImmediateExecutionWithResult(text, remoteObject, shouldRevealConsole);
</ins><span class="cx"> });
</span><span class="cx"> } else {
</span><span class="cx"> HeapAgent.getRemoteObject(heapObjectIdentifier, WebInspector.RuntimeManager.ConsoleObjectGroup, function(error, remoteObjectPayload) {
</span><span class="cx"> let remoteObject = error ? WebInspector.RemoteObject.fromPrimitiveValue(undefined) : WebInspector.RemoteObject.fromPayload(remoteObjectPayload);
</span><del>- WebInspector.consoleLogViewController.appendImmediateExecutionWithResult(text, remoteObject, synthetic);
</del><ins>+ WebInspector.consoleLogViewController.appendImmediateExecutionWithResult(text, remoteObject, shouldRevealConsole);
</ins><span class="cx"> });
</span><span class="cx"> }
</span><span class="cx"> });
</span></span></pre>
</div>
</div>
</body>
</html>