Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-26 14:22:01 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1626445 - Remove nsAutoPtr usage from dom/midi. r=mccr8

Browse Source 
Differential Revision: https://phabricator.services.mozilla.com/D69116

--HG--
extra : moz-landing-system : lando
This commit is contained in:
Eric Rahm 2020-04-03 21:05:15 +00:00
parent cbe7fbed12
commit 9f799b7610
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
dom/midi/MIDIUtils.cpp
View File

@ -6,6 +6,7 @@
#include "mozilla/dom/MIDITypes.h"
#include "mozilla/dom/MIDIUtils.h"
#include "mozilla/UniquePtr.h"
// Taken from MIDI IMPLEMENTATION CHART INSTRUCTIONS, MIDI Spec v1.0, Pg. 97
static const uint8_t kCommandByte = 0x80;
@ -78,7 +79,7 @@ uint32_t ParseMessages(const nsTArray<uint8_t>& aByteBuffer,
nsTArray<MIDIMessage>& aMsgArray) {
uint32_t bytesRead = 0;
bool inSysexMessage = false;
nsAutoPtr<MIDIMessage> currentMsg;
UniquePtr<MIDIMessage> currentMsg;
for (auto& byte : aByteBuffer) {
bytesRead++;
if ((byte & kSystemRealtimeMessage) == kSystemRealtimeMessage) {
@ -96,10 +97,10 @@ uint32_t ParseMessages(const nsTArray<uint8_t>& aByteBuffer,
}
inSysexMessage = false;
} else if (byte & kCommandByte) {
if (currentMsg && IsValidMessage(currentMsg)) {
if (currentMsg && IsValidMessage(currentMsg.get())) {
aMsgArray.AppendElement(*currentMsg);
}
currentMsg = new MIDIMessage();
currentMsg = MakeUnique<MIDIMessage>();
currentMsg->timestamp() = aTimestamp;
}
currentMsg->data().AppendElement(byte);
@ -107,7 +108,7 @@ uint32_t ParseMessages(const nsTArray<uint8_t>& aByteBuffer,
inSysexMessage = true;
}
}
if (currentMsg && IsValidMessage(currentMsg)) {
if (currentMsg && IsValidMessage(currentMsg.get())) {
aMsgArray.AppendElement(*currentMsg);
}
return bytesRead;