Revert 70618 - First pass at adding http/backend cache events to the NetLog. ...

chrome/browser/resources/net_internals/logviewpainter.js

 // Copyright (c) 2010 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.
 
 /**
  * TODO(eroman): This needs better presentation, and cleaner code. This
  *               implementation is more of a transitionary step as
  *               the old net-internals is replaced.
  */
 
@@ skipping 31 matching lines @@
   var startDate = g_browser.convertTimeTicksToDate(logEntries[0].time);
   addTextNode(nobr2, 'Start Time: ' + startDate.toLocaleString());
 
   var pre = addNode(div, 'pre');
   addTextNode(pre, PrintSourceEntriesAsText(logEntries, false));
 }
 
 function canCollapseBeginWithEnd(beginEntry) {
   return beginEntry &&
          beginEntry.isBegin() &&
+         !beginEntry.orig.params &&
          beginEntry.end &&
          beginEntry.end.index == beginEntry.index + 1 &&
-         (!beginEntry.orig.params || !beginEntry.end.orig.params) &&
+         !beginEntry.end.orig.params &&
          beginEntry.orig.wasPassivelyCaptured ==
              beginEntry.end.orig.wasPassivelyCaptured;
 }
 
 PrintSourceEntriesAsText = function(sourceEntries, doSecurityStripping) {
   var entries = LogGroupEntry.createArrayFrom(sourceEntries);
   if (entries.length == 0)
     return '';
 
   var startDate = g_browser.convertTimeTicksToDate(entries[0].orig.time);
   var startTime = startDate.getTime();
 
   var tablePrinter = new TablePrinter();
 
   for (var i = 0; i < entries.length; ++i) {
     var entry = entries[i];
 
-    // Avoid printing the END for a BEGIN that was immediately before, unless
-    // both have extra parameters.
-    if (!entry.isEnd() || !canCollapseBeginWithEnd(entry.begin)) {
-      tablePrinter.addRow();
+    // Avoid printing the END for a BEGIN that was immediately before.
+    if (entry.isEnd() && canCollapseBeginWithEnd(entry.begin))
+      continue;
 
-      // Annotate this entry with "(P)" if it was passively captured.
-      tablePrinter.addCell(entry.orig.wasPassivelyCaptured ? '(P) ' : '');
+    tablePrinter.addRow();
 
-      tablePrinter.addCell('t=');
-      var date = g_browser.convertTimeTicksToDate(entry.orig.time) ;
-      var tCell = tablePrinter.addCell(date.getTime());
-      tCell.alignRight = true;
-      tablePrinter.addCell(' [st=');
-      var stCell = tablePrinter.addCell(date.getTime() - startTime);
-      stCell.alignRight = true;
-      tablePrinter.addCell('] ');
+    // Annotate this entry with "(P)" if it was passively captured.
+    tablePrinter.addCell(entry.orig.wasPassivelyCaptured ? '(P) ' : '');
 
-      var indentationStr = makeRepeatedString(' ', entry.getDepth() * 3);
-      var mainCell =
-          tablePrinter.addCell(indentationStr + getTextForEvent(entry));
-      tablePrinter.addCell('  ');
+    tablePrinter.addCell('t=');
+    var date = g_browser.convertTimeTicksToDate(entry.orig.time) ;
+    var tCell = tablePrinter.addCell(date.getTime());
+    tCell.alignRight = true;
+    tablePrinter.addCell(' [st=');
+    var stCell = tablePrinter.addCell(date.getTime() - startTime);
+    stCell.alignRight = true;
+    tablePrinter.addCell('] ');
 
-      // Get the elapsed time.
-      if (entry.isBegin()) {
-        tablePrinter.addCell('[dt=');
-        var dt = '?';
-        // Definite time.
-        if (entry.end) {
-          dt = entry.end.orig.time - entry.orig.time;
-        }
-        var dtCell = tablePrinter.addCell(dt);
-        dtCell.alignRight = true;
+    var indentationStr = makeRepeatedString(' ', entry.getDepth() * 3);
+    var mainCell =
+        tablePrinter.addCell(indentationStr + getTextForEvent(entry));
+    tablePrinter.addCell('  ');
 
-        tablePrinter.addCell(']');
-      } else {
-        mainCell.allowOverflow = true;
+    // Get the elapsed time.
+    if (entry.isBegin()) {
+      tablePrinter.addCell('[dt=');
+      var dt = '?';
+      // Definite time.
+      if (entry.end) {
+        dt = entry.end.orig.time - entry.orig.time;
       }
+      var dtCell = tablePrinter.addCell(dt);
+      dtCell.alignRight = true;
+
+      tablePrinter.addCell(']');
+    } else {
+      mainCell.allowOverflow = true;
     }
 
     // Output the extra parameters.
     if (entry.orig.params != undefined) {
       // Add a continuation row for each line of text from the extra parameters.
       var extraParamsText = getTextForExtraParams(entry.orig,
                                                   doSecurityStripping);
       var extraParamsTextLines = extraParamsText.split('\n');
 
       for (var j = 0; j < extraParamsTextLines.length; ++j) {
@@ skipping 303 matching lines @@
   var result = [];
   for (var i = 0; i < modes.length; ++i)
     result.push(indentLines('(' + (i + 1) + ') ', modes[i]));
 
   return result.join('\n');
 };
 
 // End of anonymous namespace.
 })();