OLD | NEW |
---|---|
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 386 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
397 this._capt ureMemorySetting, | 397 this._capt ureMemorySetting, |
398 WebInspect or.UIString("Capture memory information on every timeline event"))); | 398 WebInspect or.UIString("Capture memory information on every timeline event"))); |
399 this._captureMemorySetting.addChangeListener(this._onModeChanged, this); | 399 this._captureMemorySetting.addChangeListener(this._onModeChanged, this); |
400 if (WebInspector.experimentsSettings.timelinePowerProfiler.isEnabled()) { | 400 if (WebInspector.experimentsSettings.timelinePowerProfiler.isEnabled()) { |
401 this._capturePowerSetting = WebInspector.settings.createSetting("tim elineCapturePower", false); | 401 this._capturePowerSetting = WebInspector.settings.createSetting("tim elineCapturePower", false); |
402 panelStatusBarElement.appendChild(this._createSettingCheckbox(WebIns pector.UIString("Power"), | 402 panelStatusBarElement.appendChild(this._createSettingCheckbox(WebIns pector.UIString("Power"), |
403 this._ capturePowerSetting, | 403 this._ capturePowerSetting, |
404 WebIns pector.UIString("Capture power information"))); | 404 WebIns pector.UIString("Capture power information"))); |
405 this._capturePowerSetting.addChangeListener(this._onModeChanged, thi s); | 405 this._capturePowerSetting.addChangeListener(this._onModeChanged, thi s); |
406 } | 406 } |
407 if (WebInspector.experimentsSettings.timelineOnTraceEvents.isEnabled()) { | 407 if (WebInspector.experimentsSettings.timelineOnTraceEvents.isEnabled() & & |
408 WebInspector.experimentsSettings.paintProfiler.isEnabled()) { | |
pfeldman
2014/08/08 12:32:21
You want to hide layers behind experiment as well.
yurys
2014/08/08 12:58:06
Added checks in a couple of places but neither lay
| |
408 this._captureLayersAndPicturesSetting = WebInspector.settings.create Setting("timelineCaptureLayersAndPictures", false); | 409 this._captureLayersAndPicturesSetting = WebInspector.settings.create Setting("timelineCaptureLayersAndPictures", false); |
409 panelStatusBarElement.appendChild(this._createSettingCheckbox(WebIns pector.UIString("Paint"), | 410 panelStatusBarElement.appendChild(this._createSettingCheckbox(WebIns pector.UIString("Paint"), |
410 this._ captureLayersAndPicturesSetting, | 411 this._ captureLayersAndPicturesSetting, |
411 WebIns pector.UIString("Capture graphics layer positions and painted pictures"))); | 412 WebIns pector.UIString("Capture graphics layer positions and painted pictures"))); |
412 } | 413 } |
413 | 414 |
414 this._miscStatusBarItems = panelStatusBarElement.createChild("div", "sta tus-bar-item"); | 415 this._miscStatusBarItems = panelStatusBarElement.createChild("div", "sta tus-bar-item"); |
415 | 416 |
416 this._filtersContainer = this.element.createChild("div", "timeline-filte rs-header hidden"); | 417 this._filtersContainer = this.element.createChild("div", "timeline-filte rs-header hidden"); |
417 this._filtersContainer.appendChild(this._filterBar.filtersElement()); | 418 this._filtersContainer.appendChild(this._filterBar.filtersElement()); |
(...skipping 1025 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
1443 * @param {!WebInspector.TimelineModel.Record} record | 1444 * @param {!WebInspector.TimelineModel.Record} record |
1444 * @return {boolean} | 1445 * @return {boolean} |
1445 */ | 1446 */ |
1446 accept: function(record) | 1447 accept: function(record) |
1447 { | 1448 { |
1448 return !this._regex || this._uiUtils.testContentMatching(record, this._r egex); | 1449 return !this._regex || this._uiUtils.testContentMatching(record, this._r egex); |
1449 }, | 1450 }, |
1450 | 1451 |
1451 __proto__: WebInspector.TimelineModel.Filter.prototype | 1452 __proto__: WebInspector.TimelineModel.Filter.prototype |
1452 } | 1453 } |
OLD | NEW |