Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-09 19:35:51 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 658714 Part 6: Fixups after search'n'replace s/nsPIDOMEventTarget/nsIDOMEventTarget/. r=smaug

Browse Source
This commit is contained in:
Jonas Sicking 2011-06-23 19:18:01 -07:00
parent 07c1f0b90f
commit cd52437ea7
38 changed files with 90 additions and 140 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
content/base/src/nsDocument.cpp
View File

@ -7381,9 +7381,10 @@ nsDocument::OnPageShow(PRBool aPersisted,
SetImagesNeedAnimating(PR_TRUE);
}
nsCOMPtr<nsIDOMEventTarget> target =
aDispatchStartTarget ? do_QueryInterface(aDispatchStartTarget) :
do_QueryInterface(GetWindow());
nsCOMPtr<nsIDOMEventTarget> target = aDispatchStartTarget;
if (!target) {
target = do_QueryInterface(GetWindow());
}
DispatchPageTransition(target, NS_LITERAL_STRING("pageshow"), aPersisted);
}
@ -7434,9 +7435,10 @@ nsDocument::OnPageHide(PRBool aPersisted,
}
// Now send out a PageHide event.
nsCOMPtr<nsIDOMEventTarget> target =
aDispatchStartTarget ? do_QueryInterface(aDispatchStartTarget) :
do_QueryInterface(GetWindow());
nsCOMPtr<nsIDOMEventTarget> target = aDispatchStartTarget;
if (!target) {
target = do_QueryInterface(GetWindow());
}
DispatchPageTransition(target, NS_LITERAL_STRING("pagehide"), aPersisted);
mVisible = PR_FALSE;

1
content/base/src/nsTextNode.cpp
View File

@ -42,7 +42,6 @@
#include "nsTextNode.h"
#include "nsContentUtils.h"
#include "nsIDOMEventListener.h"
#include "nsIDOMEventTarget.h"
#include "nsIDOMMutationEvent.h"
#include "nsIAttribute.h"
#include "nsIDocument.h"

1
content/base/src/nsTextNode.h
View File

@ -43,7 +43,6 @@
#include "nsIDOMText.h"
#include "nsContentUtils.h"
#include "nsIDOMEventListener.h"
#include "nsIDOMEventTarget.h"
#include "nsIDOMMutationEvent.h"
#include "nsIAttribute.h"
#include "nsIDocument.h"

7
content/events/src/nsDOMEvent.cpp
View File

