зеркало из https://github.com/mozilla/gecko-dev.git
Bug 587944. Need to clear are target frame when we clear our target content. r=smaug a=blocking 130078 which blocks
This commit is contained in:
Родитель
9ef85e39a6
Коммит
bb88604a6c
|
@ -3292,6 +3292,7 @@ nsEventStateManager::PostHandleEvent(nsPresContext* aPresContext,
|
||||||
|
|
||||||
//Reset target frame to null to avoid mistargeting after reentrant event
|
//Reset target frame to null to avoid mistargeting after reentrant event
|
||||||
mCurrentTarget = nsnull;
|
mCurrentTarget = nsnull;
|
||||||
|
mCurrentTargetContent = nsnull;
|
||||||
|
|
||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
|
@ -3611,6 +3612,7 @@ nsEventStateManager::DispatchMouseEvent(nsGUIEvent* aEvent, PRUint32 aMessage,
|
||||||
event.inputSource = static_cast<nsMouseEvent*>(aEvent)->inputSource;
|
event.inputSource = static_cast<nsMouseEvent*>(aEvent)->inputSource;
|
||||||
|
|
||||||
mCurrentTargetContent = aTargetContent;
|
mCurrentTargetContent = aTargetContent;
|
||||||
|
mCurrentTarget = nsnull;
|
||||||
|
|
||||||
nsIFrame* targetFrame = nsnull;
|
nsIFrame* targetFrame = nsnull;
|
||||||
if (aTargetContent) {
|
if (aTargetContent) {
|
||||||
|
@ -3627,6 +3629,7 @@ nsEventStateManager::DispatchMouseEvent(nsGUIEvent* aEvent, PRUint32 aMessage,
|
||||||
}
|
}
|
||||||
|
|
||||||
mCurrentTargetContent = nsnull;
|
mCurrentTargetContent = nsnull;
|
||||||
|
mCurrentTarget = nsnull;
|
||||||
|
|
||||||
return targetFrame;
|
return targetFrame;
|
||||||
}
|
}
|
||||||
|
@ -3791,6 +3794,7 @@ nsEventStateManager::GenerateMouseEnterExit(nsGUIEvent* aEvent)
|
||||||
|
|
||||||
// reset mCurretTargetContent to what it was
|
// reset mCurretTargetContent to what it was
|
||||||
mCurrentTargetContent = targetBeforeEvent;
|
mCurrentTargetContent = targetBeforeEvent;
|
||||||
|
mCurrentTarget = nsnull;
|
||||||
}
|
}
|
||||||
|
|
||||||
void
|
void
|
||||||
|
|
Загрузка…
Ссылка в новой задаче