Modified: trunk/Source/WebCore/ChangeLog (108503 => 108504)
--- trunk/Source/WebCore/ChangeLog 2012-02-22 15:42:03 UTC (rev 108503)
+++ trunk/Source/WebCore/ChangeLog 2012-02-22 16:08:25 UTC (rev 108504)
@@ -1,5 +1,23 @@
2012-02-22 Andrey Kosyakov <[email protected]>
+ Web Inspector: fix memory counters and start-at-zero modes of timeline panels to co-exist nicely
+ https://bugs.webkit.org/show_bug.cgi?id=79241
+
+ Reviewed by Yury Semikhatsky.
+
+ * inspector/front-end/MemoryStatistics.js:
+ (WebInspector.MemoryStatistics.prototype.addTimlineEvent):
+ * inspector/front-end/TimelineOverviewPane.js:
+ (WebInspector.TimelineOverviewPane):
+ (WebInspector.TimelineOverviewPane.prototype._showTimelines):
+ (WebInspector.TimelineOverviewPane.prototype._showMemoryGraph):
+ (WebInspector.TimelineOverviewPane.prototype.setStartAtZero):
+ (WebInspector.TimelineOverviewPane.prototype._onWindowChanged):
+ * inspector/front-end/TimelinePanel.js:
+ (WebInspector.TimelinePanel.prototype._timelinesOverviewModeChanged):
+
+2012-02-22 Andrey Kosyakov <[email protected]>
+
Web Inspector: [experimental] add a mode to display timeline events aligned by the start time
https://bugs.webkit.org/show_bug.cgi?id=79123
Modified: trunk/Source/WebCore/inspector/front-end/MemoryStatistics.js (108503 => 108504)
--- trunk/Source/WebCore/inspector/front-end/MemoryStatistics.js 2012-02-22 15:42:03 UTC (rev 108503)
+++ trunk/Source/WebCore/inspector/front-end/MemoryStatistics.js 2012-02-22 16:08:25 UTC (rev 108504)
@@ -125,9 +125,9 @@
var counters = event.data["counters"];
this._counters.push({
time: event.data.endTime,
- documentCount: counters.documents,
- nodeCount: counters.nodes,
- listenerCount: counters.jsEventListeners
+ documentCount: counters["documents"],
+ nodeCount: counters["nodes"],
+ listenerCount: counters["jsEventListeners"]
});
},
Modified: trunk/Source/WebCore/inspector/front-end/TimelineOverviewPane.js (108503 => 108504)
--- trunk/Source/WebCore/inspector/front-end/TimelineOverviewPane.js 2012-02-22 15:42:03 UTC (rev 108503)
+++ trunk/Source/WebCore/inspector/front-end/TimelineOverviewPane.js 2012-02-22 16:08:25 UTC (rev 108504)
@@ -53,14 +53,14 @@
this.element.appendChild(this._topPaneSidebarElement);
var topPaneSidebarTree = new TreeOutline(overviewTreeElement);
- var timelinesOverviewItem = new WebInspector.SidebarTreeElement("resources-time-graph-sidebar-item", WebInspector.UIString("Timelines"));
- topPaneSidebarTree.appendChild(timelinesOverviewItem);
- timelinesOverviewItem.revealAndSelect(false);
- timelinesOverviewItem._onselect_ = this._showTimelines.bind(this);
+ this._timelinesOverviewItem = new WebInspector.SidebarTreeElement("resources-time-graph-sidebar-item", WebInspector.UIString("Timelines"));
+ topPaneSidebarTree.appendChild(this._timelinesOverviewItem);
+ this._timelinesOverviewItem.revealAndSelect(false);
+ this._timelinesOverviewItem._onselect_ = this._showTimelines.bind(this);
- var memoryOverviewItem = new WebInspector.SidebarTreeElement("resources-size-graph-sidebar-item", WebInspector.UIString("Memory"));
- topPaneSidebarTree.appendChild(memoryOverviewItem);
- memoryOverviewItem._onselect_ = this._showMemoryGraph.bind(this);
+ this._memoryOverviewItem = new WebInspector.SidebarTreeElement("resources-size-graph-sidebar-item", WebInspector.UIString("Memory"));
+ topPaneSidebarTree.appendChild(this._memoryOverviewItem);
+ this._memoryOverviewItem._onselect_ = this._showMemoryGraph.bind(this);
this._overviewGrid = new WebInspector.TimelineGrid();
this._overviewGrid.element.id = "timeline-overview-grid";
@@ -101,7 +101,7 @@
WebInspector.TimelineOverviewPane.ResizerOffset = 3.5; // half pixel because offset values are not rounded but ceiled
WebInspector.TimelineOverviewPane.Mode = {
- Events: "Timeline",
+ Events: "Events",
Memory: "Memory"
};
@@ -112,6 +112,7 @@
WebInspector.TimelineOverviewPane.prototype = {
_showTimelines: function()
{
+ this._timelinesOverviewItem.revealAndSelect(false);
this._heapGraph.hide();
this._overviewGrid.itemsGraphsElement.removeStyleClass("hidden");
this.dispatchEventToListeners(WebInspector.TimelineOverviewPane.Events.ModeChanged, WebInspector.TimelineOverviewPane.Mode.Events);
@@ -119,17 +120,13 @@
_showMemoryGraph: function()
{
+ this._memoryOverviewItem.revealAndSelect(false);
this._heapGraph.show();
this._heapGraph.update(this._records);
this._overviewGrid.itemsGraphsElement.addStyleClass("hidden");
this.dispatchEventToListeners(WebInspector.TimelineOverviewPane.Events.ModeChanged, WebInspector.TimelineOverviewPane.Mode.Memory);
},
- _onWindowChanged: function()
- {
- this._presentationModel.setWindowPosition(this._overviewWindow.windowLeft, this._overviewWindow.windowRight);
- },
-
/**
* @param {boolean} enabled
*/
@@ -139,6 +136,8 @@
return;
this._startAtZero = enabled;
if (enabled) {
+ if (this._heapGraph.visible)
+ this._showTimelines();
this.element.addStyleClass("timeline-start-at-zero");
this._startAtZeroOverview = new WebInspector.TimelineStartAtZeroOverview(this._presentationModel);
this._startAtZeroOverview.show(this.element);
@@ -151,6 +150,11 @@
}
},
+ _onWindowChanged: function()
+ {
+ this._presentationModel.setWindowPosition(this._overviewWindow.windowLeft, this._overviewWindow.windowRight);
+ },
+
_onCategoryVisibilityChanged: function(event)
{
var category = event.data;
Modified: trunk/Source/WebCore/inspector/front-end/TimelinePanel.js (108503 => 108504)
--- trunk/Source/WebCore/inspector/front-end/TimelinePanel.js 2012-02-22 15:42:03 UTC (rev 108503)
+++ trunk/Source/WebCore/inspector/front-end/TimelinePanel.js 2012-02-22 16:08:25 UTC (rev 108504)
@@ -415,7 +415,10 @@
{
if (!this._memoryStatistics)
return;
- if (event.data ="" WebInspector.TimelineOverviewPane.Mode.Events && this._memoryStatistics.visible()) {
+ var shouldShowMemory = event.data ="" WebInspector.TimelineOverviewPane.Mode.Memory;
+ if (shouldShowMemory === this._memoryStatistics.visible())
+ return;
+ if (!shouldShowMemory) {
this._timelineMemorySplitter.addStyleClass("hidden");
this._memoryStatistics.hide();
this.splitView.element.style.height = "auto";
