mirror of
https://github.com/mozilla/gecko-dev.git
synced 2024-10-09 19:35:51 +00:00
Bug 814898 - Part b: Cleanup CC goop in dom/base; r=mccr8
This commit is contained in:
parent
282ef81ff8
commit
a4af932810
@ -133,23 +133,13 @@ NS_INTERFACE_MAP_END
|
||||
NS_IMPL_CYCLE_COLLECTING_ADDREF(nsFocusManager)
|
||||
NS_IMPL_CYCLE_COLLECTING_RELEASE(nsFocusManager)
|
||||
|
||||
NS_IMPL_CYCLE_COLLECTION_CLASS(nsFocusManager)
|
||||
NS_IMPL_CYCLE_COLLECTION_UNLINK_BEGIN(nsFocusManager)
|
||||
NS_IMPL_CYCLE_COLLECTION_UNLINK(mActiveWindow)
|
||||
NS_IMPL_CYCLE_COLLECTION_UNLINK(mFocusedWindow)
|
||||
NS_IMPL_CYCLE_COLLECTION_UNLINK(mFocusedContent)
|
||||
NS_IMPL_CYCLE_COLLECTION_UNLINK(mFirstBlurEvent)
|
||||
NS_IMPL_CYCLE_COLLECTION_UNLINK(mFirstFocusEvent)
|
||||
NS_IMPL_CYCLE_COLLECTION_UNLINK(mWindowBeingLowered)
|
||||
NS_IMPL_CYCLE_COLLECTION_UNLINK_END
|
||||
NS_IMPL_CYCLE_COLLECTION_TRAVERSE_BEGIN(nsFocusManager)
|
||||
NS_IMPL_CYCLE_COLLECTION_TRAVERSE(mActiveWindow)
|
||||
NS_IMPL_CYCLE_COLLECTION_TRAVERSE(mFocusedWindow)
|
||||
NS_IMPL_CYCLE_COLLECTION_TRAVERSE(mFocusedContent)
|
||||
NS_IMPL_CYCLE_COLLECTION_TRAVERSE(mFirstBlurEvent)
|
||||
NS_IMPL_CYCLE_COLLECTION_TRAVERSE(mFirstFocusEvent)
|
||||
NS_IMPL_CYCLE_COLLECTION_TRAVERSE(mWindowBeingLowered)
|
||||
NS_IMPL_CYCLE_COLLECTION_TRAVERSE_END
|
||||
NS_IMPL_CYCLE_COLLECTION_6(nsFocusManager,
|
||||
mActiveWindow,
|
||||
mFocusedWindow,
|
||||
mFocusedContent,
|
||||
mFirstBlurEvent,
|
||||
mFirstFocusEvent,
|
||||
mWindowBeingLowered)
|
||||
|
||||
nsFocusManager* nsFocusManager::sInstance = nullptr;
|
||||
bool nsFocusManager::sMouseFocusesFormControl = false;
|
||||
|
@ -90,15 +90,7 @@ nsScreen::~nsScreen()
|
||||
|
||||
DOMCI_DATA(Screen, nsScreen)
|
||||
|
||||
NS_IMPL_CYCLE_COLLECTION_CLASS(nsScreen)
|
||||
|
||||
NS_IMPL_CYCLE_COLLECTION_TRAVERSE_BEGIN_INHERITED(nsScreen,
|
||||
nsDOMEventTargetHelper)
|
||||
NS_IMPL_CYCLE_COLLECTION_TRAVERSE_END
|
||||
|
||||
NS_IMPL_CYCLE_COLLECTION_UNLINK_BEGIN_INHERITED(nsScreen,
|
||||
nsDOMEventTargetHelper)
|
||||
NS_IMPL_CYCLE_COLLECTION_UNLINK_END
|
||||
NS_IMPL_CYCLE_COLLECTION_INHERITED_0(nsScreen, nsDOMEventTargetHelper)
|
||||
|
||||
// QueryInterface implementation for nsScreen
|
||||
NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION_INHERITED(nsScreen)
|
||||
|
@ -39,19 +39,10 @@ nsWindowRoot::~nsWindowRoot()
|
||||
}
|
||||
}
|
||||
|
||||
NS_IMPL_CYCLE_COLLECTION_CLASS(nsWindowRoot)
|
||||
|
||||
NS_IMPL_CYCLE_COLLECTION_TRAVERSE_BEGIN(nsWindowRoot)
|
||||
NS_IMPL_CYCLE_COLLECTION_TRAVERSE(mListenerManager)
|
||||
NS_IMPL_CYCLE_COLLECTION_TRAVERSE(mPopupNode)
|
||||
NS_IMPL_CYCLE_COLLECTION_TRAVERSE(mParent)
|
||||
NS_IMPL_CYCLE_COLLECTION_TRAVERSE_END
|
||||
|
||||
NS_IMPL_CYCLE_COLLECTION_UNLINK_BEGIN(nsWindowRoot)
|
||||
NS_IMPL_CYCLE_COLLECTION_UNLINK(mListenerManager)
|
||||
NS_IMPL_CYCLE_COLLECTION_UNLINK(mPopupNode)
|
||||
NS_IMPL_CYCLE_COLLECTION_UNLINK(mParent)
|
||||
NS_IMPL_CYCLE_COLLECTION_TRAVERSE_END
|
||||
NS_IMPL_CYCLE_COLLECTION_3(nsWindowRoot,
|
||||
mListenerManager,
|
||||
mPopupNode,
|
||||
mParent)
|
||||
|
||||
NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(nsWindowRoot)
|
||||
NS_INTERFACE_MAP_ENTRY_AMBIGUOUS(nsISupports, nsIDOMEventTarget)
|
||||
|
Loading…
Reference in New Issue
Block a user