@ -46,7 +46,6 @@
#include "nsIContent.h"
#include "nsIPresShell.h"
#include "nsIDocument.h"
#include "nsIDOMEventTarget.h"
#include "nsIInterfaceRequestor.h"
#include "nsIInterfaceRequestorUtils.h"
#include "prmem.h"
@ -285,11 +284,9 @@ GetDOMEventTarget(nsIDOMEventTarget* aTarget,
{
nsIDOMEventTarget* realTarget =
aTarget ? aTarget->GetTargetForDOMEvent() : aTarget;
if (realTarget) {
return CallQueryInterface(realTarget, aDOMTarget);
}
*aDOMTarget = nsnull;
NS_IF_ADDREF(*aDOMTarget = realTarget);
return NS_OK;
}

10
content/events/src/nsDOMEventTargetHelper.cpp
View File

@ -80,7 +80,7 @@ NS_IMPL_CYCLE_COLLECTION_UNLINK_BEGIN(nsDOMEventTargetHelper)
NS_IMPL_CYCLE_COLLECTION_UNLINK_END
NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(nsDOMEventTargetHelper)
NS_INTERFACE_MAP_ENTRY_AMBIGUOUS(nsISupports, nsIDOMEventTarget)
NS_INTERFACE_MAP_ENTRY(nsISupports)
NS_INTERFACE_MAP_ENTRY(nsIDOMEventTarget)
NS_INTERFACE_MAP_END
@ -140,8 +140,7 @@ nsDOMEventTargetHelper::DispatchEvent(nsIDOMEvent* aEvent, PRBool* aRetVal)
{
nsEventStatus status = nsEventStatus_eIgnore;
nsresult rv =
nsEventDispatcher::DispatchDOMEvent(static_cast<nsIDOMEventTarget*>(this),
nsnull, aEvent, nsnull, &status);
nsEventDispatcher::DispatchDOMEvent(this, nsnull, aEvent, nsnull, &status);
*aRetVal = (status != nsEventStatus_eConsumeNoDefault);
return rv;
@ -199,8 +198,7 @@ nsDOMEventTargetHelper::DispatchDOMEvent(nsEvent* aEvent,
nsEventStatus* aEventStatus)
{
return
nsEventDispatcher::DispatchDOMEvent(static_cast<nsIDOMEventTarget*>(this),
aEvent, aDOMEvent, aPresContext,
nsEventDispatcher::DispatchDOMEvent(this, aEvent, aDOMEvent, aPresContext,
aEventStatus);
}
@ -213,7 +211,7 @@ nsDOMEventTargetHelper::GetListenerManager(PRBool aCreateIfNotFound)
}
nsresult rv = NS_NewEventListenerManager(getter_AddRefs(mListenerManager));
NS_ENSURE_SUCCESS(rv, nsnull);
mListenerManager->SetListenerTarget(static_cast<nsIDOMEventTarget*>(this));
mListenerManager->SetListenerTarget(this);
}
return mListenerManager;

4
content/events/src/nsDOMEventTargetHelper.h
View File

@ -43,7 +43,6 @@
#include "nsAutoPtr.h"
#include "nsIDOMEventTarget.h"
#include "nsIDOMEventListener.h"
#include "nsIDOMEventTarget.h"
#include "nsCycleCollectionParticipant.h"
#include "nsPIDOMWindow.h"
#include "nsIScriptGlobalObject.h"
@ -72,8 +71,7 @@ public:
nsDOMEventTargetHelper() {}
virtual ~nsDOMEventTargetHelper() {}
NS_DECL_CYCLE_COLLECTING_ISUPPORTS
NS_DECL_CYCLE_COLLECTION_CLASS_AMBIGUOUS(nsDOMEventTargetHelper,
nsIDOMEventTarget)
NS_DECL_CYCLE_COLLECTION_CLASS(nsDOMEventTargetHelper)
NS_DECL_NSIDOMEVENTTARGET

6
content/events/src/nsEventDispatcher.cpp
View File

@ -232,7 +232,7 @@ public:
sMaxEtciCount = 0;
}
nsCOMPtr<nsIDOMEventTarget> mTarget;
nsCOMPtr<nsIDOMEventTarget> mTarget;
nsEventTargetChainItem* mChild;
union {
nsEventTargetChainItem* mParent;
@ -243,7 +243,7 @@ public:
PRUint16 mItemFlags;
nsCOMPtr<nsISupports> mItemData;
// Event retargeting must happen whenever mNewTarget is non-null.
nsCOMPtr<nsIDOMEventTarget> mNewTarget;
nsCOMPtr<nsIDOMEventTarget> mNewTarget;
// Cache mTarget's event listener manager.
nsRefPtr<nsEventListenerManager> mManager;
@ -619,7 +619,7 @@ nsEventDispatcher::Dispatch(nsISupports* aTarget,
if (preVisitor.mCanHandle) {
// At least the original target can handle the event.
// Setting the retarget to the |target| simplifies retargeting code.
nsCOMPtr<nsIDOMEventTarget> t = do_QueryInterface(aEvent->target);
nsCOMPtr<nsIDOMEventTarget> t = aEvent->target;
targetEtci->SetNewTarget(t);
nsEventTargetChainItem* topEtci = targetEtci;
while (preVisitor.mParentTarget) {

20
content/events/src/nsEventListenerService.cpp
View File

@ -37,7 +37,6 @@
#include "nsEventListenerService.h"
#include "nsCOMArray.h"
#include "nsEventListenerManager.h"
#include "nsIDOMEventTarget.h"
#include "nsIVariant.h"
#include "nsIServiceManager.h"
#include "nsMemory.h"
@ -202,13 +201,10 @@ nsEventListenerService::GetListenerInfoFor(nsIDOMEventTarget* aEventTarget,
*aCount = 0;
*aOutArray = nsnull;
nsCOMArray<nsIEventListenerInfo> listenerInfos;
nsCOMPtr<nsIDOMEventTarget> target = do_QueryInterface(aEventTarget);
if (target) {
nsCOMPtr<nsIEventListenerManager> elm =
target->GetListenerManager(PR_FALSE);
if (elm) {
elm->GetListenerInfo(&listenerInfos);
}
nsIEventListenerManager* elm =
aEventTarget->GetListenerManager(PR_FALSE);
if (elm) {
elm->GetListenerInfo(&listenerInfos);
}
PRInt32 count = listenerInfos.Count();
@ -235,11 +231,10 @@ nsEventListenerService::GetEventTargetChainFor(nsIDOMEventTarget* aEventTarget,
{
*aCount = 0;
*aOutArray = nsnull;
nsCOMPtr<nsIDOMEventTarget> target = do_QueryInterface(aEventTarget);
NS_ENSURE_ARG(target);
NS_ENSURE_ARG(aEventTarget);
nsEvent event(PR_TRUE, NS_EVENT_TYPE_NULL);
nsCOMArray<nsIDOMEventTarget> targets;
nsresult rv = nsEventDispatcher::Dispatch(target, nsnull, &event,
nsresult rv = nsEventDispatcher::Dispatch(aEventTarget, nsnull, &event,
nsnull, nsnull, nsnull, &targets);
NS_ENSURE_SUCCESS(rv, rv);
PRInt32 count = targets.Count();
@ -253,8 +248,7 @@ nsEventListenerService::GetEventTargetChainFor(nsIDOMEventTarget* aEventTarget,
NS_ENSURE_TRUE(*aOutArray, NS_ERROR_OUT_OF_MEMORY);
for (PRInt32 i = 0; i < count; ++i) {
nsCOMPtr<nsIDOMEventTarget> target = do_QueryInterface(targets[i]);
(*aOutArray)[i] = target.forget().get();
NS_ADDREF((*aOutArray)[i] = targets[i]);
}
*aCount = count;

1
content/events/src/nsEventListenerService.h
View File

@ -42,7 +42,6 @@
#include "nsIDOMEventListener.h"
#include "nsIDOMEventTarget.h"
#include "nsString.h"
#include "nsIDOMEventTarget.h"
#include "nsCycleCollectionParticipant.h"
#include "jsapi.h"

1
content/events/src/nsEventStateManager.cpp
View File

@ -88,7 +88,6 @@
#include "nsIDOMWindowInternal.h"
#include "nsPIDOMWindow.h"
#include "nsPIWindowRoot.h"
#include "nsIDOMEventTarget.h"
#include "nsIEnumerator.h"
#include "nsIDocShellTreeItem.h"
#include "nsIDocShellTreeNode.h"

1
content/html/content/src/nsHTMLInputElement.cpp
View File

@ -49,7 +49,6 @@
#include "nsContentCID.h"
#include "nsIComponentManager.h"
#include "nsIDOMHTMLFormElement.h"
#include "nsIDOMEventTarget.h"
#include "nsGkAtoms.h"
#include "nsStyleConsts.h"
#include "nsPresContext.h"

1
content/html/content/src/nsHTMLLinkElement.cpp
View File

@ -36,7 +36,6 @@
* ***** END LICENSE BLOCK ***** */
#include "nsIDOMHTMLLinkElement.h"
#include "nsIDOMLinkStyle.h"
#include "nsIDOMEventTarget.h"
#include "nsGenericHTMLElement.h"
#include "nsILink.h"
#include "nsGkAtoms.h"

10
content/smil/nsSMILTimeValueSpec.cpp
View File

@ -377,7 +377,7 @@ nsSMILTimeValueSpec::GetEventListenerManager(Element* aTarget,
NS_ABORT_IF_FALSE(aSystemGroup && !*aSystemGroup,
"Bad out param for system group");
nsCOMPtr<nsIDOMEventTarget> piTarget;
nsCOMPtr<nsIDOMEventTarget> target;
if (mParams.mType == nsSMILTimeValueSpecParams::ACCESSKEY) {
nsIDocument* doc = aTarget->GetCurrentDoc();
@ -386,14 +386,14 @@ nsSMILTimeValueSpec::GetEventListenerManager(Element* aTarget,
nsPIDOMWindow* win = doc->GetWindow();
if (!win)
return nsnull;
piTarget = do_QueryInterface(win);
target = do_QueryInterface(win);
} else {
piTarget = aTarget;
target = aTarget;
}
if (!piTarget)
if (!target)
return nsnull;
nsIEventListenerManager* elm = piTarget->GetListenerManager(PR_TRUE);
nsIEventListenerManager* elm = target->GetListenerManager(PR_TRUE);
if (!elm)
return nsnull;

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

@ -83,9 +83,8 @@ nsXBLEventHandler::HandleEvent(nsIDOMEvent* aEvent)
nsCOMPtr<nsIDOMEventTarget> target;
aEvent->GetCurrentTarget(getter_AddRefs(target));
nsCOMPtr<nsIDOMEventTarget> piTarget = do_QueryInterface(target);
mProtoHandler->ExecuteHandler(piTarget, aEvent);
mProtoHandler->ExecuteHandler(target, aEvent);
return NS_OK;
}
@ -133,7 +132,6 @@ nsXBLKeyEventHandler::ExecuteMatchedHandlers(nsIDOMKeyEvent* aKeyEvent,
nsCOMPtr<nsIDOMEventTarget> target;
aKeyEvent->GetCurrentTarget(getter_AddRefs(target));
nsCOMPtr<nsIDOMEventTarget> piTarget = do_QueryInterface(target);
PRBool executed = PR_FALSE;
for (PRUint32 i = 0; i < mProtoHandlers.Length(); ++i) {
@ -143,7 +141,7 @@ nsXBLKeyEventHandler::ExecuteMatchedHandlers(nsIDOMKeyEvent* aKeyEvent,
(hasAllowUntrustedAttr && handler->AllowUntrustedEvents()) ||
(!hasAllowUntrustedAttr && !mIsBoundToChrome)) &&
handler->KeyEventMatched(aKeyEvent, aCharCode, aIgnoreShiftKey)) {
handler->ExecuteHandler(piTarget, aKeyEvent);
handler->ExecuteHandler(target, aKeyEvent);
executed = PR_TRUE;
}
}

1
content/xul/content/src/nsXULElement.cpp
View File

@ -74,7 +74,6 @@
#include "nsIDOMFormListener.h"
#include "nsIDOMContextMenuListener.h"
#include "nsIDOMEventListener.h"
#include "nsIDOMEventTarget.h"
#include "nsIDOMNodeList.h"
#include "nsIDOMXULCommandDispatcher.h"
#include "nsIDOMXULElement.h"

6
content/xul/document/src/nsXULDocument.cpp
View File

@ -1717,8 +1717,7 @@ nsXULDocument::AddElementToDocumentPost(Element* aElement)
// Create our XUL key listener and hook it up.
nsCOMPtr<nsIXBLService> xblService(do_GetService("@mozilla.org/xbl;1"));
if (xblService) {
nsCOMPtr<nsIDOMEventTarget> piTarget(do_QueryInterface(aElement));
xblService->AttachGlobalKeyHandler(piTarget);
xblService->AttachGlobalKeyHandler(aElement);
}
}
@ -1793,8 +1792,7 @@ nsXULDocument::RemoveSubtreeFromDocument(nsIContent* aContent)
if (aElement->NodeInfo()->Equals(nsGkAtoms::keyset, kNameSpaceID_XUL)) {
nsCOMPtr<nsIXBLService> xblService(do_GetService("@mozilla.org/xbl;1"));
if (xblService) {
nsCOMPtr<nsIDOMEventTarget> piTarget(do_QueryInterface(aElement));
xblService->DetachGlobalKeyHandler(piTarget);
xblService->DetachGlobalKeyHandler(aElement);
}
}

7
docshell/base/nsDocShell.cpp
View File

@ -70,7 +70,6 @@
#include "nsIMarkupDocumentViewer.h"
#include "nsXPIDLString.h"
#include "nsReadableUtils.h"
#include "nsIDOMEventTarget.h"
#include "nsIDOMChromeWindow.h"
#include "nsIDOMWindowInternal.h"
#include "nsIWebBrowserChrome.h"
@ -1773,14 +1772,12 @@ nsDocShell::GetContentViewer(nsIContentViewer ** aContentViewer)
NS_IMETHODIMP
nsDocShell::SetChromeEventHandler(nsIDOMEventTarget* aChromeEventHandler)
{
nsCOMPtr<nsIDOMEventTarget> piTarget =
do_QueryInterface(aChromeEventHandler);
// Weak reference. Don't addref.
mChromeEventHandler = piTarget;
mChromeEventHandler = aChromeEventHandler;
nsCOMPtr<nsPIDOMWindow> win(do_QueryInterface(mScriptGlobal));
if (win) {
win->SetChromeEventHandler(piTarget);
win->SetChromeEventHandler(aChromeEventHandler);
}
return NS_OK;

10
dom/base/nsDOMClassInfo.cpp
View File

@ -7749,15 +7749,15 @@ nsEventReceiverSH::RegisterCompileHandler(nsIXPConnectWrappedNative *wrapper,
nsIScriptContext *script_cx = nsJSUtils::GetStaticScriptContext(cx, obj);
NS_ENSURE_TRUE(script_cx, NS_ERROR_UNEXPECTED);
nsCOMPtr<nsIDOMEventTarget> piTarget =
nsCOMPtr<nsIDOMEventTarget> target =
do_QueryWrappedNative(wrapper, obj);
if (!piTarget) {
if (!target) {
// Doesn't do events
NS_WARNING("Doesn't QI to nsIDOMEventTarget?");
return NS_OK;
}
nsIEventListenerManager* manager = piTarget->GetListenerManager(PR_TRUE);
nsIEventListenerManager* manager = target->GetListenerManager(PR_TRUE);
NS_ENSURE_TRUE(manager, NS_ERROR_UNEXPECTED);
nsCOMPtr<nsIAtom> atom(do_GetAtom(nsDependentJSString(id)));
@ -7768,12 +7768,12 @@ nsEventReceiverSH::RegisterCompileHandler(nsIXPConnectWrappedNative *wrapper,
JSObject *scope = ::JS_GetGlobalForObject(cx, obj);
if (compile) {
rv = manager->CompileScriptEventListener(script_cx, scope, piTarget, atom,
rv = manager->CompileScriptEventListener(script_cx, scope, target, atom,
did_define);
} else if (remove) {
rv = manager->RemoveScriptEventListener(atom);
} else {
rv = manager->RegisterScriptEventListener(script_cx, scope, piTarget,
rv = manager->RegisterScriptEventListener(script_cx, scope, target,
atom);
}

4
dom/base/nsGlobalWindow.cpp
View File

@ -1851,9 +1851,7 @@ nsGlobalWindow::SetNewDocument(nsIDocument* aDocument,
if (internal == static_cast<nsIDOMWindowInternal *>(this)) {
nsCOMPtr<nsIXBLService> xblService = do_GetService("@mozilla.org/xbl;1");
if (xblService) {
nsCOMPtr<nsIDOMEventTarget> piTarget =
do_QueryInterface(mChromeEventHandler);
xblService->AttachGlobalKeyHandler(piTarget);
xblService->AttachGlobalKeyHandler(mChromeEventHandler);
}
}
}

1
dom/base/nsGlobalWindow.h
View File

@ -102,7 +102,6 @@
#include "nsIDOMStorageEvent.h"
#include "nsIDOMStorageIndexedDB.h"
#include "nsIDOMOfflineResourceList.h"
#include "nsIDOMEventTarget.h"
#include "nsIArray.h"
#include "nsIContent.h"
#include "nsIIDBFactory.h"

1
dom/base/nsWindowRoot.h
View File

@ -51,7 +51,6 @@ class nsEventChainPostVisitor;
#include "nsIDOM3EventTarget.h"
#include "nsIEventListenerManager.h"
#include "nsPIWindowRoot.h"
#include "nsIDOMEventTarget.h"
#include "nsCycleCollectionParticipant.h"
class nsWindowRoot : public nsIDOM3EventTarget,

1
dom/src/threads/nsDOMWorkerXHRProxy.cpp
View File

@ -40,7 +40,6 @@
// Interfaces
#include "nsIDOMEvent.h"
#include "nsIDOMEventTarget.h"
#include "nsIDOMProgressEvent.h"
#include "nsILoadGroup.h"
#include "nsIRequest.h"

7
editor/libeditor/base/nsEditor.cpp
View File

@ -43,9 +43,7 @@
#include "nsIDOMDocument.h"
#include "nsIDOMHTMLElement.h"
#include "nsIDOMNSHTMLElement.h"
#include "nsIDOMEventTarget.h"
#include "nsIDOMNSEvent.h"
#include "nsIDOMEventTarget.h"
#include "nsIMEStateManager.h"
#include "nsFocusManager.h"
#include "nsUnicharUtils.h"
@ -60,7 +58,6 @@
#include "nsIDOMNodeList.h"
#include "nsIDOMRange.h"
#include "nsIDOMHTMLBRElement.h"
#include "nsIDOMEventTarget.h"
#include "nsIDocument.h"
#include "nsITransactionManager.h"
#include "nsIAbsorbingTransaction.h"
@ -5237,7 +5234,7 @@ nsEditor::GetNativeKeyEvent(nsIDOMKeyEvent* aDOMKeyEvent)
already_AddRefed<nsIContent>
nsEditor::GetFocusedContent()
{
nsCOMPtr<nsIDOMEventTarget> piTarget = GetPIDOMEventTarget();
nsCOMPtr<nsIDOMEventTarget> piTarget = GetDOMEventTarget();
if (!piTarget) {
return nsnull;
}
@ -5252,7 +5249,7 @@ nsEditor::GetFocusedContent()
PRBool
nsEditor::IsActiveInDOMWindow()
{
nsCOMPtr<nsIDOMEventTarget> piTarget = GetPIDOMEventTarget();
nsCOMPtr<nsIDOMEventTarget> piTarget = GetDOMEventTarget();
if (!piTarget) {
return PR_FALSE;
}

2
editor/libeditor/base/nsEditor.h
View File

@ -613,7 +613,7 @@ public:
nsIDOMNode *aEndNode,
PRInt32 aEndOffset);
virtual already_AddRefed<nsIDOMEventTarget> GetPIDOMEventTarget() = 0;
virtual already_AddRefed<nsIDOMEventTarget> GetDOMEventTarget() = 0;
// Fast non-refcounting editor root element accessor
nsIDOMElement *GetRoot();

5
editor/libeditor/base/nsEditorEventListener.cpp
View File

@ -69,7 +69,6 @@
#include "nsISupportsPrimitives.h"
#include "nsIDOMNSRange.h"
#include "nsEditorUtils.h"
#include "nsIDOMEventTarget.h"
#include "nsISelectionPrivate.h"
#include "nsIDOMDragEvent.h"
#include "nsIFocusManager.h"
@ -125,7 +124,7 @@ nsEditorEventListener::InstallToEditor()
{
NS_PRECONDITION(mEditor, "The caller must set mEditor");
nsCOMPtr<nsIDOMEventTarget> piTarget = mEditor->GetPIDOMEventTarget();
nsCOMPtr<nsIDOMEventTarget> piTarget = mEditor->GetDOMEventTarget();
NS_ENSURE_TRUE(piTarget, NS_ERROR_FAILURE);
nsresult rv;
@ -204,7 +203,7 @@ nsEditorEventListener::Disconnect()
void
nsEditorEventListener::UninstallFromEditor()
{
nsCOMPtr<nsIDOMEventTarget> piTarget = mEditor->GetPIDOMEventTarget();
nsCOMPtr<nsIDOMEventTarget> piTarget = mEditor->GetDOMEventTarget();
if (!piTarget) {
return;
}

4
editor/libeditor/html/nsHTMLAbsPosition.cpp
View File

@ -411,7 +411,7 @@ nsHTMLEditor::GrabberClicked()
mMouseMotionListenerP = new ResizerMouseMotionListener(this);
if (!mMouseMotionListenerP) {return NS_ERROR_NULL_POINTER;}
nsCOMPtr<nsIDOMEventTarget> piTarget = GetPIDOMEventTarget();
nsCOMPtr<nsIDOMEventTarget> piTarget = GetDOMEventTarget();
NS_ENSURE_TRUE(piTarget, NS_ERROR_FAILURE);
res = piTarget->AddEventListenerByIID(mMouseMotionListenerP,
@ -441,7 +441,7 @@ nsHTMLEditor::EndMoving()
mPositioningShadow = nsnull;
}
nsCOMPtr<nsIDOMEventTarget> piTarget = GetPIDOMEventTarget();
nsCOMPtr<nsIDOMEventTarget> piTarget = GetDOMEventTarget();
if (piTarget && mMouseMotionListenerP) {
#ifdef DEBUG

15
editor/libeditor/html/nsHTMLEditor.cpp
View File

@ -473,10 +473,9 @@ nsHTMLEditor::RemoveEventListeners()
return;
}
nsCOMPtr<nsIDOMEventTarget> piTarget = GetPIDOMEventTarget();
nsCOMPtr<nsIDOMEventTarget> target = do_QueryInterface(piTarget);
nsCOMPtr<nsIDOMEventTarget> target = GetDOMEventTarget();
if (piTarget && target)
if (target)
{
// Both mMouseMotionListenerP and mResizeEventListenerP can be
// registerd with other targets than the DOM event receiver that
@ -489,8 +488,8 @@ nsHTMLEditor::RemoveEventListeners()
{
// mMouseMotionListenerP might be registerd either by IID or
// name, unregister by both.
piTarget->RemoveEventListenerByIID(mMouseMotionListenerP,
NS_GET_IID(nsIDOMMouseMotionListener));
target->RemoveEventListenerByIID(mMouseMotionListenerP,
NS_GET_IID(nsIDOMMouseMotionListener));
target->RemoveEventListener(NS_LITERAL_STRING("mousemove"),
mMouseMotionListenerP, PR_TRUE);
@ -5827,14 +5826,14 @@ nsHTMLEditor::IsActiveInDOMWindow()
}
already_AddRefed<nsIDOMEventTarget>
nsHTMLEditor::GetPIDOMEventTarget()
nsHTMLEditor::GetDOMEventTarget()
{
// Don't use getDocument here, because we have no way of knowing
// whether Init() was ever called. So we need to get the document
// ourselves, if it exists.
NS_PRECONDITION(mDocWeak, "This editor has not been initialized yet");
nsCOMPtr<nsIDOMEventTarget> piTarget = do_QueryReferent(mDocWeak.get());
return piTarget.forget();
nsCOMPtr<nsIDOMEventTarget> target = do_QueryReferent(mDocWeak.get());
return target.forget();
}
PRBool

2
editor/libeditor/html/nsHTMLEditor.h
View File

@ -151,7 +151,7 @@ public:
virtual nsresult HandleKeyPressEvent(nsIDOMKeyEvent* aKeyEvent);
virtual already_AddRefed<nsIContent> GetFocusedContent();
virtual PRBool IsActiveInDOMWindow();
virtual already_AddRefed<nsIDOMEventTarget> GetPIDOMEventTarget();
virtual already_AddRefed<nsIDOMEventTarget> GetDOMEventTarget();
virtual already_AddRefed<nsIContent> FindSelectionRoot(nsINode *aNode);
virtual PRBool IsAcceptableInputEvent(nsIDOMEvent* aEvent);

7
editor/libeditor/html/nsHTMLObjectResizer.cpp
View File

@ -38,7 +38,6 @@
#include "nsHTMLObjectResizer.h"
#include "nsIDOMEventTarget.h"
#include "nsIDOMNSHTMLElement.h"
#include "nsIDOMEventTarget.h"
#include "nsIDOMText.h"
@ -497,8 +496,7 @@ nsHTMLEditor::HideResizers(void)
// don't forget to remove the listeners !
nsCOMPtr<nsIDOMEventTarget> piTarget = GetPIDOMEventTarget();
nsCOMPtr<nsIDOMEventTarget> target = do_QueryInterface(piTarget);
nsCOMPtr<nsIDOMEventTarget> target = GetDOMEventTarget();
if (target && mMouseMotionListenerP)
{
@ -606,8 +604,7 @@ nsHTMLEditor::StartResizing(nsIDOMElement *aHandle)
return NS_ERROR_OUT_OF_MEMORY;
}
nsCOMPtr<nsIDOMEventTarget> piTarget = GetPIDOMEventTarget();
nsCOMPtr<nsIDOMEventTarget> target = do_QueryInterface(piTarget);
nsCOMPtr<nsIDOMEventTarget> target = GetDOMEventTarget();
NS_ENSURE_TRUE(target, NS_ERROR_FAILURE);
result = target->AddEventListener(NS_LITERAL_STRING("mousemove"),

2
editor/libeditor/text/nsPlaintextEditor.cpp
View File

@ -1716,7 +1716,7 @@ nsPlaintextEditor::SelectEntireDocument(nsISelection *aSelection)
}
already_AddRefed<nsIDOMEventTarget>
nsPlaintextEditor::GetPIDOMEventTarget()
nsPlaintextEditor::GetDOMEventTarget()
{
NS_IF_ADDREF(mEventTarget);
return mEventTarget.get();

2
editor/libeditor/text/nsPlaintextEditor.h
View File

@ -145,7 +145,7 @@ public:
virtual nsresult HandleKeyPressEvent(nsIDOMKeyEvent* aKeyEvent);
virtual already_AddRefed<nsIDOMEventTarget> GetPIDOMEventTarget();
virtual already_AddRefed<nsIDOMEventTarget> GetDOMEventTarget();
virtual nsresult BeginIMEComposition();
virtual nsresult UpdateIMEComposition(const nsAString &aCompositionString,

27
embedding/browser/webBrowser/nsDocShellTreeOwner.cpp
View File

@ -74,7 +74,6 @@
#include "nsIDOMEvent.h"
#include "nsIDOMMouseEvent.h"
#include "nsIDOMNSUIEvent.h"
#include "nsIDOMEventTarget.h"
#include "nsIDOMNamedNodeMap.h"
#include "nsIFormControl.h"
#include "nsIDOMHTMLInputElement.h"
@ -102,7 +101,6 @@
#include "nsPresContext.h"
#include "nsIViewManager.h"
#include "nsIView.h"
#include "nsIDOMEventTarget.h"
#include "nsIEventListenerManager.h"
#include "nsIDOMEventGroup.h"
#include "nsIDOMDragEvent.h"
@ -115,7 +113,7 @@
// a |nsIDOMEventTarget| via the window root and chrome event handler.
//
static nsresult
GetPIDOMEventTarget( nsWebBrowser* inBrowser, nsIDOMEventTarget** aTarget)
GetDOMEventTarget( nsWebBrowser* inBrowser, nsIDOMEventTarget** aTarget)
{
NS_ENSURE_ARG_POINTER(inBrowser);
@ -127,11 +125,10 @@ GetPIDOMEventTarget( nsWebBrowser* inBrowser, nsIDOMEventTarget** aTarget)
NS_ENSURE_TRUE(domWindowPrivate, NS_ERROR_FAILURE);
nsPIDOMWindow *rootWindow = domWindowPrivate->GetPrivateRoot();
NS_ENSURE_TRUE(rootWindow, NS_ERROR_FAILURE);
nsCOMPtr<nsIDOMEventTarget> piTarget =
do_QueryInterface(rootWindow->GetChromeEventHandler());
NS_ENSURE_TRUE(piTarget, NS_ERROR_FAILURE);
*aTarget = piTarget;
NS_IF_ADDREF(*aTarget);
nsCOMPtr<nsIDOMEventTarget> target =
rootWindow->GetChromeEventHandler();
NS_ENSURE_TRUE(target, NS_ERROR_FAILURE);
target.forget(aTarget);
return NS_OK;
}
@ -888,12 +885,12 @@ nsDocShellTreeOwner::AddChromeListeners()
}
// register dragover and drop event listeners with the listener manager
nsCOMPtr<nsIDOMEventTarget> piTarget;
GetPIDOMEventTarget(mWebBrowser, getter_AddRefs(piTarget));
nsCOMPtr<nsIDOMEventTarget> target;
GetDOMEventTarget(mWebBrowser, getter_AddRefs(target));
nsCOMPtr<nsIDOMEventGroup> sysGroup;
piTarget->GetSystemEventGroup(getter_AddRefs(sysGroup));
nsIEventListenerManager* elmP = piTarget->GetListenerManager(PR_TRUE);
target->GetSystemEventGroup(getter_AddRefs(sysGroup));
nsIEventListenerManager* elmP = target->GetListenerManager(PR_TRUE);
if (sysGroup && elmP)
{
rv = elmP->AddEventListenerByType(this, NS_LITERAL_STRING("dragover"),
@ -923,7 +920,7 @@ nsDocShellTreeOwner::RemoveChromeListeners()
}
nsCOMPtr<nsIDOMEventTarget> piTarget;
GetPIDOMEventTarget(mWebBrowser, getter_AddRefs(piTarget));
GetDOMEventTarget(mWebBrowser, getter_AddRefs(piTarget));
if (!piTarget)
return NS_OK;
@ -1246,7 +1243,7 @@ NS_IMETHODIMP
ChromeTooltipListener::AddChromeListeners()
{
if (!mEventTarget)
GetPIDOMEventTarget(mWebBrowser, getter_AddRefs(mEventTarget));
GetDOMEventTarget(mWebBrowser, getter_AddRefs(mEventTarget));
// Register the appropriate events for tooltips, but only if
// the embedding chrome cares.
@ -1729,7 +1726,7 @@ NS_IMETHODIMP
ChromeContextMenuListener::AddChromeListeners()
{
if (!mEventTarget)
GetPIDOMEventTarget(mWebBrowser, getter_AddRefs(mEventTarget));
GetDOMEventTarget(mWebBrowser, getter_AddRefs(mEventTarget));
// Register the appropriate events for context menus, but only if
// the embedding chrome cares.

1
embedding/browser/webBrowser/nsDocShellTreeOwner.h
View File

@ -52,7 +52,6 @@
#include "nsIWebBrowserChrome.h"
#include "nsIDOMMouseListener.h"
#include "nsIDOMDocument.h"
#include "nsIDOMEventTarget.h"
#include "nsIEmbeddingSiteWindow.h"
#include "nsIWebProgressListener.h"
#include "nsWeakReference.h"

1
extensions/spellcheck/src/mozInlineSpellChecker.cpp
View File

@ -73,7 +73,6 @@
#include "nsIDOMDocument.h"
#include "nsIDOMElement.h"
#include "nsIDOMEventTarget.h"
#include "nsIDOMEventTarget.h"
#include "nsIDOMMouseEvent.h"
#include "nsIDOMKeyEvent.h"
#include "nsIDOMNode.h"

27
extensions/widgetutils/src/nsWidgetUtils.cpp
View File

@ -450,10 +450,7 @@ nsWidgetUtils::GetChromeEventHandler(nsIDOMWindow *aDOMWin,
chromeEventHandler = privateDOMWindow->GetChromeEventHandler();
}
nsCOMPtr<nsIDOMEventTarget> target(do_QueryInterface(chromeEventHandler));
*aChromeTarget = target;
NS_IF_ADDREF(*aChromeTarget);
NS_IF_ADDREF(*aChromeTarget = chromeEventHandler);
}
void
@ -467,17 +464,18 @@ nsWidgetUtils::RemoveWindowListeners(nsIDOMWindow *aDOMWin)
}
// Use capturing, otherwise the normal find next will get activated when ours should
nsCOMPtr<nsIDOMEventTarget> piTarget(do_QueryInterface(chromeEventHandler));
// Remove DOM Text listener for IME text events
rv = piTarget->RemoveEventListenerByIID(static_cast<nsIDOMMouseListener*>(this),
NS_GET_IID(nsIDOMMouseListener));
rv = chromeEventHandler->
RemoveEventListenerByIID(static_cast<nsIDOMMouseListener*>(this),
NS_GET_IID(nsIDOMMouseListener));
if (NS_FAILED(rv)) {
NS_WARNING("Failed to add Mouse Motion listener\n");
return;
}
rv = piTarget->RemoveEventListenerByIID(static_cast<nsIDOMMouseMotionListener*>(this),
NS_GET_IID(nsIDOMMouseMotionListener));
rv = chromeEventHandler->
RemoveEventListenerByIID(static_cast<nsIDOMMouseMotionListener*>(this),
NS_GET_IID(nsIDOMMouseMotionListener));
if (NS_FAILED(rv)) {
NS_WARNING("Failed to add Mouse Motion listener\n");
return;
@ -495,17 +493,18 @@ nsWidgetUtils::AttachWindowListeners(nsIDOMWindow *aDOMWin)
}
// Use capturing, otherwise the normal find next will get activated when ours should
nsCOMPtr<nsIDOMEventTarget> piTarget(do_QueryInterface(chromeEventHandler));
// Attach menu listeners, this will help us ignore keystrokes meant for menus
rv = piTarget->AddEventListenerByIID(static_cast<nsIDOMMouseListener*>(this),
NS_GET_IID(nsIDOMMouseListener));
rv = chromeEventHandler->
AddEventListenerByIID(static_cast<nsIDOMMouseListener*>(this),
NS_GET_IID(nsIDOMMouseListener));
if (NS_FAILED(rv)) {
NS_WARNING("Failed to add Mouse Motion listener\n");
return;
}
rv = piTarget->AddEventListenerByIID(static_cast<nsIDOMMouseMotionListener*>(this),
NS_GET_IID(nsIDOMMouseMotionListener));
rv = chromeEventHandler->
AddEventListenerByIID(static_cast<nsIDOMMouseMotionListener*>(this),
NS_GET_IID(nsIDOMMouseMotionListener));
if (NS_FAILED(rv)) {
NS_WARNING("Failed to add Mouse Motion listener\n");
return;

1
layout/forms/nsListControlFrame.cpp
View File

@ -70,7 +70,6 @@
#include "nsILookAndFeel.h"
#include "nsFontMetrics.h"
#include "nsIScrollableFrame.h"
#include "nsIDOMEventTarget.h"
#include "nsIDOMNSEvent.h"
#include "nsGUIEvent.h"
#include "nsIServiceManager.h"

1
layout/xul/base/src/nsMenuBarListener.cpp
View File

@ -42,7 +42,6 @@
#include "nsMenuBarFrame.h"
#include "nsMenuPopupFrame.h"
#include "nsIDOMKeyListener.h"
#include "nsIDOMEventTarget.h"
#include "nsIDOMEventListener.h"
#include "nsIDOMNSUIEvent.h"
#include "nsIDOMNSEvent.h"

12
toolkit/components/satchel/nsFormFillController.cpp
View File

@ -1123,11 +1123,9 @@ nsFormFillController::AddWindowListeners(nsIDOMWindow *aWindow)
return;
nsCOMPtr<nsPIDOMWindow> privateDOMWindow(do_QueryInterface(aWindow));
nsIDOMEventTarget* chromeEventHandler = nsnull;
nsIDOMEventTarget* target = nsnull;
if (privateDOMWindow)
chromeEventHandler = privateDOMWindow->GetChromeEventHandler();
nsCOMPtr<nsIDOMEventTarget> target(do_QueryInterface(chromeEventHandler));
target = privateDOMWindow->GetChromeEventHandler();
if (!target)
return;
@ -1185,12 +1183,10 @@ nsFormFillController::RemoveWindowListeners(nsIDOMWindow *aWindow)
mPwmgrInputs.Enumerate(RemoveForDOMDocumentEnumerator, domDoc);
nsCOMPtr<nsPIDOMWindow> privateDOMWindow(do_QueryInterface(aWindow));
nsIDOMEventTarget* chromeEventHandler = nsnull;
nsIDOMEventTarget* target = nsnull;
if (privateDOMWindow)
chromeEventHandler = privateDOMWindow->GetChromeEventHandler();
target = privateDOMWindow->GetChromeEventHandler();
nsCOMPtr<nsIDOMEventTarget> target(do_QueryInterface(chromeEventHandler));
if (!target)
return;