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

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

Issue 12626002: Merge 143438 (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/1410/
Patch Set: Created 7 years, 9 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) 2008 Apple Inc. All Rights Reserved. 2 * Copyright (C) 2008 Apple Inc. All Rights Reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions 5 * modification, are permitted provided that the following conditions
6 * are met: 6 * are met:
7 * 1. Redistributions of source code must retain the above copyright 7 * 1. Redistributions of source code must retain the above copyright
8 * notice, this list of conditions and the following disclaimer. 8 * notice, this list of conditions and the following disclaimer.
9 * 2. Redistributions in binary form must reproduce the above copyright 9 * 2. Redistributions in binary form must reproduce the above copyright
10 * notice, this list of conditions and the following disclaimer in the 10 * notice, this list of conditions and the following disclaimer in the
(...skipping 277 matching lines...) Expand 10 before | Expand all | Expand 10 after
288 } 288 }
289 } else { 289 } else {
290 if (equalTo && profileDataGridNode.numberOfCalls == queryNumber) 290 if (equalTo && profileDataGridNode.numberOfCalls == queryNumber)
291 profileDataGridNode._searchMatchedCallsColumn = true; 291 profileDataGridNode._searchMatchedCallsColumn = true;
292 if (greaterThan && profileDataGridNode.numberOfCalls > queryNumb er) 292 if (greaterThan && profileDataGridNode.numberOfCalls > queryNumb er)
293 profileDataGridNode._searchMatchedCallsColumn = true; 293 profileDataGridNode._searchMatchedCallsColumn = true;
294 if (lessThan && profileDataGridNode.numberOfCalls < queryNumber) 294 if (lessThan && profileDataGridNode.numberOfCalls < queryNumber)
295 profileDataGridNode._searchMatchedCallsColumn = true; 295 profileDataGridNode._searchMatchedCallsColumn = true;
296 } 296 }
297 297
298 if (profileDataGridNode.functionName.match(matcher) || profileDataGr idNode.url.match(matcher)) 298 if (profileDataGridNode.functionName.match(matcher) || (profileDataG ridNode.url && profileDataGridNode.url.match(matcher)))
299 profileDataGridNode._searchMatchedFunctionColumn = true; 299 profileDataGridNode._searchMatchedFunctionColumn = true;
300 300
301 if (profileDataGridNode._searchMatchedSelfColumn || 301 if (profileDataGridNode._searchMatchedSelfColumn ||
302 profileDataGridNode._searchMatchedTotalColumn || 302 profileDataGridNode._searchMatchedTotalColumn ||
303 profileDataGridNode._searchMatchedAverageColumn || 303 profileDataGridNode._searchMatchedAverageColumn ||
304 profileDataGridNode._searchMatchedCallsColumn || 304 profileDataGridNode._searchMatchedCallsColumn ||
305 profileDataGridNode._searchMatchedFunctionColumn) 305 profileDataGridNode._searchMatchedFunctionColumn)
306 { 306 {
307 profileDataGridNode.refresh(); 307 profileDataGridNode.refresh();
308 return true; 308 return true;
(...skipping 375 matching lines...) Expand 10 before | Expand all | Expand 10 after
684 * @override 684 * @override
685 * @param {WebInspector.ProfilesPanel} profilesPanel 685 * @param {WebInspector.ProfilesPanel} profilesPanel
686 */ 686 */
687 createView: function(profilesPanel) 687 createView: function(profilesPanel)
688 { 688 {
689 return new WebInspector.CPUProfileView(this); 689 return new WebInspector.CPUProfileView(this);
690 }, 690 },
691 691
692 __proto__: WebInspector.ProfileHeader.prototype 692 __proto__: WebInspector.ProfileHeader.prototype
693 } 693 }
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