DevTools: untangle paint profiler for better reuse

Source/devtools/front_end/layers/PaintProfilerView.js

 /*
  * Copyright (C) 2013 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 12 matching lines @@
  * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
  * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 /**
  * @constructor
- * @param {!WebInspector.LayerTreeModel} model
- * @param {!WebInspector.Layers3DView} layers3DView
- * @extends {WebInspector.SplitView}
+ * @param {function(string=)} showImageCallback
+ * @extends {WebInspector.HBox}
  */
-WebInspector.PaintProfilerView = function(model, layers3DView)
+WebInspector.PaintProfilerView = function(showImageCallback)
 {
-    WebInspector.SplitView.call(this, true, false);
+    WebInspector.View.call(this);
     this.element.classList.add("paint-profiler-view");
-    this._logTreeView = new WebInspector.PaintProfilerCommandLogView();
-    this._logTreeView.show(this.sidebarElement());
-    this.addEventListener(WebInspector.SplitView.Events.SidebarSizeChanged, this.onResize, this);
 
-    this._model = model;
-    this._layers3DView = layers3DView;
+    this._showImageCallback = showImageCallback;
 
-    this._canvas = this.mainElement().createChild("canvas", "fill");
+    this._canvas = this.element.createChild("canvas", "fill");
     this._context = this._canvas.getContext("2d");
-    this._selectionWindow = new WebInspector.OverviewGrid.Window(this.mainElement(), this.mainElement());
+    this._selectionWindow = new WebInspector.OverviewGrid.Window(this.element, this.element);
     this._selectionWindow.addEventListener(WebInspector.OverviewGrid.Events.WindowChanged, this._onWindowChanged, this);
 
     this._innerBarWidth = 4 * window.devicePixelRatio;
     this._minBarHeight = 4 * window.devicePixelRatio;
     this._barPaddingWidth = 2 * window.devicePixelRatio;
     this._outerBarWidth = this._innerBarWidth + this._barPaddingWidth;
 
     this._reset();
 }
 
