diff options
| -rw-r--r-- | dom/base/CustomElementRegistry.cpp | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/dom/base/CustomElementRegistry.cpp b/dom/base/CustomElementRegistry.cpp index 249162c38..6419c1425 100644 --- a/dom/base/CustomElementRegistry.cpp +++ b/dom/base/CustomElementRegistry.cpp @@ -974,6 +974,7 @@ CustomElementReactionsStack::InvokeBackupQueue() void CustomElementReactionsStack::InvokeReactions(ElementQueue& aElementQueue) { + // Note: It's possible to re-enter this method. for (uint32_t i = 0; i < aElementQueue.Length(); ++i) { nsCOMPtr<Element> element = do_QueryReferent(aElementQueue[i]); @@ -984,10 +985,14 @@ CustomElementReactionsStack::InvokeReactions(ElementQueue& aElementQueue) RefPtr<CustomElementData> elementData = element->GetCustomElementData(); MOZ_ASSERT(elementData, "CustomElementData should exist"); - nsTArray<nsAutoPtr<CustomElementReaction>>& reactions = - elementData->mReactionQueue; + auto& reactions = elementData->mReactionQueue; for (uint32_t j = 0; j < reactions.Length(); ++j) { - reactions.ElementAt(j)->Invoke(element); + // Transfer the ownership of the entry due to reentrant invocation of + // this funciton. The entry will be removed when bug 1379573 is landed. + auto reaction(Move(reactions.ElementAt(j))); + if (reaction) { + reaction->Invoke(element); + } } reactions.Clear(); } |