Changeset 147109 in webkit

Timestamp:

Mar 28, 2013 6:46:13 AM (11 years ago)

Author:

caseq@chromium.org

Message:

Web Inspector: name timeline overview controls consistently
​https://bugs.webkit.org/show_bug.cgi?id=113503

Reviewed by Yury Semikhatsky.

Refactoring, covered by existing tests.

• rename HeapGraph to TimelineMemoryOverview;
• rename TimelineCategoryStrips to TimelineEventOvrview.

• inspector/front-end/TimelineOverviewPane.js:

(WebInspector.TimelineOverviewPane):
(WebInspector.TimelineOverviewPane.prototype.setMode):
(WebInspector.TimelineOverviewPane.prototype._setFrameMode):
(WebInspector.TimelineOverviewPane.prototype._onCategoryVisibilityChanged):
(WebInspector.TimelineOverviewPane.prototype._update):
(WebInspector.TimelineOverviewPane.prototype.setMinimumRecordDuration):
(WebInspector.TimelineMemoryOverview):
(WebInspector.TimelineEventOverview):
(WebInspector.TimelineEventOverview.prototype._renderBar):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• inspector/front-end/TimelineOverviewPane.js (modified) (15 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-03-28  Andrey Kosyakov  <caseq@chromium.org>
+
+        Web Inspector: name timeline overview controls consistently
+        https://bugs.webkit.org/show_bug.cgi?id=113503
+
+        Reviewed by Yury Semikhatsky.
+
+        Refactoring, covered by existing tests.
+
+        - rename HeapGraph to TimelineMemoryOverview;
+        - rename TimelineCategoryStrips to TimelineEventOvrview.
+
+        * inspector/front-end/TimelineOverviewPane.js:
+        (WebInspector.TimelineOverviewPane):
+        (WebInspector.TimelineOverviewPane.prototype.setMode):
+        (WebInspector.TimelineOverviewPane.prototype._setFrameMode):
+        (WebInspector.TimelineOverviewPane.prototype._onCategoryVisibilityChanged):
+        (WebInspector.TimelineOverviewPane.prototype._update):
+        (WebInspector.TimelineOverviewPane.prototype.setMinimumRecordDuration):
+        (WebInspector.TimelineMemoryOverview):
+        (WebInspector.TimelineEventOverview):
+        (WebInspector.TimelineEventOverview.prototype._renderBar):
+
 2013-03-28  Eli Fidler  <efidler@blackberry.com>
 

trunk/Source/WebCore/inspector/front-end/TimelineOverviewPane.js

@@ -78 +78 @@
     this.element.appendChild(this._overviewGrid.element);
 
-    this._heapGraph = new WebInspector.HeapGraph(this._model);
-    this._heapGraph.element.id = "timeline-overview-memory";
-    this._overviewGrid.insertBeforeItemsGraphsElement(this._heapGraph.element);
+    this._memoryOverview = new WebInspector.TimelineMemoryOverview(this._model);
+    this._memoryOverview.element.id = "timeline-overview-memory";
+    this._overviewGrid.insertBeforeItemsGraphsElement(this._memoryOverview.element);
 
     var separatorElement = document.createElement("div");
@@ -86 +86 @@
     this.element.appendChild(separatorElement);
 
-    this._categoryStrips = new WebInspector.TimelineCategoryStrips(this._model);
-    this._overviewGrid.itemsGraphsElement().appendChild(this._categoryStrips.element);
+    this._eventOverview = new WebInspector.TimelineEventOverview(this._model);
+    this._overviewGrid.itemsGraphsElement().appendChild(this._eventOverview.element);
  
     var categories = WebInspector.TimelinePresentationModel.categories();
@@ -132 +132 @@
             case WebInspector.TimelineOverviewPane.Mode.Events:
             case WebInspector.TimelineOverviewPane.Mode.Frames:
-                this._heapGraph.hide();
+                this._memoryOverview.hide();
                 this._overviewGrid.showItemsGraphsElement();
                 break;
             case WebInspector.TimelineOverviewPane.Mode.Memory:
                 this._overviewGrid.hideItemsGraphsElement();
-                this._heapGraph.show();
+                this._memoryOverview.show();
         }
         this._overviewItems[this._currentMode].revealAndSelect(false);
@@ -155 +155 @@
             this._frameOverview = null;
             this._overviewGrid.showItemsGraphsElement();
-            this._categoryStrips.update();
+            this._eventOverview.update();
         }
     },
@@ -162 +162 @@
     {
         if (this._currentMode === WebInspector.TimelineOverviewPane.Mode.Events)
-            this._categoryStrips.update();
+            this._eventOverview.update();
     },
 
@@ -173 +173 @@
         this._overviewCalculator.setDisplayWindow(0, this._overviewGrid.clientWidth());
 
-        if (this._heapGraph.visible)
-            this._heapGraph.update();
+        if (this._memoryOverview.visible)
+            this._memoryOverview.update();
         else if (this._frameOverview)
             this._frameOverview.update();
         else
-            this._categoryStrips.update();
+            this._eventOverview.update();
 
         this._overviewGrid.updateDividers(this._overviewCalculator);
@@ -323 +323 @@
     setMinimumRecordDuration: function(value)
     {
-        this._categoryStrips.setMinimumRecordDuration(value);
+        this._eventOverview.setMinimumRecordDuration(value);
     },
 
@@ -417 +417 @@
  * @param {WebInspector.TimelineModel} model
  */
