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

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

Issue 10689130: Merge 121859 - Web Inspector: fix search on the network panel. (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/1180/
Patch Set: Created 8 years, 5 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 1117 matching lines...) Expand 10 before | Expand all | Expand 10 after
1128 var nameMatched = request.displayName && request.displayName.match(this. _searchRegExp); 1128 var nameMatched = request.displayName && request.displayName.match(this. _searchRegExp);
1129 var pathMatched = request.parsedURL.path && request.folder.match(this._s earchRegExp); 1129 var pathMatched = request.parsedURL.path && request.folder.match(this._s earchRegExp);
1130 if (!nameMatched && pathMatched && !this._largerRequestsButton.toggled) 1130 if (!nameMatched && pathMatched && !this._largerRequestsButton.toggled)
1131 this._toggleLargerRequests(); 1131 this._toggleLargerRequests();
1132 1132
1133 var node = this._requestGridNode(request); 1133 var node = this._requestGridNode(request);
1134 if (node) { 1134 if (node) {
1135 this._highlightedSubstringChanges = node._highlightMatchedSubstring( this._searchRegExp); 1135 this._highlightedSubstringChanges = node._highlightMatchedSubstring( this._searchRegExp);
1136 if (reveal) 1136 if (reveal)
1137 node.reveal(); 1137 node.reveal();
1138 this._currentMatcRequestrceIndex = matchedRequestIndex; 1138 this._currentMatchedRequestIndex = matchedRequestIndex;
1139 } 1139 }
1140 this.dispatchEventToListeners(WebInspector.NetworkLogView.EventTypes.Sea rchIndexUpdated, this._currentMatchedRequestIndex); 1140 this.dispatchEventToListeners(WebInspector.NetworkLogView.EventTypes.Sea rchIndexUpdated, this._currentMatchedRequestIndex);
1141 }, 1141 },
1142 1142
1143 performSearch: function(searchQuery, sortOrFilterApplied) 1143 performSearch: function(searchQuery, sortOrFilterApplied)
1144 { 1144 {
1145 var newMatchedRequestIndex = 0; 1145 var newMatchedRequestIndex = 0;
1146 var currentMatchedRequestId; 1146 var currentMatchedRequestId;
1147 if (this._currentMatchedRequestIndex !== -1) 1147 if (this._currentMatchedRequestIndex !== -1)
1148 currentMatchedRequestId = this._matchedRequests[this._currentMatched RequestIndex]; 1148 currentMatchedRequestId = this._matchedRequests[this._currentMatched RequestIndex];
(...skipping 987 matching lines...) Expand 10 before | Expand all | Expand 10 after
2136 var aValue = a._request[propertyName]; 2136 var aValue = a._request[propertyName];
2137 var bValue = b._request[propertyName]; 2137 var bValue = b._request[propertyName];
2138 if (aValue > bValue) 2138 if (aValue > bValue)
2139 return revert ? -1 : 1; 2139 return revert ? -1 : 1;
2140 if (bValue > aValue) 2140 if (bValue > aValue)
2141 return revert ? 1 : -1; 2141 return revert ? 1 : -1;
2142 return 0; 2142 return 0;
2143 } 2143 }
2144 2144
2145 WebInspector.NetworkDataGridNode.prototype.__proto__ = WebInspector.DataGridNode .prototype; 2145 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