<!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>[47318] trunk/WebCore</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/47318">47318</a></dd>
<dt>Author</dt> <dd>pfeldman@chromium.org</dd>
<dt>Date</dt> <dd>2009-08-15 01:56:08 -0700 (Sat, 15 Aug 2009)</dd>
</dl>

<h3>Log Message</h3>
<pre>2009-08-15  Pavel Feldman  &lt;pfeldman@chromium.org&gt;

        Reviewed by Timothy Hatcher.

        WebInspector: Evaluating objects while on a breakpoint dumps string
        representation instead of live object. 

        https://bugs.webkit.org/show_bug.cgi?id=28280

        * inspector/front-end/ConsoleView.js:
        (WebInspector.ConsoleView.prototype.completions.this._evalInInspectedWindow):
        (WebInspector.ConsoleView.prototype.completions):
        (WebInspector.ConsoleView.prototype._reportCompletions):
        * inspector/front-end/ScriptsPanel.js:
        (WebInspector.ScriptsPanel.prototype.doEvalInCallFrame.delayedEvaluation):
        (WebInspector.ScriptsPanel.prototype.doEvalInCallFrame):
        (WebInspector.ScriptsPanel.prototype.variablesInSelectedCallFrame):</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkWebCoreChangeLog">trunk/WebCore/ChangeLog</a></li>
