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

Fix crash on skin switching. r=ben

Browse Source
This commit is contained in:
hyatt%netscape.com 2000-09-03 06:00:09 +00:00
parent be4ff1fbf1
commit ba7b94b9b1
4 changed files with 20 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
content/xbl/src/nsXBLEventHandler.cpp
View File

@ -585,19 +585,21 @@ nsXBLEventHandler::RemoveEventHandlers()
if (mNextHandler)
mNextHandler->RemoveEventHandlers();
if (mEventName == NS_LITERAL_STRING("bindingattached") ||
mEventName == NS_LITERAL_STRING("bindingdetached")) {
// Release and drop.
NS_RELEASE_THIS();
return;
}
// Figure out if we're using capturing or not.
if (!mProtoHandler)
return;
if (mEventName == NS_LITERAL_STRING("bindingattached") ||
mEventName == NS_LITERAL_STRING("bindingdetached")) {
// Release and drop.
mProtoHandler = nsnull;
NS_RELEASE_THIS();
return;
}
nsCOMPtr<nsIContent> handlerElement;
mProtoHandler->GetHandlerElement(getter_AddRefs(handlerElement));
mProtoHandler = nsnull;
if (!handlerElement)
return;

2
content/xbl/src/nsXBLEventHandler.h
View File

@ -127,7 +127,7 @@ protected:
protected:
nsIDOMEventReceiver* mEventReceiver; // Both of these refs are weak.
nsIXBLPrototypeHandler* mProtoHandler;
nsCOMPtr<nsIXBLPrototypeHandler> mProtoHandler;
nsAutoString mEventName;

16
layout/xbl/src/nsXBLEventHandler.cpp
View File

@ -585,19 +585,21 @@ nsXBLEventHandler::RemoveEventHandlers()
if (mNextHandler)
mNextHandler->RemoveEventHandlers();
if (mEventName == NS_LITERAL_STRING("bindingattached") ||
mEventName == NS_LITERAL_STRING("bindingdetached")) {
// Release and drop.
NS_RELEASE_THIS();
return;
}
// Figure out if we're using capturing or not.
if (!mProtoHandler)
return;
if (mEventName == NS_LITERAL_STRING("bindingattached") ||
mEventName == NS_LITERAL_STRING("bindingdetached")) {
// Release and drop.
mProtoHandler = nsnull;
NS_RELEASE_THIS();
return;
}
nsCOMPtr<nsIContent> handlerElement;
mProtoHandler->GetHandlerElement(getter_AddRefs(handlerElement));
mProtoHandler = nsnull;
if (!handlerElement)
return;

2
layout/xbl/src/nsXBLEventHandler.h
View File

@ -127,7 +127,7 @@ protected:
protected:
nsIDOMEventReceiver* mEventReceiver; // Both of these refs are weak.
nsIXBLPrototypeHandler* mProtoHandler;
nsCOMPtr<nsIXBLPrototypeHandler> mProtoHandler;
nsAutoString mEventName;