Add charts to the resource data section of chrome://media-internals.

chrome/browser/resources/media_internals/cache_entry.js

Index: chrome/browser/resources/media_internals/cache_entry.js
diff --git a/chrome/browser/resources/media_internals/cache_entry.js b/chrome/browser/resources/media_internals/cache_entry.js
index 1136a3f71691a6ac3e48101c9e3c9587e4c04cb5..19df5e123d5a615a4da216d635dd62d9e0b19112 100644
--- a/chrome/browser/resources/media_internals/cache_entry.js
+++ b/chrome/browser/resources/media_internals/cache_entry.js
@@ -5,6 +5,12 @@
 cr.define('media', function() {
 
   /**
+   * The width and height of a CacheEntry canvas in pixels.
+   */
+  var CANVAS_WIDTH = 500;
+  var CANVAS_HEIGHT = 31;
+
+  /**
    * This class represents a file cached by net.
    */
   function CacheEntry() {
@@ -16,6 +22,46 @@ cr.define('media', function() {
     this.sparse = false;
     this.key = null;
     this.size = null;
+
+    // The <details> element representing this CacheEntry.
+    this.details_ = document.createElement('details');
+    this.details_.className = 'cache-entry';
+    this.details_.open = false;
+
+    // The <details> summary line. It contains a chart of requested file ranges
+    // and the url if we know it.
+    var summary = document.createElement('summary');
+
+    this.summary_text_ = document.createTextNode('');
+    summary.appendChild(this.summary_text_);
+
+    summary.appendChild(document.createTextNode(' '));
+
+    // Controls to modify this CacheEntry.
+    var controls = document.createElement('span');
+    controls.className = 'cache-entry-controls';
+    summary.appendChild(controls);
+    summary.appendChild(document.createElement('br'));
+
+    // A link to clear recorded data from this CacheEntry.
+    var clear_control = document.createElement('a');
+    clear_control.href = 'javascript:void(0)';
+    clear_control.onclick = this.clear.bind(this);
+    clear_control.textContent = '(clear entry)';
+    controls.appendChild(clear_control);
+
+    // The canvas upon which to draw the cached sections of a file.
+    this.canvas_ = document.createElement('canvas');
+    this.canvas_.width = CANVAS_WIDTH;
+    this.canvas_.height = CANVAS_HEIGHT;
+    summary.appendChild(this.canvas_);
+
+    this.details_.appendChild(summary);
+
+    // A tabular representation of the data in the above canvas.
+    this.detail_table_ = document.createElement('table');

[Evan Stade, 2011/07/26 01:16:26]

camelCase_

[Scott Franklin, 2011/07/26 20:26:34]

Oops, reverted to C++. Done.

+    this.detail_table_.className = 'cache-table';
+    this.details_.appendChild(this.detail_table_);
   };
 
   CacheEntry.prototype = {
@@ -59,28 +105,130 @@ cr.define('media', function() {
     },
 
     /**
+     * Clear all recorded ranges from this CacheEntry and redraw this.details_.
+     */
+    clear: function() {
+      this.read_ = new media.DisjointRangeSet;
+      this.written_ = new media.DisjointRangeSet;
+      this.available_ = new media.DisjointRangeSet;
+      this.generateDetails();
+    },
+
+    /**
+     * Redraw this.canvas_.
+     * It should consist of two horizontal bars with highlighted sections to
+     * represent which parts of a file have been read from (top) and written to
+     * (bottom) the cache.
+     * e.g. |xxxxxx----------x|
+     *      |-----xxxxx-------|
+     */
+    generateCanvas: function() {
+      var context = this.canvas_.getContext('2d');
+      context.textAlign = 'center';
+      context.textBaseline = 'middle';
+
+      context.fillStyle = '#aaa';
+      context.fillRect(0, 0, CANVAS_WIDTH, CANVAS_HEIGHT);
+
+      if (this.size) {
+        var file_size = this.size;
+        drawRange = function(start, end, top) {
+          var left = start / file_size * CANVAS_WIDTH;
+          var right = end / file_size * CANVAS_WIDTH;
+          context.fillRect(left, top, right - left, top + CANVAS_HEIGHT / 2);
+        };
+
+        context.fillStyle = '#0a0';
+        this.read_.map(function(start, end) {
+          drawRange(start, end, 0);
+        });
+
+        context.fillStyle = '#00a';
+        this.written_.map(function(start, end) {
+          drawRange(start, end, CANVAS_HEIGHT / 2);
+        });
+
+        // Overlay a description of each bar.
+        context.fillStyle = '#fff';
+        context.fillText('Read from cache.', CANVAS_WIDTH / 2,
+                         CANVAS_HEIGHT / 4 - 0.5);
+        context.fillText('Written to cache.', CANVAS_WIDTH / 2,
+                         CANVAS_HEIGHT * 3 / 4 + 0.5);
+
+        // Add a 1px separator line.
+        context.moveTo(0, CANVAS_HEIGHT / 2);
+        context.lineTo(CANVAS_WIDTH, CANVAS_HEIGHT / 2);
+        context.strokeStyle = '#fff';
+        context.stroke();
+      } else {
+        // We can't draw bars if we don't know how big the file is.
+        context.fillStyle = '#fff';
+        context.fillText('Unknown file size. See details below.',
+                         CANVAS_WIDTH / 2, CANVAS_HEIGHT / 2);
+      }
+    },
+
+    /**
+     * Update this.details_ to contain everything we currently know about
+     * this file.
+     */
+    generateDetails: function() {
+      function makeElement(type, content) {
+        var element = document.createElement(type);
+        element.textContent = content || '';

[Evan Stade, 2011/07/26 01:16:26]

I don't think the || part is necessary here?

[Scott Franklin, 2011/07/26 20:26:34]

It's not. It was there in case the second argument wasn't provided (which sets
the textContent to 'null'), but I used createElement for those that needed no
default text (and js probably has a default argument syntax I should've used
instead).
Removed.

+        return element;
+      };
+
+      this.details_.id = this.key;
+      this.summary_text_.textContent = this.key || 'Unknown File';
+
+      this.detail_table_.textContent = '';
+      var header = document.createElement('thead');
+      var footer = document.createElement('tfoot');
+      var body = document.createElement('tbody');
+      this.detail_table_.appendChild(header);
+      this.detail_table_.appendChild(footer);
+      this.detail_table_.appendChild(body);
+
+      var header_row = document.createElement('tr');
+      header_row.appendChild(makeElement('th', 'Read From Cache'));
+      header_row.appendChild(makeElement('th', 'Written To Cache'));
+      header.appendChild(header_row);
+
+      var footer_row = document.createElement('tr');
+      var footer_cell = document.createElement('td');
+      footer_cell.textContent = 'Out of ' + (this.size || 'unkown size');
+      footer_cell.setAttribute('colspan', 2);
+      footer_row.appendChild(footer_cell);
+      footer.appendChild(footer_row);
+
+      var read = this.read_.map(function(start, end) {
+        return start + ' - ' + end;
+      });
+      var written = this.written_.map(function(start, end) {
+        return start + ' - ' + end;
+      });
+
+      var length = Math.max(read.length, written.length);
+      for (var i = 0; i < length; i++) {
+        var row = document.createElement('tr');
+        row.appendChild(makeElement('td', read[i] || ''));
+        row.appendChild(makeElement('td', written[i] || ''));
+        body.appendChild(row);
+      }
+
+      this.generateCanvas();
+    },
+
+    /**
      * Render this CacheEntry as a <li>.
      * @return {HTMLElement} A <li> representing this CacheEntry.
      */
     toListItem: function() {
+      this.generateDetails();
+
       var result = document.createElement('li');
-      result.id = this.key;
-      result.className = 'cache-entry';
-      result.innerHTML = this.key + '<br />Read: ';
-      result.innerHTML += this.read_.map(function(start, end) {
-        return start + '-' + end;
-      }).join(', ');
-
-      result.innerHTML += '. Written: ';
-      result.innerHTML += this.written_.map(function(start, end) {
-        return start + '-' + end;
-      }).join(', ');
-
-      // Include the total size if we know it.
-      if (this.size) {
-        result.innerHTML += '. Out of ';
-        result.innerHTML += this.size;
-      }
+      result.appendChild(this.details_);
       return result;
     }
   };