[cc-frame-viewer] Panoply of fixes

tools/cc-frame-viewer/src/lthi_view.js

 /* Copyright (c) 2012 The Chromium Authors. All rights reserved.
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 'use strict';
 
 base.require('ui');
 base.require('ui.list_view');
 base.require('quad_view_viewport');
 base.require('tree_quad_view');
@@ skipping 34 matching lines @@
       [1/32., 1/16., 1/8., 1/4, 1/2, 1].forEach(function(scale) {
         var mapOption = document.createElement('option');
         mapOption.textContent = Math.floor(scale * 100) + '%';
         mapOption.scale = scale;
         this.scaleSelector_.appendChild(mapOption);
       }.bind(this));
       this.scaleSelector_.selectedIndex = 3;
       optionsEl.appendChild(ui.createSpan('Scale:'));
       optionsEl.appendChild(this.scaleSelector_);
 
+      this.headerTextEl_ = document.createElement('span');
+      optionsEl.appendChild(ui.createSpan('Details:'));
+      optionsEl.appendChild(this.headerTextEl_);
+
+
       this.activeTreeQuadView_ = new TreeQuadView();
       this.pendingTreeQuadView_ = new TreeQuadView();
       this.inactiveTileView_ = new InactiveTileView();
 
       this.onSelectionChanged_ = this.onSelectionChanged_.bind(this);
       this.activeTreeQuadView_.addEventListener('selection-changed',
                                                 this.onSelectionChanged_);
       this.pendingTreeQuadView_.addEventListener('selection-changed',
                                                  this.onSelectionChanged_);
       this.inactiveTileView_.addEventListener('selection-changed',
@@ skipping 29 matching lines @@
 
     updateChildren_: function() {
       var lthi = this.lthi_;
       if (!lthi) {
         this.activeTreeQuadView_.tree = undefined;
         this.pendingTreeQuadView_.tree = undefined;
         this.viewport_ = undefined;
         return;
       }
 
-      var bbox = new base.BBox2();
-      bbox.addBBox2(lthi.pendingTree.tileBBox);
-      bbox.addBBox2(lthi.activeTree.tileBBox);
-
+      var bbox = lthi.history.allTilesBBox;
       if (!this.viewport_) {
         if (!bbox.isEmpty) {
           this.viewport_ = new ccfv.QuadViewViewport(
-            lthi.history.allTilesBBox);
+            bbox);
           this.viewport_.scale = this.scaleSelector_.selectedOptions[0].scale;
           this.activeTreeQuadView_.viewport = this.viewport_;
           this.pendingTreeQuadView_.viewport = this.viewport_;
         } else {
           return;
         }
       }
 
-      this.activeTreeQuadView_.viewport.setWorldBBox(bbox);
-      this.pendingTreeQuadView_.viewport.setWorldBBox(bbox);
-
       this.activeTreeQuadView_.which_tree = lthi.activeTree.which_tree;
       this.activeTreeQuadView_.tiles = lthi.activeTree.tiles;
       this.activeTreeQuadView_.headerText =
         'Active Tree: ' + lthi.activeTree.tiles.length + ' live tiles';
       this.activeTreeQuadView_.deviceViewportSizeForFrame =
         lthi.deviceViewportSize;
 
       this.pendingTreeQuadView_.which_tree = lthi.pendingTree.which_tree;
       this.pendingTreeQuadView_.tiles = lthi.pendingTree.tiles;
       this.pendingTreeQuadView_.headerText =
         'Pending Tree: ' + lthi.pendingTree.tiles.length + ' live tiles';
       this.pendingTreeQuadView_.deviceViewportSizeForFrame =
         lthi.deviceViewportSize;
 
+      this.headerTextEl_.textContent = lthi.inactiveTiles.length +
+        ' inactive tiles';
       this.inactiveTileView_.tiles = lthi.inactiveTiles;
     },
 
     onSelectionChanged_: function(e) {
       var e2 = new base.Event('selection-changed');
       e2.selection = e.selection;
       this.dispatchEvent(e2);
       return true;
     }
   };
@@ skipping 105 matching lines @@
       this.dispatchEvent(e);
     }
   }
 
   return {
     LTHIView: LTHIView,
     InactiveTileView: InactiveTileView,
   }
 });