Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug 363089, Remove nsIDOMEventReceiver (this time passes mochitest), r+sr=jst

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@226373 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
Olli.Pettay%helsinki.fi
2007-05-14 09:13:09 +00:00
parent 000433da32
commit 7a1f7182a1
131 changed files with 689 additions and 778 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
mozilla/editor/libeditor/html/nsHTMLAbsPosition.cpp
View File

@@ -57,7 +57,6 @@
#include "nsIDOMNodeList.h"
#include "nsIDOMEventTarget.h"
#include "nsIDOMEventReceiver.h"
#include "nsIPrefBranch.h"
#include "nsIPrefService.h"
@@ -403,11 +402,11 @@ nsHTMLEditor::GrabberClicked()
mMouseMotionListenerP = new ResizerMouseMotionListener(this);
if (!mMouseMotionListenerP) {return NS_ERROR_NULL_POINTER;}
nsCOMPtr<nsIDOMEventReceiver> erP = GetDOMEventReceiver();
NS_ENSURE_TRUE(erP, NS_ERROR_FAILURE);
nsCOMPtr<nsPIDOMEventTarget> piTarget = GetPIDOMEventTarget();
NS_ENSURE_TRUE(piTarget, NS_ERROR_FAILURE);
res = erP->AddEventListenerByIID(mMouseMotionListenerP,
NS_GET_IID(nsIDOMMouseMotionListener));
res = piTarget->AddEventListenerByIID(mMouseMotionListenerP,
NS_GET_IID(nsIDOMMouseMotionListener));
NS_ASSERTION(NS_SUCCEEDED(res),
"failed to register mouse motion listener");
}
@@ -432,13 +431,14 @@ nsHTMLEditor::EndMoving()
DeleteRefToAnonymousNode(mPositioningShadow, rootContent, ps);
mPositioningShadow = nsnull;
}
nsCOMPtr<nsIDOMEventReceiver> erP = GetDOMEventReceiver();
nsCOMPtr<nsPIDOMEventTarget> piTarget = GetPIDOMEventTarget();
if (erP && mMouseMotionListenerP) {
if (piTarget && mMouseMotionListenerP) {
#ifdef DEBUG
nsresult res =
#endif
erP->RemoveEventListenerByIID(mMouseMotionListenerP, NS_GET_IID(nsIDOMMouseMotionListener));
piTarget->RemoveEventListenerByIID(mMouseMotionListenerP,
NS_GET_IID(nsIDOMMouseMotionListener));
NS_ASSERTION(NS_SUCCEEDED(res), "failed to remove mouse motion listener");
}
mMouseMotionListenerP = nsnull;