Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-24 18:55:30 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1298504, ensure existing listeners are correctly counted before disabling some device APIs, r=mccr8

Browse Source
This commit is contained in:
Olli Pettay 2016-09-05 19:34:30 +03:00
parent 8744d0ccf8
commit 9530ccd561
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
dom/events/EventListenerManager.cpp
View File

@ -654,6 +654,7 @@ EventListenerManager::RemoveEventListenerInternal(
uint32_t count = mListeners.Length();
uint32_t typeCount = 0;
bool deviceType = IsDeviceType(aEventMessage);
bool didRemove = false;
RefPtr<EventListenerManager> kungFuDeathGrip(this);
@ -665,18 +666,22 @@ EventListenerManager::RemoveEventListenerInternal(
if (listener->mListener == aListenerHolder &&
listener->mFlags.EqualsForRemoval(aFlags)) {
mListeners.RemoveElementAt(i);
didRemove = true;
--count;
NotifyEventListenerRemoved(aUserType);
--i;
if (!deviceType) {
return;
break;
}
--typeCount;
}
}
}
if (!aAllEvents && deviceType && typeCount == 0) {
DisableDevice(aEventMessage);
if(didRemove) {
NotifyEventListenerRemoved(aUserType);
if (!aAllEvents && deviceType && typeCount == 0) {
DisableDevice(aEventMessage);
}
}
}