<!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>[128057] trunk</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/128057">128057</a></dd>
<dt>Author</dt> <dd>caseq@chromium.org</dd>
<dt>Date</dt> <dd>2012-09-10 07:01:26 -0700 (Mon, 10 Sep 2012)</dd>
</dl>

<h3>Log Message</h3>
<pre>Web Inspector: only display heap size statistics for timeline records when it makes sense
https://bugs.webkit.org/show_bug.cgi?id=96119

Reviewed by Yury Semikhatsky.

Source/WebCore:

- drop totalHeapSize from timeline records;
- add usedHeapSizeDelta (not set if 0), for heap delta between start and end of the event;
- only display memory details for events of scriping category or when delta is not 0;

* English.lproj/localizedStrings.js:
* inspector/InspectorTimelineAgent.cpp:
(WebCore::getUsedHeapSize):
(WebCore):
(WebCore::InspectorTimelineAgent::setHeapSizeStatistics):
(WebCore::InspectorTimelineAgent::didCompleteCurrentRecord):
(WebCore::InspectorTimelineAgent::pushCurrentRecord):
* inspector/InspectorTimelineAgent.h:
(WebCore::InspectorTimelineAgent::TimelineRecordEntry::TimelineRecordEntry):
(TimelineRecordEntry):
* inspector/front-end/TimelinePresentationModel.js:
(WebInspector.TimelinePresentationModel.Record.prototype.get usedHeapSizeDelta):
(WebInspector.TimelinePresentationModel.Record.prototype._generatePopupContentWithImagePreview):

LayoutTests:

- rebase timeline tests to drop totalHeapSize
- add support for &quot;skip&quot; formatter, to handle cases where value is optionally present in the dumped object;
- drop custom expectations that are identical to base;

* http/tests/inspector/inspector-test.js:
(initialize_InspectorTest.InspectorTest.addObject):
* inspector/timeline/timeline-animation-frame-expected.txt:
* inspector/timeline/timeline-decode-resize-expected.txt:
* inspector/timeline/timeline-dom-content-loaded-event-expected.txt:
* inspector/timeline/timeline-event-dispatch-expected.txt:
* inspector/timeline/timeline-injected-script-eval-expected.txt:
* inspector/timeline/timeline-layout-expected.txt:
* inspector/timeline/timeline-load-event-expected.txt:
* inspector/timeline/timeline-mark-timeline-expected.txt:
* inspector/timeline/timeline-network-resource-expected.txt:
* inspector/timeline/timeline-paint-expected.txt:
* inspector/timeline/timeline-parse-html-expected.txt:
* inspector/timeline/timeline-recalculate-styles-expected.txt:
* inspector/timeline/timeline-script-tag-1-expected.txt:
* inspector/timeline/timeline-script-tag-2-expected.txt:
* inspector/timeline/timeline-test.js:
* inspector/timeline/timeline-time-stamp-expected.txt:
* inspector/timeline/timeline-timer-expected.txt:
* platform/chromium/inspector/timeline/timeline-animation-frame-expected.txt: Removed.
* platform/chromium/inspector/timeline/timeline-event-dispatch-expected.txt: Removed.
* platform/chromium/inspector/timeline/timeline-layout-expected.txt: Removed.
* platform/chromium/inspector/timeline/timeline-network-resource-expected.txt: Removed.
* platform/chromium/inspector/timeline/timeline-parse-html-expected.txt: Removed.
* platform/chromium/inspector/timeline/timeline-timer-expected.txt: Removed.</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestshttptestsinspectorinspectortestjs">trunk/LayoutTests/http/tests/inspector/inspector-test.js</a></li>
<li><a href="#trunkLayoutTestsinspectortimelinetimelineanimationframeexpectedtxt">trunk/LayoutTests/inspector/timeline/timeline-animation-frame-expected.txt</a></li>
<li><a href="#trunkLayoutTestsinspectortimelinetimelinedecoderesizeexpectedtxt">trunk/LayoutTests/inspector/timeline/timeline-decode-resize-expected.txt</a></li>
<li><a href="#trunkLayoutTestsinspectortimelinetimelinedomcontentloadedeventexpectedtxt">trunk/LayoutTests/inspector/timeline/timeline-dom-content-loaded-event-expected.txt</a></li>
<li><a href="#trunkLayoutTestsinspectortimelinetimelineeventdispatchexpectedtxt">trunk/LayoutTests/inspector/timeline/timeline-event-dispatch-expected.txt</a></li>
<li><a href="#trunkLayoutTestsinspectortimelinetimelineinjectedscriptevalexpectedtxt">trunk/LayoutTests/inspector/timeline/timeline-injected-script-eval-expected.txt</a></li>
<li><a href="#trunkLayoutTestsinspectortimelinetimelinelayoutexpectedtxt">trunk/LayoutTests/inspector/timeline/timeline-layout-expected.txt</a></li>
<li><a href="#trunkLayoutTestsinspectortimelinetimelineloadeventexpectedtxt">trunk/LayoutTests/inspector/timeline/timeline-load-event-expected.txt</a></li>
<li><a href="#trunkLayoutTestsinspectortimelinetimelinemarktimelineexpectedtxt">trunk/LayoutTests/inspector/timeline/timeline-mark-timeline-expected.txt</a></li>
<li><a href="#trunkLayoutTestsinspectortimelinetimelinenetworkresourceexpectedtxt">trunk/LayoutTests/inspector/timeline/timeline-network-resource-expected.txt</a></li>
<li><a href="#trunkLayoutTestsinspectortimelinetimelinepaintexpectedtxt">trunk/LayoutTests/inspector/timeline/timeline-paint-expected.txt</a></li>
<li><a href="#trunkLayoutTestsinspectortimelinetimelineparsehtmlexpectedtxt">trunk/LayoutTests/inspector/timeline/timeline-parse-html-expected.txt</a></li>
<li><a href="#trunkLayoutTestsinspectortimelinetimelinerecalculatestylesexpectedtxt">trunk/LayoutTests/inspector/timeline/timeline-recalculate-styles-expected.txt</a></li>
<li><a href="#trunkLayoutTestsinspectortimelinetimelinescripttag1expectedtxt">trunk/LayoutTests/inspector/timeline/timeline-script-tag-1-expected.txt</a></li>
<li><a href="#trunkLayoutTestsinspectortimelinetimelinescripttag2expectedtxt">trunk/LayoutTests/inspector/timeline/timeline-script-tag-2-expected.txt</a></li>
<li><a href="#trunkLayoutTestsinspectortimelinetimelinetestjs">trunk/LayoutTests/inspector/timeline/timeline-test.js</a></li>
<li><a href="#trunkLayoutTestsinspectortimelinetimelinetimestampexpectedtxt">trunk/LayoutTests/inspector/timeline/timeline-time-stamp-expected.txt</a></li>
<li><a href="#trunkLayoutTestsinspectortimelinetimelinetimerexpectedtxt">trunk/LayoutTests/inspector/timeline/timeline-timer-expected.txt</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreEnglishlprojlocalizedStringsjs">trunk/Source/WebCore/English.lproj/localizedStrings.js</a></li>
<li><a href="#trunkSourceWebCoreinspectorInspectorTimelineAgentcpp">trunk/Source/WebCore/inspector/InspectorTimelineAgent.cpp</a></li>
<li><a href="#trunkSourceWebCoreinspectorInspectorTimelineAgenth">trunk/Source/WebCore/inspector/InspectorTimelineAgent.h</a></li>
<li><a href="#trunkSourceWebCoreinspectorfrontendTimelinePresentationModeljs">trunk/Source/WebCore/inspector/front-end/TimelinePresentationModel.js</a></li>
</ul>

