mirror of
https://github.com/mozilla/gecko-dev.git
synced 2024-10-09 11:25:00 +00:00
Bug 1453345 part 3. Remove the eWrappedJSListener listener type, now that we shouldn't have them anymore. r=smaug
MozReview-Commit-ID: LycJUIJm5p9
This commit is contained in:
parent
ce20fb6291
commit
4cfde58ac8
@ -292,14 +292,11 @@ EventListenerManager::AddEventListenerInternal(
|
||||
nsContentUtils::LegacyIsCallerChromeOrNativeCode();
|
||||
|
||||
// Detect the type of event listener.
|
||||
nsCOMPtr<nsIXPConnectWrappedJS> wjs;
|
||||
if (aFlags.mListenerIsJSListener) {
|
||||
MOZ_ASSERT(!aListenerHolder.HasWebIDLCallback());
|
||||
listener->mListenerType = Listener::eJSEventListener;
|
||||
} else if (aListenerHolder.HasWebIDLCallback()) {
|
||||
listener->mListenerType = Listener::eWebIDLListener;
|
||||
} else if ((wjs = do_QueryInterface(aListenerHolder.GetXPCOMCallback()))) {
|
||||
listener->mListenerType = Listener::eWrappedJSListener;
|
||||
} else {
|
||||
listener->mListenerType = Listener::eNativeListener;
|
||||
}
|
||||
@ -1715,8 +1712,6 @@ EventListenerManager::MarkForCC()
|
||||
if (typedHandler.HasEventHandler()) {
|
||||
typedHandler.Ptr()->MarkForCC();
|
||||
}
|
||||
} else if (listener.mListenerType == Listener::eWrappedJSListener) {
|
||||
xpc_TryUnmarkWrappedGrayObject(listener.mListener.GetXPCOMCallback());
|
||||
} else if (listener.mListenerType == Listener::eWebIDLListener) {
|
||||
listener.mListener.GetWebIDLCallback()->MarkForCC();
|
||||
}
|
||||
|
@ -189,10 +189,13 @@ public:
|
||||
|
||||
enum ListenerType : uint8_t
|
||||
{
|
||||
// No listener.
|
||||
eNoListener,
|
||||
// A generic C++ implementation of nsIDOMEventListener.
|
||||
eNativeListener,
|
||||
// An event handler attribute using JSEventHandler.
|
||||
eJSEventListener,
|
||||
eWrappedJSListener,
|
||||
// A scripted EventListener.
|
||||
eWebIDLListener,
|
||||
};
|
||||
ListenerType mListenerType;
|
||||
|
Loading…
Reference in New Issue
Block a user