<!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>[80425] trunk/Source/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/80425">80425</a></dd>
<dt>Author</dt> <dd>mnaganov@chromium.org</dd>
<dt>Date</dt> <dd>2011-03-05 09:39:51 -0800 (Sat, 05 Mar 2011)</dd>
</dl>

<h3>Log Message</h3>
<pre>2011-03-05  Mikhail Naganov  <mnaganov@chromium.org>

        Reviewed by Pavel Feldman.

        Web Inspector: [Chromium] Allow dynamic enabling of detailed heap profiles.
        https://bugs.webkit.org/show_bug.cgi?id=55824

        Detailed heap profiles can be now enabled by typing "leakz" in Profiles tab.

        * inspector/front-end/DetailedHeapshotView.js:
        (WebInspector.DetailedHeapshotView.prototype.isDetailedSnapshot):
        * inspector/front-end/ProfilesPanel.js:
        (WebInspector.ProfilesPanel.prototype._finishHeapSnapshot.doParse):
        (WebInspector.ProfilesPanel.prototype._finishHeapSnapshot):
        (WebInspector.ProfilesPanel.prototype._reportHeapSnapshotProgress):
        (WebInspector.ProfilesPanel.prototype.handleShortcut):
        (WebInspector.ProfilesPanel.prototype._displayDetailedHeapProfilesEnabledHint.hideHint):
        (WebInspector.ProfilesPanel.prototype._displayDetailedHeapProfilesEnabledHint):
        (WebInspector.ProfilesPanel.prototype._enableDetailedHeapProfiles):
        (WebInspector.ProfilesPanel.prototype._recognizeKeyboardCombo):</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreinspectorfrontendDetailedHeapshotViewjs">trunk/Source/WebCore/inspector/front-end/DetailedHeapshotView.js</a></li>
