Merge 76483 - 2011-01-23 Andrey Kosyakov <caseq@chromium.org>...

Source/WebCore/inspector/front-end/NetworkPanel.js

 /*
  * Copyright (C) 2007, 2008 Apple Inc.  All rights reserved.
  * Copyright (C) 2008, 2009 Anthony Ricaud <rik@webkit.org>
  * Copyright (C) 2011 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:
  *
  * 1.  Redistributions of source code must retain the above copyright
@@ skipping 100 matching lines @@
         WebInspector.Panel.prototype.resize.call(this);
         this._dataGrid.updateWidths();
         this._positionSummaryBar();
     },
 
     updateSidebarWidth: function(width)
     {
         if (!this._viewingResourceMode)
             return;
         WebInspector.Panel.prototype.updateSidebarWidth.call(this, width);
-        if (this._summaryBarElement.parentElement === this.element)
-            this._summaryBarElement.style.width = width + "px";
     },
 
     updateMainViewWidth: function(width)
     {
         this._viewsContainerElement.style.left = width + "px";
     },
 
     handleShortcut: function(event)
     {
         if (this._viewingResourceMode && event.keyCode === WebInspector.KeyboardShortcut.Keys.Esc.code) {
             this._toggleGridMode();
             event.handled = true;
         }
     },
 
     _positionSummaryBar: function()
     {
         // Position the total bar.
 
         var fillerRow = this._dataGrid.dataTableBody.lastChild;
         if (this._summaryBarElement.parentElement !== this.element && fillerRow.offsetHeight > 0) {
             // Glue status to bottom.
             if (this._summaryBarRowNode) {
                 this._dataGrid.removeChild(this._summaryBarRowNode);
                 delete this._summaryBarRowNode;
             }
             this._summaryBarElement.addStyleClass("network-summary-bar-bottom");
-            this._summaryBarElement.style.setProperty("width", this.sidebarElement.offsetWidth + "px");
             this.element.appendChild(this._summaryBarElement);
             this._dataGrid.element.style.bottom = "20px";
             return;
         }
 
         if (!this._summaryBarRowNode && !fillerRow.offsetHeight) {
             // Glue status to table.
             this._summaryBarRowNode = new WebInspector.NetworkTotalGridNode(this._summaryBarElement);
             this._summaryBarElement.removeStyleClass("network-summary-bar-bottom");
-            this._summaryBarElement.style.removeProperty("width");
             this._dataGrid.appendChild(this._summaryBarRowNode);
             this._dataGrid.element.style.bottom = 0;
             this._sortItems();
         }
     },
 
     _resetSummaryBar: function()
     {
         delete this._summaryBarRowNode;
         this._summaryBarElement.parentElement.removeChild(this._summaryBarElement);
@@ skipping 755 matching lines @@
 
     _toggleGridMode: function()
     {
         if (this._viewingResourceMode) {
             this._viewingResourceMode = false;
             this.element.removeStyleClass("viewing-resource");
             this._dataGrid.element.removeStyleClass("viewing-resource-mode");
             this._viewsContainerElement.addStyleClass("hidden");
             this.sidebarElement.style.right = 0;
             this.sidebarElement.style.removeProperty("width");
-            this._summaryBarElement.style.removeProperty("width");
             if (this._dataGrid.selectedNode)
                 this._dataGrid.selectedNode.selected = false;
         }
 
         if (this._briefGrid) {
             this._dataGrid.element.removeStyleClass("full-grid-mode");
             this._dataGrid.element.addStyleClass("brief-grid-mode");
 
             this._dataGrid.hideColumn("method");
             this._dataGrid.hideColumn("status");
@@ skipping 725 matching lines @@
     {
         var td = document.createElement("td");
         td.setAttribute("colspan", 7);
         td.className = "network-summary";
         td.appendChild(this._summaryBarElement);
         this._element.appendChild(td);
     }
 }
 
 WebInspector.NetworkTotalGridNode.prototype.__proto__ = WebInspector.DataGridNode.prototype;