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 969865 - Fix the allocation handling of frame time recording; r=avih

Browse Source 
The size of these arrays can be controlled by a pref, but the max size
is bound to 216k, therefore we do not need to do a fallible allocation
for them.
This commit is contained in:
Ehsan Akhgari 2014-02-14 12:56:35 -05:00
parent ac768ae73a
commit f6735f6300
1 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
gfx/layers/Layers.cpp
View File

@ -1026,10 +1026,7 @@ LayerManager::StartFrameTimeRecording(int32_t aBufferSize)
mRecording.mIsPaused = false; mRecording.mIsPaused = false;
if (!mRecording.mIntervals.Length()) { // Initialize recording buffers if (!mRecording.mIntervals.Length()) { // Initialize recording buffers
if (!mRecording.mIntervals.SetLength(aBufferSize)) { mRecording.mIntervals.SetLength(aBufferSize);
mRecording.mIsPaused = true; // OOM
mRecording.mIntervals.Clear();
}
} }
// After being paused, recent values got invalid. Update them to now. // After being paused, recent values got invalid. Update them to now.
@ -1085,11 +1082,12 @@ LayerManager::StopFrameTimeRecording(uint32_t aStartIndex,
length = 0; length = 0;
} }
// Set length in advance to avoid possibly repeated reallocations (and OOM checks). if (!length) {
if (!length || !aFrameIntervals.SetLength(length)) {
aFrameIntervals.Clear(); aFrameIntervals.Clear();
return; // empty recording or OOM, return empty arrays. return; // empty recording, return empty arrays.
} }
// Set length in advance to avoid possibly repeated reallocations
aFrameIntervals.SetLength(length);
uint32_t cyclicPos = aStartIndex % bufferSize; uint32_t cyclicPos = aStartIndex % bufferSize;
for (uint32_t i = 0; i < length; i++, cyclicPos++) { for (uint32_t i = 0; i < length; i++, cyclicPos++) {