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 813445 part.9 Remove NS_EVENT_FLAG_EXCEPTION_THROWN r=smaug

Browse Source
This commit is contained in:
Masayuki Nakano 2012-12-16 10:26:04 +09:00
parent 0dced195ab
commit 0b4728f158
3 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
content/events/src/nsEventListenerManager.cpp
View File

@ -992,7 +992,7 @@ nsEventListenerManager::HandleEventInternal(nsPresContext* aPresContext,
if (NS_FAILED(HandleEventSubType(ls, ls->mListener, *aDOMEvent,
aCurrentTarget, aFlags,
aPusher))) {
aEvent->flags |= NS_EVENT_FLAG_EXCEPTION_THROWN;
aEvent->mFlags.mExceptionHasBeenRisen = true;
}
}
}

4
dom/indexedDB/AsyncConnectionHelper.cpp
View File

@ -449,7 +449,7 @@ AsyncConnectionHelper::OnSuccess()
mTransaction->IsAborted(),
"How else can this be closed?!");
if ((internalEvent->flags & NS_EVENT_FLAG_EXCEPTION_THROWN) &&
if (internalEvent->mFlags.mExceptionHasBeenRisen &&
mTransaction &&
mTransaction->IsOpen()) {
rv = mTransaction->Abort(NS_ERROR_DOM_INDEXEDDB_ABORT_ERR);
@ -485,7 +485,7 @@ AsyncConnectionHelper::OnError()
nsEvent* internalEvent = event->GetInternalNSEvent();
NS_ASSERTION(internalEvent, "This should never be null!");
if ((internalEvent->flags & NS_EVENT_FLAG_EXCEPTION_THROWN) &&
if (internalEvent->mFlags.mExceptionHasBeenRisen &&
mTransaction &&
mTransaction->IsOpen() &&
NS_FAILED(mTransaction->Abort(NS_ERROR_DOM_INDEXEDDB_ABORT_ERR))) {

5
widget/nsGUIEvent.h
View File

@ -120,8 +120,6 @@ enum nsEventStructType {
#define NS_PRIV_EVENT_UNTRUSTED_PERMITTED 0x8000
#define NS_EVENT_FLAG_EXCEPTION_THROWN 0x10000
#define NS_EVENT_RETARGET_TO_NON_NATIVE_ANONYMOUS 0x40000
#define NS_EVENT_FLAG_DONT_FORWARD_CROSS_PROCESS 0x100000
@ -539,6 +537,9 @@ public:
// If mIsSynthesizedForTests is true, the event has been synthesized for
// automated tests or something hacky approach of an add-on.
bool mIsSynthesizedForTests : 1;
// If mExceptionHasBeenRisen is true, one of the event handlers has risen an
// exception.
bool mExceptionHasBeenRisen : 1;
// If the event is being handled in target phase, returns true.
bool InTargetPhase() const