<li><a href="#trunkWebCoreinspectorfrontendConsoleViewjs">trunk/WebCore/inspector/front-end/ConsoleView.js</a></li>
<li><a href="#trunkWebCoreinspectorfrontendScriptsPaneljs">trunk/WebCore/inspector/front-end/ScriptsPanel.js</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/WebCore/ChangeLog (47317 => 47318)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebCore/ChangeLog        2009-08-15 07:31:11 UTC (rev 47317)
+++ trunk/WebCore/ChangeLog        2009-08-15 08:56:08 UTC (rev 47318)
</span><span class="lines">@@ -1,3 +1,21 @@
</span><ins>+2009-08-15  Pavel Feldman  &lt;pfeldman@chromium.org&gt;
+
+        Reviewed by Timothy Hatcher.
+
+        WebInspector: Evaluating objects while on a breakpoint dumps string
+        representation instead of live object. 
+
+        https://bugs.webkit.org/show_bug.cgi?id=28280
+
+        * inspector/front-end/ConsoleView.js:
+        (WebInspector.ConsoleView.prototype.completions.this._evalInInspectedWindow):
+        (WebInspector.ConsoleView.prototype.completions):
+        (WebInspector.ConsoleView.prototype._reportCompletions):
+        * inspector/front-end/ScriptsPanel.js:
+        (WebInspector.ScriptsPanel.prototype.doEvalInCallFrame.delayedEvaluation):
+        (WebInspector.ScriptsPanel.prototype.doEvalInCallFrame):
+        (WebInspector.ScriptsPanel.prototype.variablesInSelectedCallFrame):
+
</ins><span class="cx"> 2009-08-15  Maxime Simon  &lt;simon.maxime@gmail.com&gt;
</span><span class="cx"> 
</span><span class="cx">         Reviewed by Eric Seidel.
</span></span></pre></div>
<a id="trunkWebCoreinspectorfrontendConsoleViewjs"></a>
<div class="modfile"><h4>Modified: trunk/WebCore/inspector/front-end/ConsoleView.js (47317 => 47318)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebCore/inspector/front-end/ConsoleView.js        2009-08-15 07:31:11 UTC (rev 47317)
+++ trunk/WebCore/inspector/front-end/ConsoleView.js        2009-08-15 08:56:08 UTC (rev 47318)
</span><span class="lines">@@ -211,22 +211,37 @@
</span><span class="cx">         if (!expressionString &amp;&amp; !prefix)
</span><span class="cx">             return;
</span><span class="cx"> 
</span><del>-        if (!expressionString)
-            expressionString = &quot;this&quot;;
-
</del><span class="cx">         var reportCompletions = this._reportCompletions.bind(this, bestMatchOnly, completionsReadyCallback, dotNotation, bracketNotation, prefix);
</span><span class="cx">         // Collect comma separated object properties for the completion.
</span><ins>+
+        if (!expressionString) {
+            if (WebInspector.panels.scripts &amp;&amp; WebInspector.panels.scripts.paused) {
+                // Evaluate into properties in scope of the selected call frame.
+                reportCompletions(WebInspector.panels.scripts.variablesInSelectedCallFrame());
+                return;
+            } else {
+                expressionString = &quot;this&quot;;
+            }
+        }
+
+        function parsingCallback(result, isException)
+        {
+            if (!isException)
+                result = JSON.parse(result);
+            reportCompletions(result, isException);
+        }
+
</ins><span class="cx">         this._evalInInspectedWindow(
</span><span class="cx">             &quot;(function() {&quot; +
</span><del>-                &quot;var props = [];&quot; +
-                &quot;for (var prop in (&quot; + expressionString + &quot;)) props.push(prop);&quot; +
</del><ins>+                &quot;var props = {};&quot; +
+                &quot;for (var prop in (&quot; + expressionString + &quot;)) props[prop] = true;&quot; +
</ins><span class="cx">                 ((!dotNotation &amp;&amp; !bracketNotation) ?
</span><span class="cx">                 &quot;for (var prop in window._inspectorCommandLineAPI)&quot; +
</span><del>-                    &quot;if (prop.charAt(0) !== '_') props.push(prop);&quot;
</del><ins>+                    &quot;if (prop.charAt(0) !== '_') props[prop] = true;&quot;
</ins><span class="cx">                 : &quot;&quot;) +
</span><del>-                &quot;return props.join(',');&quot; +
</del><ins>+                &quot;return JSON.stringify(props);&quot; +
</ins><span class="cx">             &quot;})()&quot;,
</span><del>-            reportCompletions);
</del><ins>+            parsingCallback);
</ins><span class="cx">     },
</span><span class="cx"> 
</span><span class="cx">     _reportCompletions: function(bestMatchOnly, completionsReadyCallback, dotNotation, bracketNotation, prefix, result, isException) {
</span><span class="lines">@@ -241,8 +256,7 @@
</span><span class="cx">         }
</span><span class="cx"> 
</span><span class="cx">         var results = [];
</span><del>-        var properties = result.split(&quot;,&quot;);
-        properties.sort();
</del><ins>+        var properties = Object.sortedProperties(result);
</ins><span class="cx"> 
</span><span class="cx">         for (var i = 0; i &lt; properties.length; ++i) {
</span><span class="cx">             var property = properties[i];
</span></span></pre></div>
<a id="trunkWebCoreinspectorfrontendScriptsPaneljs"></a>
<div class="modfile"><h4>Modified: trunk/WebCore/inspector/front-end/ScriptsPanel.js (47317 => 47318)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebCore/inspector/front-end/ScriptsPanel.js        2009-08-15 07:31:11 UTC (rev 47317)
+++ trunk/WebCore/inspector/front-end/ScriptsPanel.js        2009-08-15 08:56:08 UTC (rev 47318)
</span><span class="lines">@@ -374,13 +374,8 @@
</span><span class="cx">         var panel = this;
</span><span class="cx">         function delayedEvaluation()
</span><span class="cx">         {
</span><del>-            if (!code) {
-                // Evaluate into properties in scope of the selected call frame.
-                callback(panel._variablesInScope(callFrame));
-                return;
-            }
</del><span class="cx">             try {
</span><del>-                callback(callFrame.evaluate(code));
</del><ins>+                callback(InspectorController.wrapObject(callFrame.evaluate(code)));
</ins><span class="cx">             } catch (e) {
</span><span class="cx">                 callback(e, true);
</span><span class="cx">             }
</span><span class="lines">@@ -388,10 +383,14 @@
</span><span class="cx">         setTimeout(delayedEvaluation, 0);
</span><span class="cx">     },
</span><span class="cx"> 
</span><del>-    _variablesInScope: function(callFrame)
</del><ins>+    variablesInSelectedCallFrame: function()
</ins><span class="cx">     {
</span><ins>+        var selectedCallFrame = this.sidebarPanes.callstack.selectedCallFrame;
+        if (!this._paused || !selectedCallFrame)
+            return {};
+
</ins><span class="cx">         var result = {};
</span><del>-        var scopeChain = callFrame.scopeChain;
</del><ins>+        var scopeChain = selectedCallFrame.scopeChain;
</ins><span class="cx">         for (var i = 0; i &lt; scopeChain.length; ++i) {
</span><span class="cx">             var scopeObject = scopeChain[i];
</span><span class="cx">             for (var property in scopeObject)
</span></span></pre>
</div>
</div>

</body>
</html>