+WebInspector.PaintProfilerView.Events = {
+    WindowChanged: "WindowChanged"
+};
+
 WebInspector.PaintProfilerView.prototype = {
     onResize: function()
     {
         this._update();
     },
 
+    /**
+     * @param {?WebInspector.PaintProfilerSnapshot} snapshot
+     */
+    setSnapshot: function(snapshot)
+    {
+        this._reset();
+        this._snapshot = snapshot;
+        if (!this._snapshot) {
+            this._update();
+            return;
+        }
+        snapshot.requestImage(null, null, this._showImageCallback);
+        snapshot.profile(onProfileDone.bind(this));
+        /**
+         * @param {!Array.<!LayerTreeAgent.PaintProfile>=} profiles
+         * @this {WebInspector.PaintProfilerView}
+         */
+        function onProfileDone(profiles)
+        {
+            this._profiles = profiles;
+            this._update();
+        }
+    },
+
     _update: function()
     {
-        this._canvas.width = this.mainElement().clientWidth * window.devicePixelRatio;
-        this._canvas.height = this.mainElement().clientHeight * window.devicePixelRatio;
+        this._canvas.width = this.element.clientWidth * window.devicePixelRatio;
+        this._canvas.height = this.element.clientHeight * window.devicePixelRatio;
         this._samplesPerBar = 0;
         if (!this._profiles || !this._profiles.length)
             return;
 
         var maxBars = Math.floor((this._canvas.width - 2 * this._barPaddingWidth) / this._outerBarWidth);
         var sampleCount = this._profiles[0].length;
         this._samplesPerBar = Math.ceil(sampleCount / maxBars);
         var barCount = Math.floor(sampleCount / this._samplesPerBar);
 
         var maxBarTime = 0;
@@ skipping 28 matching lines @@
         var x = this._barPaddingWidth + index * this._outerBarWidth;
         var y = this._canvas.height - height;
         this._context.fillRect(x, y, this._innerBarWidth, height);
     },
 
     _onWindowChanged: function()
     {
         if (this._updateImageTimer)
             return;
         this._updateImageTimer = setTimeout(this._updateImage.bind(this), 100);
+        this.dispatchEventToListeners(WebInspector.PaintProfilerView.Events.WindowChanged);
+    },
+
+    /**
+     * @return {{left: number, right: number}}
+     */
+    windowBoundaries: function()
+    {
+        var screenLeft = this._selectionWindow.windowLeft * this._canvas.width;
+        var screenRight = this._selectionWindow.windowRight * this._canvas.width;
+        var barLeft = Math.floor((screenLeft - this._barPaddingWidth) / this._outerBarWidth);
+        var barRight = Math.floor((screenRight - this._barPaddingWidth + this._innerBarWidth)/ this._outerBarWidth);
+        var stepLeft = Math.max(0, barLeft * this._samplesPerBar);
+        var stepRight = Math.min(barRight * this._samplesPerBar, this._profiles[0].length);
+
+        return {left: stepLeft, right: stepRight};
     },
 
     _updateImage: function()
     {
         delete this._updateImageTimer;
         if (!this._profiles || !this._profiles.length)
             return;
 
-        var screenLeft = this._selectionWindow.windowLeft * this._canvas.width;
-        var screenRight = this._selectionWindow.windowRight * this._canvas.width;
-
-        var barLeft = Math.floor((screenLeft - this._barPaddingWidth) / this._outerBarWidth);
-        var barRight = Math.floor((screenRight - this._barPaddingWidth + this._innerBarWidth)/ this._outerBarWidth);
-
-        var stepLeft = Math.max(0, barLeft * this._samplesPerBar);
-        var stepRight = Math.min(barRight * this._samplesPerBar, this._profiles[0].length);
-        this._snapshot.requestImage(stepLeft, stepRight, this._layers3DView.showImageForLayer.bind(this._layers3DView, this._layer));
-        this._logTreeView.updateLog(stepLeft, stepRight);
+        var window = this.windowBoundaries();
+        this._snapshot.requestImage(window.left, window.right, this._showImageCallback);
     },
 
     _reset: function()
     {
         this._snapshot = null;
         this._profiles = null;
         this._selectionWindow.reset();
     },
 
-    /**
-     * @param {!WebInspector.Layer} layer
-     */
-    profile: function(layer)
-    {
-        this._reset();
-        this._layer = layer;
-        this._layer.requestSnapshot(onSnapshotDone.bind(this));
-
-        /**
-         * @param {!WebInspector.PaintProfilerSnapshot=} snapshot
-         * @this {WebInspector.PaintProfilerView}
-         */
-        function onSnapshotDone(snapshot)
-        {
-            this._snapshot = snapshot;
-            if (!snapshot) {
-                this._profiles = null;
-                this._update();
-                return;
-            }
-            snapshot.requestImage(null, null, this._layers3DView.showImageForLayer.bind(this._layers3DView, this._layer));
-            var barrier = new CallbackBarrier();
-            snapshot.profile(barrier.createCallback(onProfileDone.bind(this)));
-            snapshot.commandLog(barrier.createCallback(onCommandLogDone.bind(this)));
-            barrier.callWhenDone(this._update.bind(this));
-        }
-
-        /**
-         * @param {!Array.<!LayerTreeAgent.PaintProfile>=} profiles
-         * @this {WebInspector.PaintProfilerView}
-         */
-        function onProfileDone(profiles)
-        {
-            this._profiles = profiles;
-        }
-
-        /**
-         * @param {!Array.<!Object>=} log
-         * @this {WebInspector.PaintProfilerView}
-         */
-        function onCommandLogDone(log)
-        {
-            this._logTreeView.setLog(log);
-            this._logTreeView.updateLog();
-        }
-    },
-
-    __proto__: WebInspector.SplitView.prototype
+    __proto__: WebInspector.HBox.prototype
 };
 
 /**
  * @constructor
  * @extends {WebInspector.VBox}
  */
 WebInspector.PaintProfilerCommandLogView = function()
 {
     WebInspector.VBox.call(this);
     this.setMinimumSize(100, 25);
     this.element.classList.add("outline-disclosure");
     var sidebarTreeElement = this.element.createChild("ol", "sidebar-tree");
     this.sidebarTree = new TreeOutline(sidebarTreeElement);
     this._popoverHelper = new WebInspector.ObjectPopoverHelper(this.element, this._getHoverAnchor.bind(this), this._resolveObjectForPopover.bind(this), undefined, true);
-
-    this._log = [];
+    this._reset();
 }
 
 WebInspector.PaintProfilerCommandLogView.prototype = {
-    setLog: function(log)
+    /**
+     * @param {?WebInspector.PaintProfilerSnapshot} snapshot
+     */
+    setSnapshot: function(snapshot)
     {
-        this._log = log;
+        this._reset();
+        if (!snapshot) {
+            this.updateWindow();
+            return;
+        }
+        snapshot.commandLog(onCommandLogDone.bind(this));
+
+        /**
+         * @param {!Array.<!Object>=} log
+         * @this {WebInspector.PaintProfilerCommandLogView}
+         */
+        function onCommandLogDone(log)
+        {
+            this._log = log;
+            this.updateWindow();
+        }
     },
 
     /**
      * @param {number=} stepLeft
      * @param {number=} stepRight
      */
-    updateLog: function(stepLeft, stepRight)
+    updateWindow: function(stepLeft, stepRight)
     {
         var log = this._log;
         stepLeft = stepLeft || 0;
         stepRight = stepRight || log.length - 1;
         this.sidebarTree.removeChildren();
         for (var i = stepLeft; i <= stepRight; ++i) {
             var node = new WebInspector.LogTreeElement(log[i]);
             this.sidebarTree.appendChild(node);
         }
     },
 
+    _reset: function()
+    {
+        this._log = [];
+    },
+
     /**
      * @param {!Element} target
      * @return {!Element}
      */
     _getHoverAnchor: function(target)
     {
         return /** @type {!Element} */ (target.enclosingNodeOrSelfWithNodeName("span"));
     },
 
     /**
@@ skipping 77 matching lines @@
     /**
      * @param {boolean} hovered
      */
     setHovered: function(hovered)
     {
         this.listItemElement.classList.toggle("hovered", hovered);
     },
 
     __proto__: TreeElement.prototype
 };