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 814898 - Part b: Cleanup CC goop in dom/base; r=mccr8

Browse Source
This commit is contained in:
Ms2ger 2012-12-02 09:53:37 +01:00
parent 97acb14a5a
commit c52fc7b5f2
3 changed files with 12 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
dom/base/nsFocusManager.cpp
View File

@ -133,23 +133,13 @@ NS_INTERFACE_MAP_END
NS_IMPL_CYCLE_COLLECTING_ADDREF(nsFocusManager) NS_IMPL_CYCLE_COLLECTING_ADDREF(nsFocusManager)
NS_IMPL_CYCLE_COLLECTING_RELEASE(nsFocusManager) NS_IMPL_CYCLE_COLLECTING_RELEASE(nsFocusManager)
NS_IMPL_CYCLE_COLLECTION_CLASS(nsFocusManager) NS_IMPL_CYCLE_COLLECTION_6(nsFocusManager,
NS_IMPL_CYCLE_COLLECTION_UNLINK_BEGIN(nsFocusManager) mActiveWindow,
NS_IMPL_CYCLE_COLLECTION_UNLINK(mActiveWindow) mFocusedWindow,
NS_IMPL_CYCLE_COLLECTION_UNLINK(mFocusedWindow) mFocusedContent,
NS_IMPL_CYCLE_COLLECTION_UNLINK(mFocusedContent) mFirstBlurEvent,
NS_IMPL_CYCLE_COLLECTION_UNLINK(mFirstBlurEvent) mFirstFocusEvent,
NS_IMPL_CYCLE_COLLECTION_UNLINK(mFirstFocusEvent) mWindowBeingLowered)
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
nsFocusManager* nsFocusManager::sInstance = nullptr; nsFocusManager* nsFocusManager::sInstance = nullptr;
bool nsFocusManager::sMouseFocusesFormControl = false; bool nsFocusManager::sMouseFocusesFormControl = false;

10
dom/base/nsScreen.cpp
View File

@ -90,15 +90,7 @@ nsScreen::~nsScreen()
DOMCI_DATA(Screen, nsScreen) DOMCI_DATA(Screen, nsScreen)
NS_IMPL_CYCLE_COLLECTION_CLASS(nsScreen) NS_IMPL_CYCLE_COLLECTION_INHERITED_0(nsScreen, nsDOMEventTargetHelper)
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
// QueryInterface implementation for nsScreen // QueryInterface implementation for nsScreen
NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION_INHERITED(nsScreen) NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION_INHERITED(nsScreen)

17
dom/base/nsWindowRoot.cpp
View File

@ -39,19 +39,10 @@ nsWindowRoot::~nsWindowRoot()
} }
} }
NS_IMPL_CYCLE_COLLECTION_CLASS(nsWindowRoot) NS_IMPL_CYCLE_COLLECTION_3(nsWindowRoot,
mListenerManager,
NS_IMPL_CYCLE_COLLECTION_TRAVERSE_BEGIN(nsWindowRoot) mPopupNode,
NS_IMPL_CYCLE_COLLECTION_TRAVERSE(mListenerManager) mParent)
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_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(nsWindowRoot) NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(nsWindowRoot)
NS_INTERFACE_MAP_ENTRY_AMBIGUOUS(nsISupports, nsIDOMEventTarget) NS_INTERFACE_MAP_ENTRY_AMBIGUOUS(nsISupports, nsIDOMEventTarget)