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

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

Issue 11086042: Revert 130484 - 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();
563 return false; 564 return false;
564 } else { 565 } else {
566 WebInspector.networkManager.disableResourceTracking();
565 this.startRecordingProfile(); 567 this.startRecordingProfile();
566 return true; 568 return true;
567 } 569 }
568 }, 570 },
569 571
570 get treeItemTitle() 572 get treeItemTitle()
571 { 573 {
572 return WebInspector.UIString("CPU PROFILES"); 574 return WebInspector.UIString("CPU PROFILES");
573 }, 575 },
574 576
(...skipping 73 matching lines...) Expand 10 before | Expand all | Expand 10 after
648 /** 650 /**
649 * @override 651 * @override
650 */ 652 */
651 createView: function() 653 createView: function()
652 { 654 {
653 return new WebInspector.CPUProfileView(this); 655 return new WebInspector.CPUProfileView(this);
654 } 656 }
655 } 657 }
656 658
657 WebInspector.CPUProfileHeader.prototype.__proto__ = WebInspector.ProfileHeader.p rototype; 659 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