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

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

Issue 11068016: Merge 124886 - Web Inspector: Do not disable network tracking while profiling cpu. (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/1229/
Patch Set: Created 8 years, 2 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 | Source/WebCore/inspector/front-end/NetworkManager.js » ('j') | 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 542 matching lines...) Expand 10 before | Expand all | Expand 10 after
553 }, 553 },
554 554
555 /** 555 /**
556 * @override 556 * @override
557 * @return {boolean} 557 * @return {boolean}
558 */ 558 */
559 buttonClicked: function() 559 buttonClicked: function()
560 { 560 {
561 if (this._recording) { 561 if (this._recording) {
562 this.stopRecordingProfile(); 562 this.stopRecordingProfile();
563 WebInspector.networkManager.enableResourceTracking();
564 return false; 563 return false;
565 } else { 564 } else {
566 WebInspector.networkManager.disableResourceTracking();
567 this.startRecordingProfile(); 565 this.startRecordingProfile();
568 return true; 566 return true;
569 } 567 }
570 }, 568 },
571 569
572 get treeItemTitle() 570 get treeItemTitle()
573 { 571 {
574 return WebInspector.UIString("CPU PROFILES"); 572 return WebInspector.UIString("CPU PROFILES");
575 }, 573 },
576 574
(...skipping 73 matching lines...) Expand 10 before | Expand all | Expand 10 after
650 /** 648 /**
651 * @override 649 * @override
652 */ 650 */
653 createView: function() 651 createView: function()
654 { 652 {
655 return new WebInspector.CPUProfileView(this); 653 return new WebInspector.CPUProfileView(this);
656 } 654 }
657 } 655 }
658 656
659 WebInspector.CPUProfileHeader.prototype.__proto__ = WebInspector.ProfileHeader.p rototype; 657 WebInspector.CPUProfileHeader.prototype.__proto__ = WebInspector.ProfileHeader.p rototype;
OLDNEW
« no previous file with comments | « no previous file | Source/WebCore/inspector/front-end/NetworkManager.js » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698