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

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

Issue 12294013: Merge 142870 (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/1410/
Patch Set: Created 7 years, 10 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 | « Source/WebCore/inspector/front-end/HeapSnapshotView.js ('k') | 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 339 matching lines...) Expand 10 before | Expand all | Expand 10 after
350 get statusBarItems() 350 get statusBarItems()
351 { 351 {
352 return this._statusBarButtons.select("element").concat(this._profileType StatusBarItemsContainer, this._profileViewStatusBarItemsContainer); 352 return this._statusBarButtons.select("element").concat(this._profileType StatusBarItemsContainer, this._profileViewStatusBarItemsContainer);
353 }, 353 },
354 354
355 toggleRecordButton: function() 355 toggleRecordButton: function()
356 { 356 {
357 var isProfiling = this._selectedProfileType.buttonClicked(this); 357 var isProfiling = this._selectedProfileType.buttonClicked(this);
358 this.recordButton.toggled = isProfiling; 358 this.recordButton.toggled = isProfiling;
359 this.recordButton.title = this._selectedProfileType.buttonTooltip; 359 this.recordButton.title = this._selectedProfileType.buttonTooltip;
360 if (isProfiling)
361 this._launcherView.profileStarted();
362 else
363 this._launcherView.profileFinished();
360 }, 364 },
361 365
362 wasShown: function() 366 wasShown: function()
363 { 367 {
364 WebInspector.Panel.prototype.wasShown.call(this); 368 WebInspector.Panel.prototype.wasShown.call(this);
365 this._populateProfiles(); 369 this._populateProfiles();
366 }, 370 },
367 371
368 _profilerWasEnabled: function() 372 _profilerWasEnabled: function()
369 { 373 {
(...skipping 1087 matching lines...) Expand 10 before | Expand all | Expand 10 after
1457 importScript("HeapSnapshotLoader.js"); 1461 importScript("HeapSnapshotLoader.js");
1458 importScript("HeapSnapshotProxy.js"); 1462 importScript("HeapSnapshotProxy.js");
1459 importScript("HeapSnapshotView.js"); 1463 importScript("HeapSnapshotView.js");
1460 importScript("HeapSnapshotWorkerDispatcher.js"); 1464 importScript("HeapSnapshotWorkerDispatcher.js");
1461 importScript("JSHeapSnapshot.js"); 1465 importScript("JSHeapSnapshot.js");
1462 importScript("NativeHeapSnapshot.js"); 1466 importScript("NativeHeapSnapshot.js");
1463 importScript("NativeMemorySnapshotView.js"); 1467 importScript("NativeMemorySnapshotView.js");
1464 importScript("ProfileLauncherView.js"); 1468 importScript("ProfileLauncherView.js");
1465 importScript("TopDownProfileDataGridTree.js"); 1469 importScript("TopDownProfileDataGridTree.js");
1466 importScript("CanvasProfileView.js"); 1470 importScript("CanvasProfileView.js");
OLDNEW
« no previous file with comments | « Source/WebCore/inspector/front-end/HeapSnapshotView.js ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698