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 906684, make sure to access the right EventTargetChainItem when forwarding events to chrome, r=jst

Browse Source 
--HG--
extra : rebase_source : afb2b457c422585e85d7abccfd76f0b6f85315a4
This commit is contained in:
Olli Pettay 2013-08-20 00:12:56 +03:00
parent 014cc1075f
commit efdcdd5d9b
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
content/events/src/nsEventDispatcher.cpp
View File

@ -461,6 +461,7 @@ nsEventDispatcher::Dispatch(nsISupports* aTarget,
// Create the event target chain item for the event target.
nsEventTargetChainItem* targetEtci =
nsEventTargetChainItem::Create(chain, target->GetTargetForEventTargetChain());
MOZ_ASSERT(&chain[0] == targetEtci);
if (!targetEtci->IsValid()) {
nsEventTargetChainItem::DestroyLast(chain, targetEtci);
return NS_ERROR_FAILURE;
@ -508,6 +509,7 @@ nsEventDispatcher::Dispatch(nsISupports* aTarget,
nsEventTargetChainItem::DestroyLast(chain, targetEtci);
targetEtci = EventTargetChainItemForChromeTarget(chain, content);
NS_ENSURE_STATE(targetEtci);
MOZ_ASSERT(&chain[0] == targetEtci);
targetEtci->PreHandleEvent(preVisitor);
}
if (preVisitor.mCanHandle) {
@ -516,6 +518,7 @@ nsEventDispatcher::Dispatch(nsISupports* aTarget,
nsCOMPtr<EventTarget> t = do_QueryInterface(aEvent->target);
targetEtci->SetNewTarget(t);
nsEventTargetChainItem* topEtci = targetEtci;
targetEtci = nullptr;
while (preVisitor.mParentTarget) {
EventTarget* parentTarget = preVisitor.mParentTarget;
nsEventTargetChainItem* parentEtci =
@ -551,7 +554,7 @@ nsEventDispatcher::Dispatch(nsISupports* aTarget,
if (parentEtci) {
parentEtci->PreHandleEvent(preVisitor);
if (preVisitor.mCanHandle) {
targetEtci->SetNewTarget(parentTarget);
chain[0].SetNewTarget(parentTarget);
topEtci = parentEtci;
continue;
}
@ -591,8 +594,6 @@ nsEventDispatcher::Dispatch(nsISupports* aTarget,
// Note, nsEventTargetChainItem objects are deleted when the chain goes out of
// the scope.
targetEtci = nullptr;
aEvent->mFlags.mIsBeingDispatched = false;
aEvent->mFlags.mDispatchedAtLeastOnce = true;