-WebInspector.HeapGraph = function(model)
+WebInspector.TimelineMemoryOverview = function(model)
 {
     this._canvas = document.createElement("canvas");
@@ -436 +436 @@
 }
 
-WebInspector.HeapGraph.prototype = {
+WebInspector.TimelineMemoryOverview.prototype = {
     /**
      * @return {Node}
@@ -546 +546 @@
  * @param {WebInspector.TimelineModel} model
  */
-WebInspector.TimelineCategoryStrips = function(model)
+WebInspector.TimelineEventOverview = function(model)
 {
     this._model = model;
@@ -556 +556 @@
     var categories = WebInspector.TimelinePresentationModel.categories();
     for (var category in categories)
-        this._fillStyles[category] = WebInspector.TimelinePresentationModel.createFillStyleForCategory(this._context, 0, WebInspector.TimelineCategoryStrips._innerStripHeight, categories[category]);
-
-    this._disabledCategoryFillStyle = WebInspector.TimelinePresentationModel.createFillStyle(this._context, 0, WebInspector.TimelineCategoryStrips._innerStripHeight,
+        this._fillStyles[category] = WebInspector.TimelinePresentationModel.createFillStyleForCategory(this._context, 0, WebInspector.TimelineEventOverview._innerStripHeight, categories[category]);
+
+    this._disabledCategoryFillStyle = WebInspector.TimelinePresentationModel.createFillStyle(this._context, 0, WebInspector.TimelineEventOverview._innerStripHeight,
         "rgb(218, 218, 218)", "rgb(170, 170, 170)", "rgb(143, 143, 143)");
 
@@ -565 +565 @@
 
 /** @const */
-WebInspector.TimelineCategoryStrips._canvasHeight = 60;
+WebInspector.TimelineEventOverview._canvasHeight = 60;
 /** @const */
-WebInspector.TimelineCategoryStrips._numberOfStrips = 3;
+WebInspector.TimelineEventOverview._numberOfStrips = 3;
 /** @const */
-WebInspector.TimelineCategoryStrips._stripHeight = Math.round(WebInspector.TimelineCategoryStrips._canvasHeight  / WebInspector.TimelineCategoryStrips._numberOfStrips);
+WebInspector.TimelineEventOverview._stripHeight = Math.round(WebInspector.TimelineEventOverview._canvasHeight  / WebInspector.TimelineEventOverview._numberOfStrips);
 /** @const */
-WebInspector.TimelineCategoryStrips._stripPadding = 4;
+WebInspector.TimelineEventOverview._stripPadding = 4;
 /** @const */
-WebInspector.TimelineCategoryStrips._innerStripHeight = WebInspector.TimelineCategoryStrips._stripHeight - 2 * WebInspector.TimelineCategoryStrips._stripPadding;
-
-WebInspector.TimelineCategoryStrips.prototype = {
+WebInspector.TimelineEventOverview._innerStripHeight = WebInspector.TimelineEventOverview._stripHeight - 2 * WebInspector.TimelineEventOverview._stripPadding;
+
+WebInspector.TimelineEventOverview.prototype = {
     update: function()
     {
         // Use real world, 1:1 coordinates in canvas. This will also take care of clearing it.
         this.element.width = this.element.parentElement.clientWidth;
-        this.element.height = WebInspector.TimelineCategoryStrips._canvasHeight;
+        this.element.height = WebInspector.TimelineEventOverview._canvasHeight;
 
         var timeOffset = this._model.minimumRecordTime();
@@ -589 +589 @@
 
         this._context.fillStyle = "rgba(0, 0, 0, 0.05)";
-        for (var i = 1; i < WebInspector.TimelineCategoryStrips._numberOfStrips; i += 2)
-            this._context.fillRect(0.5, i * WebInspector.TimelineCategoryStrips._stripHeight + 0.5, this.element.width, WebInspector.TimelineCategoryStrips._stripHeight);
+        for (var i = 1; i < WebInspector.TimelineEventOverview._numberOfStrips; i += 2)
+            this._context.fillRect(0.5, i * WebInspector.TimelineEventOverview._stripHeight + 0.5, this.element.width, WebInspector.TimelineEventOverview._stripHeight);
 
         function appendRecord(record)
@@ -634 +634 @@
     {
         var x = begin + 0.5;
-        var y = category.overviewStripGroupIndex * WebInspector.TimelineCategoryStrips._stripHeight + WebInspector.TimelineCategoryStrips._stripPadding + 0.5;
+        var y = category.overviewStripGroupIndex * WebInspector.TimelineEventOverview._stripHeight + WebInspector.TimelineEventOverview._stripPadding + 0.5;
         var width = Math.max(end - begin, 1);
 
@@ -640 +640 @@
         this._context.translate(x, y);
         this._context.fillStyle = category.hidden ? this._disabledCategoryFillStyle : this._fillStyles[category.name];
-        this._context.fillRect(0, 0, width, WebInspector.TimelineCategoryStrips._innerStripHeight);
+        this._context.fillRect(0, 0, width, WebInspector.TimelineEventOverview._innerStripHeight);
         this._context.strokeStyle = category.hidden ? this._disabledCategoryBorderStyle : category.borderColor;
-        this._context.strokeRect(0, 0, width, WebInspector.TimelineCategoryStrips._innerStripHeight);
+        this._context.strokeRect(0, 0, width, WebInspector.TimelineEventOverview._innerStripHeight);
         this._context.restore();
     }