wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 1244225 - Do not access allocation recording settings when the memory component isn't attached. r=fitzgen

Browse Source
This commit is contained in:
Jordan Santell 2016-02-08 14:25:00 +01:00
parent 345570e137
commit c3b5fde449
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
devtools/server/performance/recorder.js
View File

@ -467,7 +467,13 @@ const PerformanceRecorder = exports.PerformanceRecorder = Class({
* @return {object} * @return {object}
*/ */
getConfiguration: function () { getConfiguration: function () {
return extend({}, this._memory.getAllocationsSettings(), this._profiler.getStartOptions()); let allocationSettings = Object.create(null);
if (this._memory.getState() === "attached") {
allocationSettings = this._memory.getAllocationsSettings();
}
return extend({}, allocationSettings, this._profiler.getStartOptions());
}, },
toString: () => "[object PerformanceRecorder]" toString: () => "[object PerformanceRecorder]"