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

Side by Side Diff: Source/devtools/front_end/timeline/TimelinePanel.js

Issue 1158273003: DevTools: disable filmstrip in frames mode on timeline. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 5 years, 6 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) 2012 Google Inc. All rights reserved. 2 * Copyright (C) 2012 Google Inc. All rights reserved.
3 * Copyright (C) 2012 Intel Inc. All rights reserved. 3 * Copyright (C) 2012 Intel Inc. All rights reserved.
4 * 4 *
5 * Redistribution and use in source and binary forms, with or without 5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions are 6 * modification, are permitted provided that the following conditions are
7 * met: 7 * met:
8 * 8 *
9 * * Redistributions of source code must retain the above copyright 9 * * Redistributions of source code must retain the above copyright
10 * notice, this list of conditions and the following disclaimer. 10 * notice, this list of conditions and the following disclaimer.
(...skipping 611 matching lines...) Expand 10 before | Expand all | Expand 10 after
622 this._addModeView(timelineView); 622 this._addModeView(timelineView);
623 timelineView.setFrameModel(isFrameMode ? this._frameModel() : null); 623 timelineView.setFrameModel(isFrameMode ? this._frameModel() : null);
624 } 624 }
625 625
626 if (this._captureMemorySetting.get()) { 626 if (this._captureMemorySetting.get()) {
627 if (!isFrameMode) // Frame mode skews time, don't render aux overvi ews. 627 if (!isFrameMode) // Frame mode skews time, don't render aux overvi ews.
628 this._overviewControls.push(new WebInspector.TimelineMemoryOverv iew(this._model)); 628 this._overviewControls.push(new WebInspector.TimelineMemoryOverv iew(this._model));
629 this._addModeView(new WebInspector.MemoryCountersGraph(this, this._m odel)); 629 this._addModeView(new WebInspector.MemoryCountersGraph(this, this._m odel));
630 } 630 }
631 631
632 if (Runtime.experiments.isEnabled("filmStripInNetworkAndTimeline") && th is._captureFilmStripSetting.get()) 632 if (Runtime.experiments.isEnabled("filmStripInNetworkAndTimeline") && !i sFrameMode && this._captureFilmStripSetting.get())
633 this._overviewControls.push(new WebInspector.TimelineFilmStripOvervi ew(this._model, this._tracingModel)); 633 this._overviewControls.push(new WebInspector.TimelineFilmStripOvervi ew(this._model, this._tracingModel));
634 634
635 var mainTarget = WebInspector.targetManager.mainTarget(); 635 var mainTarget = WebInspector.targetManager.mainTarget();
636 this._overviewPane.setOverviewControls(this._overviewControls); 636 this._overviewPane.setOverviewControls(this._overviewControls);
637 this.doResize(); 637 this.doResize();
638 this._selection = null; 638 this._selection = null;
639 this._updateSelectionDetails(); 639 this._updateSelectionDetails();
640 640
641 this._stackView.show(this._searchableView.element); 641 this._stackView.show(this._searchableView.element);
642 }, 642 },
(...skipping 1192 matching lines...) Expand 10 before | Expand all | Expand 10 after
1835 /** 1835 /**
1836 * @override 1836 * @override
1837 */ 1837 */
1838 reset: function() 1838 reset: function()
1839 { 1839 {
1840 this._filmStripView.reset(); 1840 this._filmStripView.reset();
1841 }, 1841 },
1842 1842
1843 __proto__: WebInspector.TimelineOverviewBase.prototype 1843 __proto__: WebInspector.TimelineOverviewBase.prototype
1844 } 1844 }
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