<h3>Removed Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsplatformchromiuminspectortimelinetimelineanimationframeexpectedtxt">trunk/LayoutTests/platform/chromium/inspector/timeline/timeline-animation-frame-expected.txt</a></li>
<li><a href="#trunkLayoutTestsplatformchromiuminspectortimelinetimelineeventdispatchexpectedtxt">trunk/LayoutTests/platform/chromium/inspector/timeline/timeline-event-dispatch-expected.txt</a></li>
<li><a href="#trunkLayoutTestsplatformchromiuminspectortimelinetimelinelayoutexpectedtxt">trunk/LayoutTests/platform/chromium/inspector/timeline/timeline-layout-expected.txt</a></li>
<li><a href="#trunkLayoutTestsplatformchromiuminspectortimelinetimelinenetworkresourceexpectedtxt">trunk/LayoutTests/platform/chromium/inspector/timeline/timeline-network-resource-expected.txt</a></li>
<li><a href="#trunkLayoutTestsplatformchromiuminspectortimelinetimelineparsehtmlexpectedtxt">trunk/LayoutTests/platform/chromium/inspector/timeline/timeline-parse-html-expected.txt</a></li>
<li><a href="#trunkLayoutTestsplatformchromiuminspectortimelinetimelinetimerexpectedtxt">trunk/LayoutTests/platform/chromium/inspector/timeline/timeline-timer-expected.txt</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (128056 => 128057)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog        2012-09-10 13:54:40 UTC (rev 128056)
+++ trunk/LayoutTests/ChangeLog        2012-09-10 14:01:26 UTC (rev 128057)
</span><span class="lines">@@ -1,3 +1,40 @@
</span><ins>+2012-09-07  Andrey Kosyakov  &lt;caseq@chromium.org&gt;
+
+        Web Inspector: only display heap size statistics for timeline records when it makes sense
+        https://bugs.webkit.org/show_bug.cgi?id=96119
+
+        Reviewed by Yury Semikhatsky.
+
+        - rebase timeline tests to drop totalHeapSize
+        - add support for &quot;skip&quot; formatter, to handle cases where value is optionally present in the dumped object;
+        - drop custom expectations that are identical to base;
+
+        * http/tests/inspector/inspector-test.js:
+        (initialize_InspectorTest.InspectorTest.addObject):
+        * inspector/timeline/timeline-animation-frame-expected.txt:
+        * inspector/timeline/timeline-decode-resize-expected.txt:
+        * inspector/timeline/timeline-dom-content-loaded-event-expected.txt:
+        * inspector/timeline/timeline-event-dispatch-expected.txt:
+        * inspector/timeline/timeline-injected-script-eval-expected.txt:
+        * inspector/timeline/timeline-layout-expected.txt:
+        * inspector/timeline/timeline-load-event-expected.txt:
+        * inspector/timeline/timeline-mark-timeline-expected.txt:
+        * inspector/timeline/timeline-network-resource-expected.txt:
+        * inspector/timeline/timeline-paint-expected.txt:
+        * inspector/timeline/timeline-parse-html-expected.txt:
+        * inspector/timeline/timeline-recalculate-styles-expected.txt:
+        * inspector/timeline/timeline-script-tag-1-expected.txt:
+        * inspector/timeline/timeline-script-tag-2-expected.txt:
+        * inspector/timeline/timeline-test.js:
+        * inspector/timeline/timeline-time-stamp-expected.txt:
+        * inspector/timeline/timeline-timer-expected.txt:
+        * platform/chromium/inspector/timeline/timeline-animation-frame-expected.txt: Removed.
+        * platform/chromium/inspector/timeline/timeline-event-dispatch-expected.txt: Removed.
+        * platform/chromium/inspector/timeline/timeline-layout-expected.txt: Removed.
+        * platform/chromium/inspector/timeline/timeline-network-resource-expected.txt: Removed.
+        * platform/chromium/inspector/timeline/timeline-parse-html-expected.txt: Removed.
+        * platform/chromium/inspector/timeline/timeline-timer-expected.txt: Removed.
+
</ins><span class="cx"> 2012-09-10  J├ínos Badics  &lt;jbadics@inf.u-szeged.hu&gt;
</span><span class="cx"> 
</span><span class="cx">         [Qt] Gardening after r128042. Added baseline to newly added
</span></span></pre></div>
<a id="trunkLayoutTestshttptestsinspectorinspectortestjs"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/http/tests/inspector/inspector-test.js (128056 => 128057)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/http/tests/inspector/inspector-test.js        2012-09-10 13:54:40 UTC (rev 128056)
+++ trunk/LayoutTests/http/tests/inspector/inspector-test.js        2012-09-10 14:01:26 UTC (rev 128057)
</span><span class="lines">@@ -139,8 +139,10 @@
</span><span class="cx">         var propValue = object[prop];
</span><span class="cx">         if (customFormatters &amp;&amp; customFormatters[prop]) {
</span><span class="cx">             var formatterName = customFormatters[prop];
</span><del>-            var formatter = InspectorTest.formatters[formatterName];
-            InspectorTest.addResult(prefixWithName + formatter(propValue));
</del><ins>+            if (formatterName !== &quot;skip&quot;) {
+                var formatter = InspectorTest.formatters[formatterName];
+                InspectorTest.addResult(prefixWithName + formatter(propValue));
+            }
</ins><span class="cx">         } else
</span><span class="cx">             InspectorTest.dump(propValue, customFormatters, &quot;    &quot; + prefix, prefixWithName);
</span><span class="cx">     }
</span></span></pre></div>
<a id="trunkLayoutTestsinspectortimelinetimelineanimationframeexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/inspector/timeline/timeline-animation-frame-expected.txt (128056 => 128057)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/inspector/timeline/timeline-animation-frame-expected.txt        2012-09-10 13:54:40 UTC (rev 128056)
+++ trunk/LayoutTests/inspector/timeline/timeline-animation-frame-expected.txt        2012-09-10 14:01:26 UTC (rev 128057)
</span><span class="lines">@@ -9,7 +9,6 @@
</span><span class="cx">     frameId : &lt;string&gt;
</span><span class="cx">     stackTrace : &lt;object&gt;
</span><span class="cx">     startTime : &lt;number&gt;
</span><del>-    totalHeapSize : &lt;number&gt;
</del><span class="cx">     type : &quot;RequestAnimationFrame&quot;
</span><span class="cx">     usedHeapSize : &lt;number&gt;
</span><span class="cx"> }
</span><span class="lines">@@ -23,7 +22,6 @@
</span><span class="cx">     endTime : &lt;number&gt;
</span><span class="cx">     frameId : &lt;string&gt;
</span><span class="cx">     startTime : &lt;number&gt;
</span><del>-    totalHeapSize : &lt;number&gt;
</del><span class="cx">     type : &quot;FireAnimationFrame&quot;
</span><span class="cx">     usedHeapSize : &lt;number&gt;
</span><span class="cx"> }
</span><span class="lines">@@ -36,7 +34,6 @@
</span><span class="cx">     frameId : &lt;string&gt;
</span><span class="cx">     stackTrace : &lt;object&gt;
</span><span class="cx">     startTime : &lt;number&gt;
</span><del>-    totalHeapSize : &lt;number&gt;
</del><span class="cx">     type : &quot;CancelAnimationFrame&quot;
</span><span class="cx">     usedHeapSize : &lt;number&gt;
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkLayoutTestsinspectortimelinetimelinedecoderesizeexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/inspector/timeline/timeline-decode-resize-expected.txt (128056 => 128057)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/inspector/timeline/timeline-decode-resize-expected.txt        2012-09-10 13:54:40 UTC (rev 128056)
+++ trunk/LayoutTests/inspector/timeline/timeline-decode-resize-expected.txt        2012-09-10 14:01:26 UTC (rev 128057)
</span><span class="lines">@@ -11,7 +11,6 @@
</span><span class="cx">     endTime : &lt;number&gt;
</span><span class="cx">     stackTrace : &lt;object&gt;
</span><span class="cx">     startTime : &lt;number&gt;
</span><del>-    totalHeapSize : &lt;number&gt;
</del><span class="cx">     type : &quot;DecodeImage&quot;
</span><span class="cx">     usedHeapSize : &lt;number&gt;
</span><span class="cx"> }
</span><span class="lines">@@ -25,7 +24,6 @@
</span><span class="cx">     endTime : &lt;number&gt;
</span><span class="cx">     stackTrace : &lt;object&gt;
</span><span class="cx">     startTime : &lt;number&gt;
</span><del>-    totalHeapSize : &lt;number&gt;
</del><span class="cx">     type : &quot;ResizeImage&quot;
</span><span class="cx">     usedHeapSize : &lt;number&gt;
</span><span class="cx"> }
</span><span class="lines">@@ -39,7 +37,6 @@
</span><span class="cx">     endTime : &lt;number&gt;
</span><span class="cx">     stackTrace : &lt;object&gt;
</span><span class="cx">     startTime : &lt;number&gt;
</span><del>-    totalHeapSize : &lt;number&gt;
</del><span class="cx">     type : &quot;DecodeImage&quot;
</span><span class="cx">     usedHeapSize : &lt;number&gt;
</span><span class="cx"> }
</span><span class="lines">@@ -53,7 +50,6 @@
</span><span class="cx">     endTime : &lt;number&gt;
</span><span class="cx">     stackTrace : &lt;object&gt;
</span><span class="cx">     startTime : &lt;number&gt;
</span><del>-    totalHeapSize : &lt;number&gt;
</del><span class="cx">     type : &quot;ResizeImage&quot;
</span><span class="cx">     usedHeapSize : &lt;number&gt;
</span><span class="cx"> }
</span><span class="lines">@@ -67,7 +63,6 @@
</span><span class="cx">     endTime : &lt;number&gt;
</span><span class="cx">     stackTrace : &lt;object&gt;
</span><span class="cx">     startTime : &lt;number&gt;
</span><del>-    totalHeapSize : &lt;number&gt;
</del><span class="cx">     type : &quot;DecodeImage&quot;
</span><span class="cx">     usedHeapSize : &lt;number&gt;
</span><span class="cx"> }
</span><span class="lines">@@ -81,7 +76,6 @@
</span><span class="cx">     endTime : &lt;number&gt;
</span><span class="cx">     stackTrace : &lt;object&gt;
</span><span class="cx">     startTime : &lt;number&gt;
</span><del>-    totalHeapSize : &lt;number&gt;
</del><span class="cx">     type : &quot;ResizeImage&quot;
</span><span class="cx">     usedHeapSize : &lt;number&gt;
</span><span class="cx"> }
</span><span class="lines">@@ -95,7 +89,6 @@
</span><span class="cx">     endTime : &lt;number&gt;
</span><span class="cx">     stackTrace : &lt;object&gt;
</span><span class="cx">     startTime : &lt;number&gt;
</span><del>-    totalHeapSize : &lt;number&gt;
</del><span class="cx">     type : &quot;DecodeImage&quot;
</span><span class="cx">     usedHeapSize : &lt;number&gt;
</span><span class="cx"> }
</span><span class="lines">@@ -109,7 +102,6 @@
</span><span class="cx">     endTime : &lt;number&gt;
</span><span class="cx">     stackTrace : &lt;object&gt;
</span><span class="cx">     startTime : &lt;number&gt;
</span><del>-    totalHeapSize : &lt;number&gt;
</del><span class="cx">     type : &quot;ResizeImage&quot;
</span><span class="cx">     usedHeapSize : &lt;number&gt;
</span><span class="cx"> }
</span><span class="lines">@@ -123,7 +115,6 @@
</span><span class="cx">     endTime : &lt;number&gt;
</span><span class="cx">     stackTrace : &lt;object&gt;
</span><span class="cx">     startTime : &lt;number&gt;
</span><del>-    totalHeapSize : &lt;number&gt;
</del><span class="cx">     type : &quot;DecodeImage&quot;
</span><span class="cx">     usedHeapSize : &lt;number&gt;
</span><span class="cx"> }
</span><span class="lines">@@ -137,7 +128,6 @@
</span><span class="cx">     endTime : &lt;number&gt;
</span><span class="cx">     stackTrace : &lt;object&gt;
</span><span class="cx">     startTime : &lt;number&gt;
</span><del>-    totalHeapSize : &lt;number&gt;
</del><span class="cx">     type : &quot;ResizeImage&quot;
</span><span class="cx">     usedHeapSize : &lt;number&gt;
</span><span class="cx"> }
</span><span class="lines">@@ -151,7 +141,6 @@
</span><span class="cx">     endTime : &lt;number&gt;
</span><span class="cx">     stackTrace : &lt;object&gt;
</span><span class="cx">     startTime : &lt;number&gt;
</span><del>-    totalHeapSize : &lt;number&gt;
</del><span class="cx">     type : &quot;DecodeImage&quot;
</span><span class="cx">     usedHeapSize : &lt;number&gt;
</span><span class="cx"> }
</span><span class="lines">@@ -165,7 +154,6 @@
</span><span class="cx">     endTime : &lt;number&gt;
</span><span class="cx">     stackTrace : &lt;object&gt;
</span><span class="cx">     startTime : &lt;number&gt;
</span><del>-    totalHeapSize : &lt;number&gt;
</del><span class="cx">     type : &quot;ResizeImage&quot;
</span><span class="cx">     usedHeapSize : &lt;number&gt;
</span><span class="cx"> }
</span><span class="lines">@@ -179,7 +167,6 @@
</span><span class="cx">     endTime : &lt;number&gt;
</span><span class="cx">     stackTrace : &lt;object&gt;
</span><span class="cx">     startTime : &lt;number&gt;
</span><del>-    totalHeapSize : &lt;number&gt;
</del><span class="cx">     type : &quot;DecodeImage&quot;
</span><span class="cx">     usedHeapSize : &lt;number&gt;
</span><span class="cx"> }
</span><span class="lines">@@ -193,7 +180,6 @@
</span><span class="cx">     endTime : &lt;number&gt;
</span><span class="cx">     stackTrace : &lt;object&gt;
</span><span class="cx">     startTime : &lt;number&gt;
</span><del>-    totalHeapSize : &lt;number&gt;
</del><span class="cx">     type : &quot;ResizeImage&quot;
</span><span class="cx">     usedHeapSize : &lt;number&gt;
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkLayoutTestsinspectortimelinetimelinedomcontentloadedeventexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/inspector/timeline/timeline-dom-content-loaded-event-expected.txt (128056 => 128057)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/inspector/timeline/timeline-dom-content-loaded-event-expected.txt        2012-09-10 13:54:40 UTC (rev 128056)
+++ trunk/LayoutTests/inspector/timeline/timeline-dom-content-loaded-event-expected.txt        2012-09-10 14:01:26 UTC (rev 128057)
</span><span class="lines">@@ -8,7 +8,6 @@
</span><span class="cx">     }
</span><span class="cx">     frameId : &lt;string&gt;
</span><span class="cx">     startTime : &lt;number&gt;
</span><del>-    totalHeapSize : &lt;number&gt;
</del><span class="cx">     type : &quot;MarkDOMContent&quot;
</span><span class="cx">     usedHeapSize : &lt;number&gt;
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkLayoutTestsinspectortimelinetimelineeventdispatchexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/inspector/timeline/timeline-event-dispatch-expected.txt (128056 => 128057)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/inspector/timeline/timeline-event-dispatch-expected.txt        2012-09-10 13:54:40 UTC (rev 128056)
+++ trunk/LayoutTests/inspector/timeline/timeline-event-dispatch-expected.txt        2012-09-10 14:01:26 UTC (rev 128057)
</span><span class="lines">@@ -11,7 +11,6 @@
</span><span class="cx">     endTime : &lt;number&gt;
</span><span class="cx">     frameId : &lt;string&gt;
</span><span class="cx">     startTime : &lt;number&gt;
</span><del>-    totalHeapSize : &lt;number&gt;
</del><span class="cx">     type : &quot;EventDispatch&quot;
</span><span class="cx">     usedHeapSize : &lt;number&gt;
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkLayoutTestsinspectortimelinetimelineinjectedscriptevalexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/inspector/timeline/timeline-injected-script-eval-expected.txt (128056 => 128057)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/inspector/timeline/timeline-injected-script-eval-expected.txt        2012-09-10 13:54:40 UTC (rev 128056)
+++ trunk/LayoutTests/inspector/timeline/timeline-injected-script-eval-expected.txt        2012-09-10 14:01:26 UTC (rev 128057)
</span><span class="lines">@@ -11,7 +11,6 @@
</span><span class="cx">     endTime : &lt;number&gt;
</span><span class="cx">     frameId : &lt;string&gt;
</span><span class="cx">     startTime : &lt;number&gt;
</span><del>-    totalHeapSize : &lt;number&gt;
</del><span class="cx">     type : &quot;FunctionCall&quot;
</span><span class="cx">     usedHeapSize : &lt;number&gt;
</span><span class="cx"> }
</span><span class="lines">@@ -26,7 +25,6 @@
</span><span class="cx">     endTime : &lt;number&gt;
</span><span class="cx">     frameId : &lt;string&gt;
</span><span class="cx">     startTime : &lt;number&gt;
</span><del>-    totalHeapSize : &lt;number&gt;
</del><span class="cx">     type : &quot;FunctionCall&quot;
</span><span class="cx">     usedHeapSize : &lt;number&gt;
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkLayoutTestsinspectortimelinetimelinelayoutexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/inspector/timeline/timeline-layout-expected.txt (128056 => 128057)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/inspector/timeline/timeline-layout-expected.txt        2012-09-10 13:54:40 UTC (rev 128056)
+++ trunk/LayoutTests/inspector/timeline/timeline-layout-expected.txt        2012-09-10 14:01:26 UTC (rev 128057)
</span><span class="lines">@@ -11,7 +11,6 @@
</span><span class="cx">     frameId : &lt;string&gt;
</span><span class="cx">     stackTrace : &lt;object&gt;
</span><span class="cx">     startTime : &lt;number&gt;
</span><del>-    totalHeapSize : &lt;number&gt;
</del><span class="cx">     type : &quot;Layout&quot;
</span><span class="cx">     usedHeapSize : &lt;number&gt;
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkLayoutTestsinspectortimelinetimelineloadeventexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/inspector/timeline/timeline-load-event-expected.txt (128056 => 128057)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/inspector/timeline/timeline-load-event-expected.txt        2012-09-10 13:54:40 UTC (rev 128056)
+++ trunk/LayoutTests/inspector/timeline/timeline-load-event-expected.txt        2012-09-10 14:01:26 UTC (rev 128057)
</span><span class="lines">@@ -8,7 +8,6 @@
</span><span class="cx">     }
</span><span class="cx">     frameId : &lt;string&gt;
</span><span class="cx">     startTime : &lt;number&gt;
</span><del>-    totalHeapSize : &lt;number&gt;
</del><span class="cx">     type : &quot;MarkLoad&quot;
</span><span class="cx">     usedHeapSize : &lt;number&gt;
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkLayoutTestsinspectortimelinetimelinemarktimelineexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/inspector/timeline/timeline-mark-timeline-expected.txt (128056 => 128057)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/inspector/timeline/timeline-mark-timeline-expected.txt        2012-09-10 13:54:40 UTC (rev 128056)
+++ trunk/LayoutTests/inspector/timeline/timeline-mark-timeline-expected.txt        2012-09-10 14:01:26 UTC (rev 128057)
</span><span class="lines">@@ -9,7 +9,6 @@
</span><span class="cx">     frameId : &lt;string&gt;
</span><span class="cx">     stackTrace : &lt;object&gt;
</span><span class="cx">     startTime : &lt;number&gt;
</span><del>-    totalHeapSize : &lt;number&gt;
</del><span class="cx">     type : &quot;TimeStamp&quot;
</span><span class="cx">     usedHeapSize : &lt;number&gt;
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkLayoutTestsinspectortimelinetimelinenetworkresourceexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/inspector/timeline/timeline-network-resource-expected.txt (128056 => 128057)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/inspector/timeline/timeline-network-resource-expected.txt        2012-09-10 13:54:40 UTC (rev 128056)
+++ trunk/LayoutTests/inspector/timeline/timeline-network-resource-expected.txt        2012-09-10 14:01:26 UTC (rev 128057)
</span><span class="lines">@@ -14,7 +14,6 @@
</span><span class="cx">     frameId : &lt;string&gt;
</span><span class="cx">     stackTrace : &lt;object&gt;
</span><span class="cx">     startTime : &lt;number&gt;
</span><del>-    totalHeapSize : &lt;number&gt;
</del><span class="cx">     type : &quot;ResourceSendRequest&quot;
</span><span class="cx">     usedHeapSize : &lt;number&gt;
</span><span class="cx"> }
</span><span class="lines">@@ -31,7 +30,6 @@
</span><span class="cx">     endTime : &lt;number&gt;
</span><span class="cx">     frameId : &lt;string&gt;
</span><span class="cx">     startTime : &lt;number&gt;
</span><del>-    totalHeapSize : &lt;number&gt;
</del><span class="cx">     type : &quot;ResourceReceiveResponse&quot;
</span><span class="cx">     usedHeapSize : &lt;number&gt;
</span><span class="cx"> }
</span><span class="lines">@@ -45,7 +43,6 @@
</span><span class="cx">     }
</span><span class="cx">     frameId : &lt;string&gt;
</span><span class="cx">     startTime : &lt;number&gt;
</span><del>-    totalHeapSize : &lt;number&gt;
</del><span class="cx">     type : &quot;ResourceFinish&quot;
</span><span class="cx">     usedHeapSize : &lt;number&gt;
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkLayoutTestsinspectortimelinetimelinepaintexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/inspector/timeline/timeline-paint-expected.txt (128056 => 128057)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/inspector/timeline/timeline-paint-expected.txt        2012-09-10 13:54:40 UTC (rev 128056)
+++ trunk/LayoutTests/inspector/timeline/timeline-paint-expected.txt        2012-09-10 14:01:26 UTC (rev 128057)
</span><span class="lines">@@ -14,7 +14,6 @@
</span><span class="cx">     frameId : &lt;string&gt;
</span><span class="cx">     stackTrace : &lt;object&gt;
</span><span class="cx">     startTime : &lt;number&gt;
</span><del>-    totalHeapSize : &lt;number&gt;
</del><span class="cx">     type : &quot;Paint&quot;
</span><span class="cx">     usedHeapSize : &lt;number&gt;
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkLayoutTestsinspectortimelinetimelineparsehtmlexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/inspector/timeline/timeline-parse-html-expected.txt (128056 => 128057)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/inspector/timeline/timeline-parse-html-expected.txt        2012-09-10 13:54:40 UTC (rev 128056)
+++ trunk/LayoutTests/inspector/timeline/timeline-parse-html-expected.txt        2012-09-10 14:01:26 UTC (rev 128057)
</span><span class="lines">@@ -14,7 +14,6 @@
</span><span class="cx">     frameId : &lt;string&gt;
</span><span class="cx">     stackTrace : &lt;object&gt;
</span><span class="cx">     startTime : &lt;number&gt;
</span><del>-    totalHeapSize : &lt;number&gt;
</del><span class="cx">     type : &quot;ParseHTML&quot;
</span><span class="cx">     usedHeapSize : &lt;number&gt;
</span><span class="cx"> }
</span><span class="lines">@@ -31,7 +30,6 @@
</span><span class="cx">     frameId : &lt;string&gt;
</span><span class="cx">     stackTrace : &lt;object&gt;
</span><span class="cx">     startTime : &lt;number&gt;
</span><del>-    totalHeapSize : &lt;number&gt;
</del><span class="cx">     type : &quot;ParseHTML&quot;
</span><span class="cx">     usedHeapSize : &lt;number&gt;
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkLayoutTestsinspectortimelinetimelinerecalculatestylesexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/inspector/timeline/timeline-recalculate-styles-expected.txt (128056 => 128057)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/inspector/timeline/timeline-recalculate-styles-expected.txt        2012-09-10 13:54:40 UTC (rev 128056)
+++ trunk/LayoutTests/inspector/timeline/timeline-recalculate-styles-expected.txt        2012-09-10 14:01:26 UTC (rev 128057)
</span><span class="lines">@@ -10,7 +10,6 @@
</span><span class="cx">     endTime : &lt;number&gt;
</span><span class="cx">     frameId : &lt;string&gt;
</span><span class="cx">     startTime : &lt;number&gt;
</span><del>-    totalHeapSize : &lt;number&gt;
</del><span class="cx">     type : &quot;RecalculateStyles&quot;
</span><span class="cx">     usedHeapSize : &lt;number&gt;
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkLayoutTestsinspectortimelinetimelinescripttag1expectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/inspector/timeline/timeline-script-tag-1-expected.txt (128056 => 128057)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/inspector/timeline/timeline-script-tag-1-expected.txt        2012-09-10 13:54:40 UTC (rev 128056)
+++ trunk/LayoutTests/inspector/timeline/timeline-script-tag-1-expected.txt        2012-09-10 14:01:26 UTC (rev 128057)
</span><span class="lines">@@ -19,7 +19,6 @@
</span><span class="cx">     endTime : &lt;number&gt;
</span><span class="cx">     frameId : &lt;string&gt;
</span><span class="cx">     startTime : &lt;number&gt;
</span><del>-    totalHeapSize : &lt;number&gt;
</del><span class="cx">     type : &quot;EvaluateScript&quot;
</span><span class="cx">     usedHeapSize : &lt;number&gt;
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkLayoutTestsinspectortimelinetimelinescripttag2expectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/inspector/timeline/timeline-script-tag-2-expected.txt (128056 => 128057)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/inspector/timeline/timeline-script-tag-2-expected.txt        2012-09-10 13:54:40 UTC (rev 128056)
+++ trunk/LayoutTests/inspector/timeline/timeline-script-tag-2-expected.txt        2012-09-10 14:01:26 UTC (rev 128057)
</span><span class="lines">@@ -12,7 +12,6 @@
</span><span class="cx">     endTime : &lt;number&gt;
</span><span class="cx">     frameId : &lt;string&gt;
</span><span class="cx">     startTime : &lt;number&gt;
</span><del>-    totalHeapSize : &lt;number&gt;
</del><span class="cx">     type : &quot;EvaluateScript&quot;
</span><span class="cx">     usedHeapSize : &lt;number&gt;
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkLayoutTestsinspectortimelinetimelinetestjs"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/inspector/timeline/timeline-test.js (128056 => 128057)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/inspector/timeline/timeline-test.js        2012-09-10 13:54:40 UTC (rev 128056)
+++ trunk/LayoutTests/inspector/timeline/timeline-test.js        2012-09-10 14:01:26 UTC (rev 128057)
</span><span class="lines">@@ -12,7 +12,7 @@
</span><span class="cx">     url: &quot;formatAsTypeName&quot;,
</span><span class="cx">     scriptName: &quot;formatAsTypeName&quot;,
</span><span class="cx">     usedHeapSize: &quot;formatAsTypeName&quot;,
</span><del>-    totalHeapSize: &quot;formatAsTypeName&quot;,
</del><ins>+    usedHeapSizeDelta: &quot;skip&quot;,
</ins><span class="cx">     mimeType: &quot;formatAsTypeName&quot;,
</span><span class="cx">     id: &quot;formatAsTypeName&quot;,
</span><span class="cx">     counters: &quot;formatAsTypeName&quot;,
</span></span></pre></div>
<a id="trunkLayoutTestsinspectortimelinetimelinetimestampexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/inspector/timeline/timeline-time-stamp-expected.txt (128056 => 128057)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/inspector/timeline/timeline-time-stamp-expected.txt        2012-09-10 13:54:40 UTC (rev 128056)
+++ trunk/LayoutTests/inspector/timeline/timeline-time-stamp-expected.txt        2012-09-10 14:01:26 UTC (rev 128057)
</span><span class="lines">@@ -9,7 +9,6 @@
</span><span class="cx">     frameId : &lt;string&gt;
</span><span class="cx">     stackTrace : &lt;object&gt;
</span><span class="cx">     startTime : &lt;number&gt;
</span><del>-    totalHeapSize : &lt;number&gt;
</del><span class="cx">     type : &quot;TimeStamp&quot;
</span><span class="cx">     usedHeapSize : &lt;number&gt;
</span><span class="cx"> }
</span><span class="lines">@@ -23,7 +22,6 @@
</span><span class="cx">     frameId : &lt;string&gt;
</span><span class="cx">     stackTrace : &lt;object&gt;
</span><span class="cx">     startTime : &lt;number&gt;
</span><del>-    totalHeapSize : &lt;number&gt;
</del><span class="cx">     type : &quot;TimeStamp&quot;
</span><span class="cx">     usedHeapSize : &lt;number&gt;
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkLayoutTestsinspectortimelinetimelinetimerexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/inspector/timeline/timeline-timer-expected.txt (128056 => 128057)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/inspector/timeline/timeline-timer-expected.txt        2012-09-10 13:54:40 UTC (rev 128056)
+++ trunk/LayoutTests/inspector/timeline/timeline-timer-expected.txt        2012-09-10 14:01:26 UTC (rev 128057)
</span><span class="lines">@@ -11,7 +11,6 @@
</span><span class="cx">     frameId : &lt;string&gt;
</span><span class="cx">     stackTrace : &lt;object&gt;
</span><span class="cx">     startTime : &lt;number&gt;
</span><del>-    totalHeapSize : &lt;number&gt;
</del><span class="cx">     type : &quot;TimerInstall&quot;
</span><span class="cx">     usedHeapSize : &lt;number&gt;
</span><span class="cx"> }
</span><span class="lines">@@ -26,7 +25,6 @@
</span><span class="cx">     frameId : &lt;string&gt;
</span><span class="cx">     stackTrace : &lt;object&gt;
</span><span class="cx">     startTime : &lt;number&gt;
</span><del>-    totalHeapSize : &lt;number&gt;
</del><span class="cx">     type : &quot;TimerInstall&quot;
</span><span class="cx">     usedHeapSize : &lt;number&gt;
</span><span class="cx"> }
</span><span class="lines">@@ -40,7 +38,6 @@
</span><span class="cx">     endTime : &lt;number&gt;
</span><span class="cx">     frameId : &lt;string&gt;
</span><span class="cx">     startTime : &lt;number&gt;
</span><del>-    totalHeapSize : &lt;number&gt;
</del><span class="cx">     type : &quot;TimerFire&quot;
</span><span class="cx">     usedHeapSize : &lt;number&gt;
</span><span class="cx"> }
</span><span class="lines">@@ -54,7 +51,6 @@
</span><span class="cx">     endTime : &lt;number&gt;
</span><span class="cx">     frameId : &lt;string&gt;
</span><span class="cx">     startTime : &lt;number&gt;
</span><del>-    totalHeapSize : &lt;number&gt;
</del><span class="cx">     type : &quot;TimerFire&quot;
</span><span class="cx">     usedHeapSize : &lt;number&gt;
</span><span class="cx"> }
</span><span class="lines">@@ -68,7 +64,6 @@
</span><span class="cx">     endTime : &lt;number&gt;
</span><span class="cx">     frameId : &lt;string&gt;
</span><span class="cx">     startTime : &lt;number&gt;
</span><del>-    totalHeapSize : &lt;number&gt;
</del><span class="cx">     type : &quot;TimerFire&quot;
</span><span class="cx">     usedHeapSize : &lt;number&gt;
</span><span class="cx"> }
</span><span class="lines">@@ -81,7 +76,6 @@
</span><span class="cx">     frameId : &lt;string&gt;
</span><span class="cx">     stackTrace : &lt;object&gt;
</span><span class="cx">     startTime : &lt;number&gt;
</span><del>-    totalHeapSize : &lt;number&gt;
</del><span class="cx">     type : &quot;TimerRemove&quot;
</span><span class="cx">     usedHeapSize : &lt;number&gt;
</span><span class="cx"> }
</span><span class="lines">@@ -96,7 +90,6 @@
</span><span class="cx">     endTime : &lt;number&gt;
</span><span class="cx">     frameId : &lt;string&gt;
</span><span class="cx">     startTime : &lt;number&gt;
</span><del>-    totalHeapSize : &lt;number&gt;
</del><span class="cx">     type : &quot;FunctionCall&quot;
</span><span class="cx">     usedHeapSize : &lt;number&gt;
</span><span class="cx"> }
</span><span class="lines">@@ -111,7 +104,6 @@
</span><span class="cx">     endTime : &lt;number&gt;
</span><span class="cx">     frameId : &lt;string&gt;
</span><span class="cx">     startTime : &lt;number&gt;
</span><del>-    totalHeapSize : &lt;number&gt;
</del><span class="cx">     type : &quot;FunctionCall&quot;
</span><span class="cx">     usedHeapSize : &lt;number&gt;
</span><span class="cx"> }
</span><span class="lines">@@ -126,7 +118,6 @@
</span><span class="cx">     endTime : &lt;number&gt;
</span><span class="cx">     frameId : &lt;string&gt;
</span><span class="cx">     startTime : &lt;number&gt;
</span><del>-    totalHeapSize : &lt;number&gt;
</del><span class="cx">     type : &quot;FunctionCall&quot;
</span><span class="cx">     usedHeapSize : &lt;number&gt;
</span><span class="cx"> }
</span><span class="lines">@@ -141,7 +132,6 @@
</span><span class="cx">     endTime : &lt;number&gt;
</span><span class="cx">     frameId : &lt;string&gt;
</span><span class="cx">     startTime : &lt;number&gt;
</span><del>-    totalHeapSize : &lt;number&gt;
</del><span class="cx">     type : &quot;FunctionCall&quot;
</span><span class="cx">     usedHeapSize : &lt;number&gt;
</span><span class="cx"> }
</span><span class="lines">@@ -156,7 +146,6 @@
</span><span class="cx">     endTime : &lt;number&gt;
</span><span class="cx">     frameId : &lt;string&gt;
</span><span class="cx">     startTime : &lt;number&gt;
</span><del>-    totalHeapSize : &lt;number&gt;
</del><span class="cx">     type : &quot;EvaluateScript&quot;
</span><span class="cx">     usedHeapSize : &lt;number&gt;
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkLayoutTestsplatformchromiuminspectortimelinetimelineanimationframeexpectedtxt"></a>
<div class="delfile"><h4>Deleted: trunk/LayoutTests/platform/chromium/inspector/timeline/timeline-animation-frame-expected.txt (128056 => 128057)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/chromium/inspector/timeline/timeline-animation-frame-expected.txt        2012-09-10 13:54:40 UTC (rev 128056)
+++ trunk/LayoutTests/platform/chromium/inspector/timeline/timeline-animation-frame-expected.txt        2012-09-10 14:01:26 UTC (rev 128057)
</span><span class="lines">@@ -1,43 +0,0 @@
</span><del>-Tests the Timeline events for Animation Frame feature
-
-RequestAnimationFrame Properties:
-{
-    counters : &lt;object&gt;
-    data : {
-        id : &lt;number&gt;
-    }
-    frameId : &lt;string&gt;
-    stackTrace : &lt;object&gt;
-    startTime : &lt;number&gt;
-    totalHeapSize : &lt;number&gt;
-    type : &quot;RequestAnimationFrame&quot;
-    usedHeapSize : &lt;number&gt;
-}
-FireAnimationFrame Properties:
-{
-    children : &lt;object&gt;
-    counters : &lt;object&gt;
-    data : {
-        id : &lt;number&gt;
-    }
-    endTime : &lt;number&gt;
-    frameId : &lt;string&gt;
-    startTime : &lt;number&gt;
-    totalHeapSize : &lt;number&gt;
-    type : &quot;FireAnimationFrame&quot;
-    usedHeapSize : &lt;number&gt;
-}
-CancelAnimationFrame Properties:
-{
-    counters : &lt;object&gt;
-    data : {
-        id : &lt;number&gt;
-    }
-    frameId : &lt;string&gt;
-    stackTrace : &lt;object&gt;
-    startTime : &lt;number&gt;
-    totalHeapSize : &lt;number&gt;
-    type : &quot;CancelAnimationFrame&quot;
-    usedHeapSize : &lt;number&gt;
-}
-
</del></span></pre></div>
<a id="trunkLayoutTestsplatformchromiuminspectortimelinetimelineeventdispatchexpectedtxt"></a>
<div class="delfile"><h4>Deleted: trunk/LayoutTests/platform/chromium/inspector/timeline/timeline-event-dispatch-expected.txt (128056 => 128057)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/chromium/inspector/timeline/timeline-event-dispatch-expected.txt        2012-09-10 13:54:40 UTC (rev 128056)
+++ trunk/LayoutTests/platform/chromium/inspector/timeline/timeline-event-dispatch-expected.txt        2012-09-10 14:01:26 UTC (rev 128057)
</span><span class="lines">@@ -1,18 +0,0 @@
</span><del>-Tests the Timeline API instrumentation of a DOM Dispatch (mousedown)
-
-Test Mouse Target
-EventDispatch Properties:
-{
-    children : &lt;object&gt;
-    counters : &lt;object&gt;
-    data : {
-        type : &quot;mousedown&quot;
-    }
-    endTime : &lt;number&gt;
-    frameId : &lt;string&gt;
-    startTime : &lt;number&gt;
-    totalHeapSize : &lt;number&gt;
-    type : &quot;EventDispatch&quot;
-    usedHeapSize : &lt;number&gt;
-}
-
</del></span></pre></div>
<a id="trunkLayoutTestsplatformchromiuminspectortimelinetimelinelayoutexpectedtxt"></a>
<div class="delfile"><h4>Deleted: trunk/LayoutTests/platform/chromium/inspector/timeline/timeline-layout-expected.txt (128056 => 128057)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/chromium/inspector/timeline/timeline-layout-expected.txt        2012-09-10 13:54:40 UTC (rev 128056)
+++ trunk/LayoutTests/platform/chromium/inspector/timeline/timeline-layout-expected.txt        2012-09-10 14:01:26 UTC (rev 128057)
</span><span class="lines">@@ -1,18 +0,0 @@
</span><del>-Tests the Timeline API instrumentation of a Layout event
-
-Test data
-Layout Properties:
-{
-    children : &lt;object&gt;
-    counters : &lt;object&gt;
-    data : {
-    }
-    endTime : &lt;number&gt;
-    frameId : &lt;string&gt;
-    stackTrace : &lt;object&gt;
-    startTime : &lt;number&gt;
-    totalHeapSize : &lt;number&gt;
-    type : &quot;Layout&quot;
-    usedHeapSize : &lt;number&gt;
-}
-
</del></span></pre></div>
<a id="trunkLayoutTestsplatformchromiuminspectortimelinetimelinenetworkresourceexpectedtxt"></a>
<div class="delfile"><h4>Deleted: trunk/LayoutTests/platform/chromium/inspector/timeline/timeline-network-resource-expected.txt (128056 => 128057)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/chromium/inspector/timeline/timeline-network-resource-expected.txt        2012-09-10 13:54:40 UTC (rev 128056)
+++ trunk/LayoutTests/platform/chromium/inspector/timeline/timeline-network-resource-expected.txt        2012-09-10 14:01:26 UTC (rev 128057)
</span><span class="lines">@@ -1,52 +0,0 @@
</span><del>-CONSOLE MESSAGE: line 7: Script evaluated
-Tests the Timeline API instrumentation of a network resource load
-
-Script resource loaded
-
-ResourceSendRequest Properties:
-{
-    counters : &lt;object&gt;
-    data : {
-        requestId : &lt;string&gt;
-        requestMethod : &quot;GET&quot;
-        url : &lt;string&gt;
-    }
-    frameId : &lt;string&gt;
-    stackTrace : &lt;object&gt;
-    startTime : &lt;number&gt;
-    totalHeapSize : &lt;number&gt;
-    type : &quot;ResourceSendRequest&quot;
-    usedHeapSize : &lt;number&gt;
-}
-
-ResourceReceiveResponse Properties:
-{
-    children : &lt;object&gt;
-    counters : &lt;object&gt;
-    data : {
-        mimeType : &lt;string&gt;
-        requestId : &lt;string&gt;
-        statusCode : 0
-    }
-    endTime : &lt;number&gt;
-    frameId : &lt;string&gt;
-    startTime : &lt;number&gt;
-    totalHeapSize : &lt;number&gt;
-    type : &quot;ResourceReceiveResponse&quot;
-    usedHeapSize : &lt;number&gt;
-}
-
-ResourceFinish Properties:
-{
-    counters : &lt;object&gt;
-    data : {
-        didFail : false
-        requestId : &lt;string&gt;
-    }
-    frameId : &lt;string&gt;
-    startTime : &lt;number&gt;
-    totalHeapSize : &lt;number&gt;
-    type : &quot;ResourceFinish&quot;
-    usedHeapSize : &lt;number&gt;
-}
-
</del></span></pre></div>
<a id="trunkLayoutTestsplatformchromiuminspectortimelinetimelineparsehtmlexpectedtxt"></a>
<div class="delfile"><h4>Deleted: trunk/LayoutTests/platform/chromium/inspector/timeline/timeline-parse-html-expected.txt (128056 => 128057)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/chromium/inspector/timeline/timeline-parse-html-expected.txt        2012-09-10 13:54:40 UTC (rev 128056)
+++ trunk/LayoutTests/platform/chromium/inspector/timeline/timeline-parse-html-expected.txt        2012-09-10 14:01:26 UTC (rev 128057)
</span><span class="lines">@@ -1,38 +0,0 @@
</span><del>-Tests the Timeline API instrumentation of ParseHTML
-
-Test data
-ParseHTML Properties:
-{
-    children : &lt;object&gt;
-    counters : &lt;object&gt;
-    data : {
-        endLine : 0
-        length : 9
-        startLine : 0
-    }
-    endTime : &lt;number&gt;
-    frameId : &lt;string&gt;
-    stackTrace : &lt;object&gt;
-    startTime : &lt;number&gt;
-    totalHeapSize : &lt;number&gt;
-    type : &quot;ParseHTML&quot;
-    usedHeapSize : &lt;number&gt;
-}
-ParseHTML Properties:
-{
-    children : &lt;object&gt;
-    counters : &lt;object&gt;
-    data : {
-        endLine : 0
-        length : 1
-        startLine : 0
-    }
-    endTime : &lt;number&gt;
-    frameId : &lt;string&gt;
-    stackTrace : &lt;object&gt;
-    startTime : &lt;number&gt;
-    totalHeapSize : &lt;number&gt;
-    type : &quot;ParseHTML&quot;
-    usedHeapSize : &lt;number&gt;
-}
-
</del></span></pre></div>
<a id="trunkLayoutTestsplatformchromiuminspectortimelinetimelinetimerexpectedtxt"></a>
<div class="delfile"><h4>Deleted: trunk/LayoutTests/platform/chromium/inspector/timeline/timeline-timer-expected.txt (128056 => 128057)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/chromium/inspector/timeline/timeline-timer-expected.txt        2012-09-10 13:54:40 UTC (rev 128056)
+++ trunk/LayoutTests/platform/chromium/inspector/timeline/timeline-timer-expected.txt        2012-09-10 14:01:26 UTC (rev 128057)
</span><span class="lines">@@ -1,163 +0,0 @@
</span><del>-Tests the Timeline events for Timers
-
-TimerInstall Properties:
-{
-    counters : &lt;object&gt;
-    data : {
-        singleShot : true
-        timeout : 10
-        timerId : &lt;number&gt;
-    }
-    frameId : &lt;string&gt;
-    stackTrace : &lt;object&gt;
-    startTime : &lt;number&gt;
-    totalHeapSize : &lt;number&gt;
-    type : &quot;TimerInstall&quot;
-    usedHeapSize : &lt;number&gt;
-}
-TimerInstall Properties:
-{
-    counters : &lt;object&gt;
-    data : {
-        singleShot : false
-        timeout : 20
-        timerId : &lt;number&gt;
-    }
-    frameId : &lt;string&gt;
-    stackTrace : &lt;object&gt;
-    startTime : &lt;number&gt;
-    totalHeapSize : &lt;number&gt;
-    type : &quot;TimerInstall&quot;
-    usedHeapSize : &lt;number&gt;
-}
-TimerFire Properties:
-{
-    children : &lt;object&gt;
-    counters : &lt;object&gt;
-    data : {
-        timerId : &lt;number&gt;
-    }
-    endTime : &lt;number&gt;
-    frameId : &lt;string&gt;
-    startTime : &lt;number&gt;
-    totalHeapSize : &lt;number&gt;
-    type : &quot;TimerFire&quot;
-    usedHeapSize : &lt;number&gt;
-}
-TimerFire Properties:
-{
-    children : &lt;object&gt;
-    counters : &lt;object&gt;
-    data : {
-        timerId : &lt;number&gt;
-    }
-    endTime : &lt;number&gt;
-    frameId : &lt;string&gt;
-    startTime : &lt;number&gt;
-    totalHeapSize : &lt;number&gt;
-    type : &quot;TimerFire&quot;
-    usedHeapSize : &lt;number&gt;
-}
-TimerFire Properties:
-{
-    children : &lt;object&gt;
-    counters : &lt;object&gt;
-    data : {
-        timerId : &lt;number&gt;
-    }
-    endTime : &lt;number&gt;
-    frameId : &lt;string&gt;
-    startTime : &lt;number&gt;
-    totalHeapSize : &lt;number&gt;
-    type : &quot;TimerFire&quot;
-    usedHeapSize : &lt;number&gt;
-}
-TimerRemove Properties:
-{
-    counters : &lt;object&gt;
-    data : {
-        timerId : &lt;number&gt;
-    }
-    frameId : &lt;string&gt;
-    stackTrace : &lt;object&gt;
-    startTime : &lt;number&gt;
-    totalHeapSize : &lt;number&gt;
-    type : &quot;TimerRemove&quot;
-    usedHeapSize : &lt;number&gt;
-}
-FunctionCall Properties:
-{
-    children : &lt;object&gt;
-    counters : &lt;object&gt;
-    data : {
-        scriptLine : &lt;number&gt;
-        scriptName : &lt;string&gt;
-    }
-    endTime : &lt;number&gt;
-    frameId : &lt;string&gt;
-    startTime : &lt;number&gt;
-    totalHeapSize : &lt;number&gt;
-    type : &quot;FunctionCall&quot;
-    usedHeapSize : &lt;number&gt;
-}
-FunctionCall Properties:
-{
-    children : &lt;object&gt;
-    counters : &lt;object&gt;
-    data : {
-        scriptLine : &lt;number&gt;
-        scriptName : &lt;string&gt;
-    }
-    endTime : &lt;number&gt;
-    frameId : &lt;string&gt;
-    startTime : &lt;number&gt;
-    totalHeapSize : &lt;number&gt;
-    type : &quot;FunctionCall&quot;
-    usedHeapSize : &lt;number&gt;
-}
-FunctionCall Properties:
-{
-    children : &lt;object&gt;
-    counters : &lt;object&gt;
-    data : {
-        scriptLine : &lt;number&gt;
-        scriptName : &lt;string&gt;
-    }
-    endTime : &lt;number&gt;
-    frameId : &lt;string&gt;
-    startTime : &lt;number&gt;
-    totalHeapSize : &lt;number&gt;
-    type : &quot;FunctionCall&quot;
-    usedHeapSize : &lt;number&gt;
-}
-FunctionCall Properties:
-{
-    children : &lt;object&gt;
-    counters : &lt;object&gt;
-    data : {
-        scriptLine : &lt;number&gt;
-        scriptName : &lt;string&gt;
-    }
-    endTime : &lt;number&gt;
-    frameId : &lt;string&gt;
-    startTime : &lt;number&gt;
-    totalHeapSize : &lt;number&gt;
-    type : &quot;FunctionCall&quot;
-    usedHeapSize : &lt;number&gt;
-}
-EvaluateScript Properties:
-{
-    children : &lt;object&gt;
-    counters : &lt;object&gt;
-    data : {
-        lineNumber : &lt;number&gt;
-        url : &lt;string&gt;
-    }
-    endTime : &lt;number&gt;
-    frameId : &lt;string&gt;
-    startTime : &lt;number&gt;
-    totalHeapSize : &lt;number&gt;
-    type : &quot;EvaluateScript&quot;
-    usedHeapSize : &lt;number&gt;
-}
-
</del></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (128056 => 128057)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog        2012-09-10 13:54:40 UTC (rev 128056)
+++ trunk/Source/WebCore/ChangeLog        2012-09-10 14:01:26 UTC (rev 128057)
</span><span class="lines">@@ -1,3 +1,28 @@
</span><ins>+2012-09-07  Andrey Kosyakov  &lt;caseq@chromium.org&gt;
+
+        Web Inspector: only display heap size statistics for timeline records when it makes sense
+        https://bugs.webkit.org/show_bug.cgi?id=96119
+
+        Reviewed by Yury Semikhatsky.
+
+        - drop totalHeapSize from timeline records;
+        - add usedHeapSizeDelta (not set if 0), for heap delta between start and end of the event;
+        - only display memory details for events of scriping category or when delta is not 0;
+
+        * English.lproj/localizedStrings.js:
+        * inspector/InspectorTimelineAgent.cpp:
+        (WebCore::getUsedHeapSize):
+        (WebCore):
+        (WebCore::InspectorTimelineAgent::setHeapSizeStatistics):
+        (WebCore::InspectorTimelineAgent::didCompleteCurrentRecord):
+        (WebCore::InspectorTimelineAgent::pushCurrentRecord):
+        * inspector/InspectorTimelineAgent.h:
+        (WebCore::InspectorTimelineAgent::TimelineRecordEntry::TimelineRecordEntry):
+        (TimelineRecordEntry):
+        * inspector/front-end/TimelinePresentationModel.js:
+        (WebInspector.TimelinePresentationModel.Record.prototype.get usedHeapSizeDelta):
+        (WebInspector.TimelinePresentationModel.Record.prototype._generatePopupContentWithImagePreview):
+
</ins><span class="cx"> 2012-09-10  Simon Hausmann  &lt;simon.hausmann@nokia.com&gt;
</span><span class="cx"> 
</span><span class="cx">         [Qt] Drastically shorten length of commandline needed for JS bindings generator
</span></span></pre></div>
<a id="trunkSourceWebCoreEnglishlprojlocalizedStringsjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/English.lproj/localizedStrings.js (128056 => 128057)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/English.lproj/localizedStrings.js        2012-09-10 13:54:40 UTC (rev 128056)
+++ trunk/Source/WebCore/English.lproj/localizedStrings.js        2012-09-10 14:01:26 UTC (rev 128057)
</span><span class="lines">@@ -42,7 +42,6 @@
</span><span class="cx"> localizedStrings[&quot;%s download&quot;] = &quot;%s download&quot;;
</span><span class="cx"> localizedStrings[&quot;%s latency&quot;] = &quot;%s latency&quot;;
</span><span class="cx"> localizedStrings[&quot;%s latency, %s download (%s total)&quot;] = &quot;%s latency, %s download (%s total)&quot;;
</span><del>-localizedStrings[&quot;%s of %s&quot;] = &quot;%s of %s&quot;;
</del><span class="cx"> localizedStrings[&quot;%s%.2f%%&quot;] = &quot;%s%.2f%%&quot;;
</span><span class="cx"> localizedStrings[&quot;%s%d&quot;] = &quot;%s%d&quot;;
</span><span class="cx"> localizedStrings[&quot;%s%s&quot;] = &quot;%s%s&quot;;
</span><span class="lines">@@ -738,4 +737,4 @@
</span><span class="cx"> localizedStrings[&quot;Layout invalidated&quot;] = &quot;Layout invalidated&quot;;
</span><span class="cx"> localizedStrings[&quot;Layout forced&quot;] = &quot;Layout forced&quot;;
</span><span class="cx"> localizedStrings[&quot;Paused on assertion.&quot;] = &quot;Paused on assertion.&quot;;
</span><del>-
</del><ins>+localizedStrings[&quot;%s (%s%s)&quot;] = &quot;%s (%s%s)&quot;;
</ins></span></pre></div>
<a id="trunkSourceWebCoreinspectorInspectorTimelineAgentcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/InspectorTimelineAgent.cpp (128056 => 128057)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/InspectorTimelineAgent.cpp        2012-09-10 13:54:40 UTC (rev 128056)
+++ trunk/Source/WebCore/inspector/InspectorTimelineAgent.cpp        2012-09-10 14:01:26 UTC (rev 128057)
</span><span class="lines">@@ -502,13 +502,17 @@
</span><span class="cx">     }
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-void InspectorTimelineAgent::setHeapSizeStatistics(InspectorObject* record)
</del><ins>+static size_t getUsedHeapSize()
</ins><span class="cx"> {
</span><span class="cx">     HeapInfo info;
</span><span class="cx">     ScriptGCEvent::getHeapSize(info);
</span><del>-    record-&gt;setNumber(&quot;usedHeapSize&quot;, info.usedJSHeapSize);
-    record-&gt;setNumber(&quot;totalHeapSize&quot;, info.totalJSHeapSize);
</del><ins>+    return info.usedJSHeapSize;
+}
</ins><span class="cx"> 
</span><ins>+void InspectorTimelineAgent::setHeapSizeStatistics(InspectorObject* record)
+{
+    record-&gt;setNumber(&quot;usedHeapSize&quot;, getUsedHeapSize());
+
</ins><span class="cx">     if (m_state-&gt;getBoolean(TimelineAgentState::includeMemoryDetails)) {
</span><span class="cx">         RefPtr&lt;InspectorObject&gt; counters = InspectorObject::create();
</span><span class="cx">         counters-&gt;setNumber(&quot;nodes&quot;, (m_inspectorType == PageInspector) ? InspectorCounters::counterValue(InspectorCounters::NodeCounter) : 0);
</span><span class="lines">@@ -535,6 +539,9 @@
</span><span class="cx">         entry.record-&gt;setObject(&quot;data&quot;, entry.data);
</span><span class="cx">         entry.record-&gt;setArray(&quot;children&quot;, entry.children);
</span><span class="cx">         entry.record-&gt;setNumber(&quot;endTime&quot;, timestamp());
</span><ins>+        size_t usedHeapSizeDelta = getUsedHeapSize() - entry.usedHeapSizeAtStart;
+        if (usedHeapSizeDelta)
+            entry.record-&gt;setNumber(&quot;usedHeapSizeDelta&quot;, usedHeapSizeDelta);
</ins><span class="cx">         addRecordToTimeline(entry.record, type, entry.frameId);
</span><span class="cx">     }
</span><span class="cx"> }
</span><span class="lines">@@ -572,7 +579,7 @@
</span><span class="cx">     String frameId;
</span><span class="cx">     if (frame &amp;&amp; m_pageAgent)
</span><span class="cx">         frameId = m_pageAgent-&gt;frameId(frame);
</span><del>-    m_recordStack.append(TimelineRecordEntry(record.release(), data, InspectorArray::create(), type, frameId));
</del><ins>+    m_recordStack.append(TimelineRecordEntry(record.release(), data, InspectorArray::create(), type, frameId, getUsedHeapSize()));
</ins><span class="cx">     if (hasLowLevelDetails &amp;&amp; !m_platformInstrumentationClientInstalledAtStackDepth &amp;&amp; !PlatformInstrumentation::hasClient()) {
</span><span class="cx">         m_platformInstrumentationClientInstalledAtStackDepth = m_recordStack.size();
</span><span class="cx">         PlatformInstrumentation::setClient(this);
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorInspectorTimelineAgenth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/InspectorTimelineAgent.h (128056 => 128057)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/InspectorTimelineAgent.h        2012-09-10 13:54:40 UTC (rev 128056)
+++ trunk/Source/WebCore/inspector/InspectorTimelineAgent.h        2012-09-10 14:01:26 UTC (rev 128057)
</span><span class="lines">@@ -161,8 +161,8 @@
</span><span class="cx"> 
</span><span class="cx"> private:
</span><span class="cx">     struct TimelineRecordEntry {
</span><del>-        TimelineRecordEntry(PassRefPtr&lt;InspectorObject&gt; record, PassRefPtr&lt;InspectorObject&gt; data, PassRefPtr&lt;InspectorArray&gt; children, const String&amp; type, const String&amp; frameId)
-            : record(record), data(data), children(children), type(type), frameId(frameId)
</del><ins>+        TimelineRecordEntry(PassRefPtr&lt;InspectorObject&gt; record, PassRefPtr&lt;InspectorObject&gt; data, PassRefPtr&lt;InspectorArray&gt; children, const String&amp; type, const String&amp; frameId, size_t usedHeapSizeAtStart)
+            : record(record), data(data), children(children), type(type), frameId(frameId), usedHeapSizeAtStart(usedHeapSizeAtStart)
</ins><span class="cx">         {
</span><span class="cx">         }
</span><span class="cx">         RefPtr&lt;InspectorObject&gt; record;
</span><span class="lines">@@ -170,6 +170,7 @@
</span><span class="cx">         RefPtr&lt;InspectorArray&gt; children;
</span><span class="cx">         String type;
</span><span class="cx">         String frameId;
</span><ins>+        size_t usedHeapSizeAtStart;
</ins><span class="cx">     };
</span><span class="cx">         
</span><span class="cx">     InspectorTimelineAgent(InstrumentingAgents*, InspectorPageAgent*, InspectorState*, InspectorType, InspectorClient*);
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorfrontendTimelinePresentationModeljs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/front-end/TimelinePresentationModel.js (128056 => 128057)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/front-end/TimelinePresentationModel.js        2012-09-10 13:54:40 UTC (rev 128056)
+++ trunk/Source/WebCore/inspector/front-end/TimelinePresentationModel.js        2012-09-10 14:01:26 UTC (rev 128057)
</span><span class="lines">@@ -674,9 +674,9 @@
</span><span class="cx">     /**
</span><span class="cx">      * @return {number}
</span><span class="cx">      */
</span><del>-    get totalHeapSize()
</del><ins>+    get usedHeapSizeDelta()
</ins><span class="cx">     {
</span><del>-        return this._record.totalHeapSize;
</del><ins>+        return this._record.usedHeapSizeDelta || 0;
</ins><span class="cx">     },
</span><span class="cx"> 
</span><span class="cx">     /**
</span><span class="lines">@@ -805,8 +805,14 @@
</span><span class="cx">         if (this.scriptName &amp;&amp; this.type !== recordTypes.FunctionCall)
</span><span class="cx">             contentHelper._appendElementRow(WebInspector.UIString(&quot;Function Call&quot;), this._linkifyScriptLocation());
</span><span class="cx"> 
</span><del>-        if (this.usedHeapSize)
-            contentHelper._appendTextRow(WebInspector.UIString(&quot;Used Heap Size&quot;), WebInspector.UIString(&quot;%s of %s&quot;, Number.bytesToString(this.usedHeapSize), Number.bytesToString(this.totalHeapSize)));
</del><ins>+        if (this.usedHeapSize) {
+            if (this.usedHeapSizeDelta) {
+                var sign = this.usedHeapSizeDelta &gt; 0 ? &quot;+&quot; : &quot;-&quot;;
+                contentHelper._appendTextRow(WebInspector.UIString(&quot;Used Heap Size&quot;),
+                    WebInspector.UIString(&quot;%s (%s%s)&quot;, Number.bytesToString(this.usedHeapSize), sign, Number.bytesToString(this.usedHeapSizeDelta)));
+            } else if (this.category === WebInspector.TimelinePresentationModel.categories().scripting)
+                contentHelper._appendTextRow(WebInspector.UIString(&quot;Used Heap Size&quot;), Number.bytesToString(this.usedHeapSize));
+        }
</ins><span class="cx"> 
</span><span class="cx">         if (this.callSiteStackTrace)
</span><span class="cx">             contentHelper._appendStackTrace(callSiteStackTraceLabel || WebInspector.UIString(&quot;Call Site stack&quot;), this.callSiteStackTrace, this._linkifyCallFrame.bind(this));
</span></span></pre>
</div>
</div>

</body>
</html>