Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(368)

Side by Side Diff: Source/WebCore/inspector/front-end/NetworkPanel.js

Issue 10031030: Merge 113585 - Web Inspector: [network panel] type column shows "undefined" instead of "(Pending)" … (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/1084/
Patch Set: Created 8 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2007, 2008 Apple Inc. All rights reserved. 2 * Copyright (C) 2007, 2008 Apple Inc. All rights reserved.
3 * Copyright (C) 2008, 2009 Anthony Ricaud <rik@webkit.org> 3 * Copyright (C) 2008, 2009 Anthony Ricaud <rik@webkit.org>
4 * Copyright (C) 2011 Google Inc. All rights reserved. 4 * Copyright (C) 2011 Google Inc. All rights reserved.
5 * 5 *
6 * Redistribution and use in source and binary forms, with or without 6 * Redistribution and use in source and binary forms, with or without
7 * modification, are permitted provided that the following conditions 7 * modification, are permitted provided that the following conditions
8 * are met: 8 * are met:
9 * 9 *
10 * 1. Redistributions of source code must retain the above copyright 10 * 1. Redistributions of source code must retain the above copyright
(...skipping 1863 matching lines...) Expand 10 before | Expand all | Expand 10 after
1874 this._statusCell.setTextAndTitle(WebInspector.UIString("(pending )")); 1874 this._statusCell.setTextAndTitle(WebInspector.UIString("(pending )"));
1875 this._statusCell.addStyleClass("network-dim-cell"); 1875 this._statusCell.addStyleClass("network-dim-cell");
1876 } 1876 }
1877 }, 1877 },
1878 1878
1879 _refreshTypeCell: function() 1879 _refreshTypeCell: function()
1880 { 1880 {
1881 if (this._resource.mimeType) { 1881 if (this._resource.mimeType) {
1882 this._typeCell.removeStyleClass("network-dim-cell"); 1882 this._typeCell.removeStyleClass("network-dim-cell");
1883 this._typeCell.setTextAndTitle(this._resource.mimeType); 1883 this._typeCell.setTextAndTitle(this._resource.mimeType);
1884 } else if (this._resource.isPingRequest) { 1884 } else if (this._resource.isPingRequest()) {
1885 this._typeCell.removeStyleClass("network-dim-cell"); 1885 this._typeCell.removeStyleClass("network-dim-cell");
1886 this._typeCell.setTextAndTitle(this._resource.requestContentType()); 1886 this._typeCell.setTextAndTitle(this._resource.requestContentType());
1887 } else { 1887 } else {
1888 this._typeCell.addStyleClass("network-dim-cell"); 1888 this._typeCell.addStyleClass("network-dim-cell");
1889 this._typeCell.setTextAndTitle(WebInspector.UIString("Pending")); 1889 this._typeCell.setTextAndTitle(WebInspector.UIString("Pending"));
1890 } 1890 }
1891 }, 1891 },
1892 1892
1893 _refreshInitiatorCell: function() 1893 _refreshInitiatorCell: function()
1894 { 1894 {
(...skipping 205 matching lines...) Expand 10 before | Expand all | Expand 10 after
2100 var aValue = a._resource[propertyName]; 2100 var aValue = a._resource[propertyName];
2101 var bValue = b._resource[propertyName]; 2101 var bValue = b._resource[propertyName];
2102 if (aValue > bValue) 2102 if (aValue > bValue)
2103 return revert ? -1 : 1; 2103 return revert ? -1 : 1;
2104 if (bValue > aValue) 2104 if (bValue > aValue)
2105 return revert ? 1 : -1; 2105 return revert ? 1 : -1;
2106 return 0; 2106 return 0;
2107 } 2107 }
2108 2108
2109 WebInspector.NetworkDataGridNode.prototype.__proto__ = WebInspector.DataGridNode .prototype; 2109 WebInspector.NetworkDataGridNode.prototype.__proto__ = WebInspector.DataGridNode .prototype;
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698