<!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>[181722] 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/181722">181722</a></dd>
<dt>Author</dt> <dd>joepeck@webkit.org</dd>
<dt>Date</dt> <dd>2015-03-18 20:26:55 -0700 (Wed, 18 Mar 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Web Inspector: Debugger Popovers and Probes should use FormattedValue/ObjectTreeView instead of Custom/ObjectPropertiesSection
https://bugs.webkit.org/show_bug.cgi?id=142830
Reviewed by Timothy Hatcher.
Source/JavaScriptCore:
* inspector/agents/InspectorDebuggerAgent.cpp:
(Inspector::InspectorDebuggerAgent::breakpointActionProbe):
Give Probe Samples object previews.
Source/WebInspectorUI:
* UserInterface/Views/ProbeSetDataGrid.css:
(.details-section.probe-set .data-grid .object-tree > :matches(.title, .object-preview)::before):
Another line-height fix for object tree disclosure triangles.
* UserInterface/Views/ProbeSetDataGridNode.js:
(WebInspector.ProbeSetDataGridNode.prototype.createCellContent):
Create an ObjectTree / FormattedValue for the RemoteObject.
* UserInterface/Views/SourceCodeTextEditor.css:
(.popover .debugger-popover-content > .title):
(.popover .debugger-popover-content > .body):
(.popover .debugger-popover-content.function > .body):
Be more specific and don't accidentally style ".title" within the body.
* UserInterface/Views/SourceCodeTextEditor.js:
(WebInspector.SourceCodeTextEditor.prototype._showPopoverForObject):
Show a properties only ObjectTree instead of an ObjectPropertiesSection.
(WebInspector.SourceCodeTextEditor.prototype._showPopoverForString): Deleted.
(WebInspector.SourceCodeTextEditor.prototype._showPopoverForRegExp): Deleted.
(WebInspector.SourceCodeTextEditor.prototype._showPopoverForNumber): Deleted.
(WebInspector.SourceCodeTextEditor.prototype._showPopoverForBoolean): Deleted.
(WebInspector.SourceCodeTextEditor.prototype._showPopoverForNull): Deleted.
(WebInspector.SourceCodeTextEditor.prototype._showPopoverForUndefined): Deleted.
(WebInspector.SourceCodeTextEditor.prototype._showPopoverWithFormattedValue):
Reduce most of these to a single popover for formatted values.</pre>
<h3>Modified Paths</h3>
<ul>
<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="#trunkSourceWebInspectorUIChangeLog">trunk/Source/WebInspectorUI/ChangeLog</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceViewsProbeSetDataGridcss">trunk/Source/WebInspectorUI/UserInterface/Views/ProbeSetDataGrid.css</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceViewsProbeSetDataGridNodejs">trunk/Source/WebInspectorUI/UserInterface/Views/ProbeSetDataGridNode.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceViewsSourceCodeTextEditorcss">trunk/Source/WebInspectorUI/UserInterface/Views/SourceCodeTextEditor.css</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceViewsSourceCodeTextEditorjs">trunk/Source/WebInspectorUI/UserInterface/Views/SourceCodeTextEditor.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (181721 => 181722)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2015-03-19 02:16:12 UTC (rev 181721)
+++ trunk/Source/JavaScriptCore/ChangeLog 2015-03-19 03:26:55 UTC (rev 181722)
</span><span class="lines">@@ -1,3 +1,14 @@
</span><ins>+2015-03-18 Joseph Pecoraro <pecoraro@apple.com>
+
+ Web Inspector: Debugger Popovers and Probes should use FormattedValue/ObjectTreeView instead of Custom/ObjectPropertiesSection
+ https://bugs.webkit.org/show_bug.cgi?id=142830
+
+ Reviewed by Timothy Hatcher.
+
+ * inspector/agents/InspectorDebuggerAgent.cpp:
+ (Inspector::InspectorDebuggerAgent::breakpointActionProbe):
+ Give Probe Samples object previews.
+
</ins><span class="cx"> 2015-03-17 Ryuan Choi <ryuan.choi@navercorp.com>
</span><span class="cx">
</span><span class="cx"> [EFL] Expose JavaScript binding interface through ewk_extension
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreinspectoragentsInspectorDebuggerAgentcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/inspector/agents/InspectorDebuggerAgent.cpp (181721 => 181722)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/inspector/agents/InspectorDebuggerAgent.cpp 2015-03-19 02:16:12 UTC (rev 181721)
+++ trunk/Source/JavaScriptCore/inspector/agents/InspectorDebuggerAgent.cpp 2015-03-19 03:26:55 UTC (rev 181722)
</span><span class="lines">@@ -727,7 +727,7 @@
</span><span class="cx"> void InspectorDebuggerAgent::breakpointActionProbe(JSC::ExecState* scriptState, const ScriptBreakpointAction& action, unsigned batchId, unsigned sampleId, const Deprecated::ScriptValue& sample)
</span><span class="cx"> {
</span><span class="cx"> InjectedScript injectedScript = m_injectedScriptManager->injectedScriptFor(scriptState);
</span><del>- RefPtr<Protocol::Runtime::RemoteObject> payload = injectedScript.wrapObject(sample, objectGroupForBreakpointAction(action));
</del><ins>+ RefPtr<Protocol::Runtime::RemoteObject> payload = injectedScript.wrapObject(sample, objectGroupForBreakpointAction(action), true);
</ins><span class="cx"> auto result = Protocol::Debugger::ProbeSample::create()
</span><span class="cx"> .setProbeId(action.identifier)
</span><span class="cx"> .setBatchId(batchId)
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/ChangeLog (181721 => 181722)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/ChangeLog 2015-03-19 02:16:12 UTC (rev 181721)
+++ trunk/Source/WebInspectorUI/ChangeLog 2015-03-19 03:26:55 UTC (rev 181722)
</span><span class="lines">@@ -1,5 +1,39 @@
</span><span class="cx"> 2015-03-18 Joseph Pecoraro <pecoraro@apple.com>
</span><span class="cx">
</span><ins>+ Web Inspector: Debugger Popovers and Probes should use FormattedValue/ObjectTreeView instead of Custom/ObjectPropertiesSection
+ https://bugs.webkit.org/show_bug.cgi?id=142830
+
+ Reviewed by Timothy Hatcher.
+
+ * UserInterface/Views/ProbeSetDataGrid.css:
+ (.details-section.probe-set .data-grid .object-tree > :matches(.title, .object-preview)::before):
+ Another line-height fix for object tree disclosure triangles.
+
+ * UserInterface/Views/ProbeSetDataGridNode.js:
+ (WebInspector.ProbeSetDataGridNode.prototype.createCellContent):
+ Create an ObjectTree / FormattedValue for the RemoteObject.
+
+ * UserInterface/Views/SourceCodeTextEditor.css:
+ (.popover .debugger-popover-content > .title):
+ (.popover .debugger-popover-content > .body):
+ (.popover .debugger-popover-content.function > .body):
+ Be more specific and don't accidentally style ".title" within the body.
+
+ * UserInterface/Views/SourceCodeTextEditor.js:
+ (WebInspector.SourceCodeTextEditor.prototype._showPopoverForObject):
+ Show a properties only ObjectTree instead of an ObjectPropertiesSection.
+
+ (WebInspector.SourceCodeTextEditor.prototype._showPopoverForString): Deleted.
+ (WebInspector.SourceCodeTextEditor.prototype._showPopoverForRegExp): Deleted.
+ (WebInspector.SourceCodeTextEditor.prototype._showPopoverForNumber): Deleted.
+ (WebInspector.SourceCodeTextEditor.prototype._showPopoverForBoolean): Deleted.
+ (WebInspector.SourceCodeTextEditor.prototype._showPopoverForNull): Deleted.
+ (WebInspector.SourceCodeTextEditor.prototype._showPopoverForUndefined): Deleted.
+ (WebInspector.SourceCodeTextEditor.prototype._showPopoverWithFormattedValue):
+ Reduce most of these to a single popover for formatted values.
+
+2015-03-18 Joseph Pecoraro <pecoraro@apple.com>
+
</ins><span class="cx"> Web Inspector: Scopes sidebar should use new ObjectTreeView and not ObjectPropertiesSection
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=142808
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceViewsProbeSetDataGridcss"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Views/ProbeSetDataGrid.css (181721 => 181722)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Views/ProbeSetDataGrid.css 2015-03-19 02:16:12 UTC (rev 181721)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/ProbeSetDataGrid.css 2015-03-19 03:26:55 UTC (rev 181722)
</span><span class="lines">@@ -85,3 +85,8 @@
</span><span class="cx"> .details-section.probe-set .data-grid .section {
</span><span class="cx"> left: -6px;
</span><span class="cx"> }
</span><ins>+
+.details-section.probe-set .data-grid .object-tree > :matches(.title, .object-preview)::before {
+ /* The line-height inside a data-grid is 17px instead of 13px, this will center vertically on the top line. */
+ top: 2px;
+}
</ins></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceViewsProbeSetDataGridNodejs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Views/ProbeSetDataGridNode.js (181721 => 181722)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Views/ProbeSetDataGridNode.js 2015-03-19 02:16:12 UTC (rev 181721)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/ProbeSetDataGridNode.js 2015-03-19 03:26:55 UTC (rev 181722)
</span><span class="lines">@@ -85,22 +85,8 @@
</span><span class="cx"> return sample;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if (sample instanceof WebInspector.RemoteObject) {
- switch (sample.type) {
- case "function": // FIXME: is there a better way to visualize functions?
- case "object":
- return new WebInspector.ObjectPropertiesSection(sample, WebInspector.ProbeSet.SampleObjectTitle).element;
- case "string":
- case "number":
- case "boolean":
- case "undefined":
- case "null":
- return document.createTextNode(sample.value);
- case "array":
- // FIXME: reuse existing visualization of arrays here.
- default: console.log("Don't know how to represent sample:", sample);
- }
- }
</del><ins>+ if (sample instanceof WebInspector.RemoteObject)
+ return WebInspector.FormattedValue.createObjectTreeOrFormattedValueForRemoteObject(sample, null);
</ins><span class="cx">
</span><span class="cx"> return sample;
</span><span class="cx"> },
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceViewsSourceCodeTextEditorcss"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Views/SourceCodeTextEditor.css (181721 => 181722)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Views/SourceCodeTextEditor.css 2015-03-19 02:16:12 UTC (rev 181721)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/SourceCodeTextEditor.css 2015-03-19 03:26:55 UTC (rev 181722)
</span><span class="lines">@@ -138,7 +138,7 @@
</span><span class="cx"> min-height: 250px;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-.popover .debugger-popover-content .title {
</del><ins>+.popover .debugger-popover-content > .title {
</ins><span class="cx"> font-weight: bold;
</span><span class="cx"> padding-left: 10px;
</span><span class="cx">
</span><span class="lines">@@ -147,14 +147,14 @@
</span><span class="cx"> white-space: nowrap;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-.popover .debugger-popover-content .body {
</del><ins>+.popover .debugger-popover-content > .body {
</ins><span class="cx"> border-top: 1px solid rgb(194, 194, 147);
</span><span class="cx"> overflow: auto;
</span><span class="cx"> margin-top: 5px;
</span><span class="cx"> padding-top: 5px;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-.popover .debugger-popover-content.function .body {
</del><ins>+.popover .debugger-popover-content.function > .body {
</ins><span class="cx"> padding-left: 10px;
</span><span class="cx"> padding-right: 10px;
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceViewsSourceCodeTextEditorjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Views/SourceCodeTextEditor.js (181721 => 181722)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Views/SourceCodeTextEditor.js 2015-03-19 02:16:12 UTC (rev 181721)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/SourceCodeTextEditor.js 2015-03-19 03:26:55 UTC (rev 181722)
</span><span class="lines">@@ -1391,22 +1391,17 @@
</span><span class="cx"> this._showPopoverForFunction(data);
</span><span class="cx"> break;
</span><span class="cx"> case "object":
</span><del>- if (data.subtype === "regexp")
- this._showPopoverForRegExp(data);
</del><ins>+ if (data.subtype === "null" || data.subtype === "regexp")
+ this._showPopoverWithFormattedValue(data);
</ins><span class="cx"> else
</span><span class="cx"> this._showPopoverForObject(data);
</span><span class="cx"> break;
</span><span class="cx"> case "string":
</span><del>- this._showPopoverForString(data);
- break;
</del><span class="cx"> case "number":
</span><del>- this._showPopoverForNumber(data);
- break;
</del><span class="cx"> case "boolean":
</span><del>- this._showPopoverForBoolean(data);
- break;
</del><span class="cx"> case "undefined":
</span><del>- this._showPopoverForUndefined(data);
</del><ins>+ case "symbol":
+ this._showPopoverWithFormattedValue(data);
</ins><span class="cx"> break;
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="lines">@@ -1520,11 +1515,6 @@
</span><span class="cx">
</span><span class="cx"> _showPopoverForObject: function(data)
</span><span class="cx"> {
</span><del>- if (data.subtype === "null") {
- this._showPopoverForNull(data);
- return;
- }
-
</del><span class="cx"> var content = document.createElement("div");
</span><span class="cx"> content.className = "object expandable";
</span><span class="cx">
</span><span class="lines">@@ -1533,68 +1523,24 @@
</span><span class="cx"> titleElement.textContent = data.description;
</span><span class="cx"> content.appendChild(titleElement);
</span><span class="cx">
</span><del>- var section = new WebInspector.ObjectPropertiesSection(data);
- section.expanded = true;
- section.element.classList.add("body");
- content.appendChild(section.element);
</del><ins>+ // FIXME: If this is a variable, it would be nice to put the variable name in the PropertyPath.
+ var objectTree = new WebInspector.ObjectTreeView(data, WebInspector.ObjectTreeView.Mode.Properties, null);
+ objectTree.showOnlyProperties();
+ objectTree.expand();
</ins><span class="cx">
</span><del>- this._showPopover(content);
- },
</del><ins>+ var bodyElement = content.appendChild(document.createElement("div"));
+ bodyElement.className = "body";
+ bodyElement.appendChild(objectTree.element);
</ins><span class="cx">
</span><del>- _showPopoverForString: function(data)
- {
- var content = document.createElement("div");
- content.className = "string formatted-string";
- content.textContent = "\"" + data.description + "\"";
-
</del><span class="cx"> this._showPopover(content);
</span><span class="cx"> },
</span><span class="cx">
</span><del>- _showPopoverForRegExp: function(data)
</del><ins>+ _showPopoverWithFormattedValue: function(remoteObject)
</ins><span class="cx"> {
</span><del>- var content = document.createElement("div");
- content.className = "regexp formatted-regexp";
- content.textContent = data.description;
-
</del><ins>+ var content = WebInspector.FormattedValue.createElementForRemoteObject(remoteObject);
</ins><span class="cx"> this._showPopover(content);
</span><span class="cx"> },
</span><span class="cx">
</span><del>- _showPopoverForNumber: function(data)
- {
- var content = document.createElement("span");
- content.className = "number formatted-number";
- content.textContent = data.description;
-
- this._showPopover(content);
- },
-
- _showPopoverForBoolean: function(data)
- {
- var content = document.createElement("span");
- content.className = "boolean formatted-boolean";
- content.textContent = data.description;
-
- this._showPopover(content);
- },
-
- _showPopoverForNull: function(data)
- {
- var content = document.createElement("span");
- content.className = "boolean formatted-null";
- content.textContent = data.description;
-
- this._showPopover(content);
- },
-
- _showPopoverForUndefined: function(data)
- {
- var content = document.createElement("span");
- content.className = "boolean formatted-undefined";
- content.textContent = data.description;
-
- this._showPopover(content);
- },
-
</del><span class="cx"> willDismissPopover: function(popover)
</span><span class="cx"> {
</span><span class="cx"> this.tokenTrackingController.removeHighlightedRange();
</span></span></pre>
</div>
</div>
</body>
</html>