<li><a href="#trunkSourceWebCoreinspectorfrontendProfilesPaneljs">trunk/Source/WebCore/inspector/front-end/ProfilesPanel.js</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (80424 => 80425)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog   2011-03-05 17:32:09 UTC (rev 80424)
+++ trunk/Source/WebCore/ChangeLog      2011-03-05 17:39:51 UTC (rev 80425)
</span><span class="lines">@@ -1,3 +1,24 @@
</span><ins>+2011-03-05  Mikhail Naganov  <mnaganov@chromium.org>
+
+        Reviewed by Pavel Feldman.
+
+        Web Inspector: [Chromium] Allow dynamic enabling of detailed heap profiles.
+        https://bugs.webkit.org/show_bug.cgi?id=55824
+
+        Detailed heap profiles can be now enabled by typing "leakz" in Profiles tab.
+
+        * inspector/front-end/DetailedHeapshotView.js:
+        (WebInspector.DetailedHeapshotView.prototype.isDetailedSnapshot):
+        * inspector/front-end/ProfilesPanel.js:
+        (WebInspector.ProfilesPanel.prototype._finishHeapSnapshot.doParse):
+        (WebInspector.ProfilesPanel.prototype._finishHeapSnapshot):
+        (WebInspector.ProfilesPanel.prototype._reportHeapSnapshotProgress):
+        (WebInspector.ProfilesPanel.prototype.handleShortcut):
+        (WebInspector.ProfilesPanel.prototype._displayDetailedHeapProfilesEnabledHint.hideHint):
+        (WebInspector.ProfilesPanel.prototype._displayDetailedHeapProfilesEnabledHint):
+        (WebInspector.ProfilesPanel.prototype._enableDetailedHeapProfiles):
+        (WebInspector.ProfilesPanel.prototype._recognizeKeyboardCombo):
+
</ins><span class="cx"> 2011-03-05  Qi Zhang  <qi.2.zhang@nokia.com>
</span><span class="cx"> 
</span><span class="cx">         Reviewed by Laszlo Gombos.
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorfrontendDetailedHeapshotViewjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/front-end/DetailedHeapshotView.js (80424 => 80425)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/front-end/DetailedHeapshotView.js 2011-03-05 17:32:09 UTC (rev 80424)
+++ trunk/Source/WebCore/inspector/front-end/DetailedHeapshotView.js    2011-03-05 17:39:51 UTC (rev 80425)
</span><span class="lines">@@ -697,6 +697,15 @@
</span><span class="cx">         WebInspector.panels.profiles.loadHeapSnapshot(profileUid, callback);
</span><span class="cx">     },
</span><span class="cx"> 
</span><ins>+    isDetailedSnapshot: function(snapshot)
+    {
+        var s = new WebInspector.HeapSnapshot(snapshot);
+        for (var iter = s.rootNode.edges; iter.hasNext(); iter.next())
+            if (iter.edge.node.name === "(GC roots)")
+                return true;
+        return false;
+    },
+
</ins><span class="cx">     processLoadedSnapshot: function(profile, snapshot)
</span><span class="cx">     {
</span><span class="cx">         profile.nodes = snapshot.nodes;
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorfrontendProfilesPaneljs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/front-end/ProfilesPanel.js (80424 => 80425)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/front-end/ProfilesPanel.js        2011-03-05 17:32:09 UTC (rev 80424)
+++ trunk/Source/WebCore/inspector/front-end/ProfilesPanel.js   2011-03-05 17:39:51 UTC (rev 80425)
</span><span class="lines">@@ -471,6 +471,12 @@
</span><span class="cx">             delete profile._is_loading;
</span><span class="cx">             profile._loaded = true;
</span><span class="cx">             profile.sideBarElement.subtitle = "";
</span><ins>+
+            if (!Preferences.detailedHeapProfiles && WebInspector.DetailedHeapshotView.prototype.isDetailedSnapshot(loadedSnapshot)) {
+                WebInspector.panels.profiles._enableDetailedHeapProfiles(false);
+                return;
+            }
+
</ins><span class="cx">             if (!Preferences.detailedHeapProfiles)
</span><span class="cx">                 WebInspector.HeapSnapshotView.prototype.processLoadedSnapshot(profile, loadedSnapshot);
</span><span class="cx">             else
</span><span class="lines">@@ -684,6 +690,63 @@
</span><span class="cx">             if (done >= total)
</span><span class="cx">                 this._removeProfileHeader(this._temporaryTakingSnapshot);
</span><span class="cx">         }
</span><ins>+    },
+
+    handleShortcut: function(event)
+    {
+        if (!Preferences.heapProfilerPresent || Preferences.detailedHeapProfiles)
+            return;
+        var combo = ["U+004C", "U+0045", "U+0041", "U+004B", "U+005A"];  // "LEAKZ"
+        if (this._recognizeKeyboardCombo(combo, event)) {
+            this._displayDetailedHeapProfilesEnabledHint();          
+            this._enableDetailedHeapProfiles(true);
+        }
+    },
+
+    _recognizeKeyboardCombo: function(combo, event)
+    {
+        var isRecognized = false;
+        if (!this._comboPosition) {
+            if (event.keyIdentifier === combo[0])
+                this._comboPosition = 1;
+        } else if (event.keyIdentifier === combo[this._comboPosition]) {
+            if (++this._comboPosition === combo.length)
+                isRecognized = true;
+        } else
+            delete this._comboPosition;
+        if (this._comboPosition)
+            event.handled = true;
+        return isRecognized;
+    },
+    
+    _displayDetailedHeapProfilesEnabledHint: function()
+    {
+        var message = new WebInspector.HelpScreen("Congratulations!");
+        message.contentElement.addStyleClass("help-table");
+        message.contentElement.textContent = "Detailed Heap snapshots are now enabled.";
+        message.show();
+
+        function hideHint()
+        {
+            message._hide();
+        }
+
+        setTimeout(hideHint, 2000);
+    },
+
+    _enableDetailedHeapProfiles: function(resetAgent)
+    {
+        if (resetAgent)
+            this._clearProfiles();
+        else
+            this._reset();
+        var oldProfileType = this._profileTypesByIdMap[WebInspector.HeapSnapshotProfileType.TypeId];
+        var profileType = new WebInspector.DetailedHeapshotProfileType();
+        profileType.treeElement = oldProfileType.treeElement;
+        this._profileTypesByIdMap[profileType.id] = profileType;
+        Preferences.detailedHeapProfiles = true;
+        this.hide();
+        this.show();
</ins><span class="cx">     }
</span><span class="cx"> }
</span><span class="cx"> 
</span></span></pre>
</div>
</div>

</body>
</html>