mozilla
/
gecko-dev
зеркало из https://github.com/mozilla/gecko-dev.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

Bug 658714 Part 5: Search'n'replace nsPIDOMEventTarget to nsIDOMEventTarget. r=smaug

This commit is contained in:
Jonas Sicking 2011-06-23 19:18:00 -07:00
Родитель d16541209b
Коммит 07c1f0b90f
67 изменённых файлов: 178 добавлений и 360 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

2
accessible/src/base/nsAccDocManager.cpp
Просмотреть файл

@ -391,7 +391,7 @@ nsAccDocManager::AddListeners(nsIDocument *aDocument,
PRBool aAddDOMContentLoadedListener)
{
nsPIDOMWindow *window = aDocument->GetWindow();
nsPIDOMEventTarget *target = window->GetChromeEventHandler();
nsIDOMEventTarget *target = window->GetChromeEventHandler();
nsIEventListenerManager* elm = target->GetListenerManager(PR_TRUE);
elm->AddEventListenerByType(this, NS_LITERAL_STRING("pagehide"),
NS_EVENT_FLAG_CAPTURE, nsnull);

8
content/base/public/nsDOMEventTargetWrapperCache.h
Просмотреть файл

@ -69,15 +69,15 @@ public:
static nsDOMEventTargetWrapperCache* FromSupports(nsISupports* aSupports)
{
nsPIDOMEventTarget* target =
static_cast<nsPIDOMEventTarget*>(aSupports);
nsIDOMEventTarget* target =
static_cast<nsIDOMEventTarget*>(aSupports);
#ifdef DEBUG
{
nsCOMPtr<nsPIDOMEventTarget> target_qi =
nsCOMPtr<nsIDOMEventTarget> target_qi =
do_QueryInterface(aSupports);
// If this assertion fires the QI implementation for the object in
// question doesn't use the nsPIDOMEventTarget pointer as the
// question doesn't use the nsIDOMEventTarget pointer as the
// nsISupports pointer. That must be fixed, or we'll crash...
NS_ASSERTION(target_qi == target, "Uh, fix QI!");
}

2
content/base/public/nsINode.h
Просмотреть файл

@ -38,7 +38,7 @@
#ifndef nsINode_h___
#define nsINode_h___
#include "nsPIDOMEventTarget.h"
#include "nsIDOMEventTarget.h"
#include "nsEvent.h"
#include "nsPropertyTable.h"
#include "nsTObserverArray.h"

10
content/base/src/nsContentUtils.cpp
Просмотреть файл

@ -2509,7 +2509,7 @@ IsContextOnStack(nsIJSContextStack *aStack, JSContext *aContext)
}
PRBool
nsCxPusher::Push(nsPIDOMEventTarget *aCurrentTarget)
nsCxPusher::Push(nsIDOMEventTarget *aCurrentTarget)
{
if (mPushedSomething) {
NS_ERROR("Whaaa! No double pushing with nsCxPusher::Push()!");
@ -2551,7 +2551,7 @@ nsCxPusher::Push(nsPIDOMEventTarget *aCurrentTarget)
}
PRBool
nsCxPusher::RePush(nsPIDOMEventTarget *aCurrentTarget)
nsCxPusher::RePush(nsIDOMEventTarget *aCurrentTarget)
{
if (!mPushedSomething) {
return Push(aCurrentTarget);
@ -3050,7 +3050,7 @@ nsContentUtils::DispatchChromeEvent(nsIDocument *aDoc,
if (!aDoc->GetWindow())
return NS_ERROR_INVALID_ARG;
nsPIDOMEventTarget* piTarget = aDoc->GetWindow()->GetChromeEventHandler();
nsIDOMEventTarget* piTarget = aDoc->GetWindow()->GetChromeEventHandler();
if (!piTarget)
return NS_ERROR_INVALID_ARG;
@ -3058,7 +3058,7 @@ nsContentUtils::DispatchChromeEvent(nsIDocument *aDoc,
if (flo) {
nsRefPtr<nsFrameLoader> fl = flo->GetFrameLoader();
if (fl) {
nsPIDOMEventTarget* t = fl->GetTabChildGlobalAsEventTarget();
nsIDOMEventTarget* t = fl->GetTabChildGlobalAsEventTarget();
piTarget = t ? t : piTarget;
}
}
@ -3242,7 +3242,7 @@ nsContentUtils::HasMutationListeners(nsINode* aNode,
// If we have a window, we can check it for mutation listeners now.
if (aNode->IsInDoc()) {
nsCOMPtr<nsPIDOMEventTarget> piTarget(do_QueryInterface(window));
nsCOMPtr<nsIDOMEventTarget> piTarget(do_QueryInterface(window));
if (piTarget) {
nsIEventListenerManager* manager = piTarget->GetListenerManager(PR_FALSE);
if (manager) {

2
content/base/src/nsDOMEventTargetWrapperCache.cpp
Просмотреть файл

@ -43,7 +43,7 @@
nsDOMEventTargetWrapperCache::~nsDOMEventTargetWrapperCache()
{
nsISupports *supports = static_cast<nsPIDOMEventTarget*>(this);
nsISupports *supports = static_cast<nsIDOMEventTarget*>(this);
nsContentUtils::ReleaseWrapper(supports, this);
}

10
content/base/src/nsDocument.cpp
Просмотреть файл

@ -6235,7 +6235,7 @@ nsDocument::PreHandleEvent(nsEventChainPreVisitor& aVisitor)
// Load events must not propagate to |window| object, see bug 335251.
if (aVisitor.mEvent->message != NS_LOAD) {
nsGlobalWindow* window = static_cast<nsGlobalWindow*>(GetWindow());
aVisitor.mParentTarget = static_cast<nsPIDOMEventTarget*>(window);
aVisitor.mParentTarget = static_cast<nsIDOMEventTarget*>(window);
}
return NS_OK;
}
@ -6999,7 +6999,7 @@ nsDocument::CanSavePresentation(nsIRequest *aNewRequest)
}
// Check our event listener manager for unload/beforeunload listeners.
nsCOMPtr<nsPIDOMEventTarget> piTarget = do_QueryInterface(mScriptGlobalObject);
nsCOMPtr<nsIDOMEventTarget> piTarget = do_QueryInterface(mScriptGlobalObject);
if (piTarget) {
nsIEventListenerManager* manager =
piTarget->GetListenerManager(PR_FALSE);
@ -7311,7 +7311,7 @@ nsDocument::CheckAncestryAndGetFrame(nsIDocument* aDocument) const
}
void
nsDocument::DispatchPageTransition(nsPIDOMEventTarget* aDispatchTarget,
nsDocument::DispatchPageTransition(nsIDOMEventTarget* aDispatchTarget,
const nsAString& aType,
PRBool aPersisted)
{
@ -7381,7 +7381,7 @@ nsDocument::OnPageShow(PRBool aPersisted,
SetImagesNeedAnimating(PR_TRUE);
}
nsCOMPtr<nsPIDOMEventTarget> target =
nsCOMPtr<nsIDOMEventTarget> target =
aDispatchStartTarget ? do_QueryInterface(aDispatchStartTarget) :
do_QueryInterface(GetWindow());
DispatchPageTransition(target, NS_LITERAL_STRING("pageshow"), aPersisted);
@ -7434,7 +7434,7 @@ nsDocument::OnPageHide(PRBool aPersisted,
}
// Now send out a PageHide event.
nsCOMPtr<nsPIDOMEventTarget> target =
nsCOMPtr<nsIDOMEventTarget> target =
aDispatchStartTarget ? do_QueryInterface(aDispatchStartTarget) :
do_QueryInterface(GetWindow());
DispatchPageTransition(target, NS_LITERAL_STRING("pagehide"), aPersisted);

2
content/base/src/nsDocument.h
Просмотреть файл

@ -997,7 +997,7 @@ protected:
return kNameSpaceID_None;
}
void DispatchPageTransition(nsPIDOMEventTarget* aDispatchTarget,
void DispatchPageTransition(nsIDOMEventTarget* aDispatchTarget,
const nsAString& aType,
PRBool aPersisted);

6
content/base/src/nsFrameLoader.cpp
Просмотреть файл

@ -1904,9 +1904,9 @@ public:
nsInProcessTabChildGlobal* tabChild =
static_cast<nsInProcessTabChildGlobal*>(mFrameLoader->mChildMessageManager.get());
if (tabChild && tabChild->GetInnerManager()) {
nsFrameScriptCx cx(static_cast<nsPIDOMEventTarget*>(tabChild), tabChild);
nsFrameScriptCx cx(static_cast<nsIDOMEventTarget*>(tabChild), tabChild);
nsRefPtr<nsFrameMessageManager> mm = tabChild->GetInnerManager();
mm->ReceiveMessage(static_cast<nsPIDOMEventTarget*>(tabChild), mMessage,
mm->ReceiveMessage(static_cast<nsIDOMEventTarget*>(tabChild), mMessage,
PR_FALSE, mJSON, nsnull, nsnull);
}
return NS_OK;
@ -2056,7 +2056,7 @@ nsFrameLoader::EnsureMessageManager()
return NS_OK;
}
nsPIDOMEventTarget*
nsIDOMEventTarget*
nsFrameLoader::GetTabChildGlobalAsEventTarget()
{
return static_cast<nsInProcessTabChildGlobal*>(mChildMessageManager.get());

2
content/base/src/nsFrameLoader.h
Просмотреть файл

@ -196,7 +196,7 @@ public:
nsresult ReallyStartLoading();
void Finalize();
nsIDocShell* GetExistingDocShell() { return mDocShell; }
nsPIDOMEventTarget* GetTabChildGlobalAsEventTarget();
nsIDOMEventTarget* GetTabChildGlobalAsEventTarget();
nsresult CreateStaticClone(nsIFrameLoader* aDest);
/**

2
content/base/src/nsInProcessTabChildGlobal.cpp
Просмотреть файл

@ -309,7 +309,7 @@ nsInProcessTabChildGlobal::InitTabChildGlobal()
nsIXPConnect::FLAG_SYSTEM_GLOBAL_OBJECT;
nsISupports* scopeSupports =
NS_ISUPPORTS_CAST(nsPIDOMEventTarget*, this);
NS_ISUPPORTS_CAST(nsIDOMEventTarget*, this);
JS_SetContextPrivate(cx, scopeSupports);
nsresult rv =

6
content/base/src/nsWebSocket.cpp
Просмотреть файл

@ -1127,10 +1127,10 @@ nsWebSocket::UpdateMustKeepAlive()
if (mKeepingAlive && !shouldKeepAlive) {
mKeepingAlive = PR_FALSE;
static_cast<nsPIDOMEventTarget*>(this)->Release();
static_cast<nsIDOMEventTarget*>(this)->Release();
} else if (!mKeepingAlive && shouldKeepAlive) {
mKeepingAlive = PR_TRUE;
static_cast<nsPIDOMEventTarget*>(this)->AddRef();
static_cast<nsIDOMEventTarget*>(this)->AddRef();
}
}
@ -1140,7 +1140,7 @@ nsWebSocket::DontKeepAliveAnyMore()
NS_ABORT_IF_FALSE(NS_IsMainThread(), "Not running on main thread");
if (mKeepingAlive) {
mKeepingAlive = PR_FALSE;
static_cast<nsPIDOMEventTarget*>(this)->Release();
static_cast<nsIDOMEventTarget*>(this)->Release();
}
mCheckMustKeepAlive = PR_FALSE;
}

1
content/events/public/Makefile.in
Просмотреть файл

@ -53,7 +53,6 @@ EXPORTS = \
nsIPrivateTextRange.h \
nsPLDOMEvent.h \
nsEventDispatcher.h \
nsPIDOMEventTarget.h \
nsEventStates.h \
$(NULL)

181
content/events/public/nsPIDOMEventTarget.h
Просмотреть файл

@ -1,181 +0,0 @@
/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
/* ***** BEGIN LICENSE BLOCK *****
* Version: MPL 1.1/GPL 2.0/LGPL 2.1
*
* The contents of this file are subject to the Mozilla Public License
* Version 1.1 (the "License"); you may not use this file except in
* compliance with the License. You may obtain a copy of the License at
* http://www.mozilla.org/MPL/
*
* Software distributed under the License is distributed on an "AS IS" basis,
* WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
* for the specific language governing rights and limitations under the
* License.
*
* The Original Code is Mozilla.org code.
*
* The Initial Developer of the Original Code is Mozilla.org.
* Portions created by the Initial Developer are Copyright (C) 2006
* the Initial Developer. All Rights Reserved.
*
* Contributor(s):
* Olli Pettay <Olli.Pettay@helsinki.fi> (Original Author)
*
* Alternatively, the contents of this file may be used under the terms of
* either the GNU General Public License Version 2 or later (the "GPL"), or
* the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
* in which case the provisions of the GPL or the LGPL are applicable instead
* of those above. If you wish to allow use of your version of this file only
* under the terms of either the GPL or the LGPL, and not to allow others to
* use your version of this file under the terms of the MPL, indicate your
* decision by deleting the provisions above and replace them with the notice
* and other provisions required by the GPL or the LGPL. If you do not delete
* the provisions above, a recipient may use your version of this file under
* the terms of any one of the MPL, the GPL or the LGPL.
*
* ***** END LICENSE BLOCK ***** */
#ifndef nsPIDOMEventTarget_h_
#define nsPIDOMEventTarget_h_
#include "nsIDOMEventTarget.h"
#if 0
#include "nsEvent.h"
class nsIDOMEvent;
class nsPresContext;
class nsEventChainPreVisitor;
class nsEventChainPostVisitor;
class nsIEventListenerManager;
class nsIDOMEventListener;
class nsIDOMEventGroup;
class nsIScriptContext;
struct JSContext;
// 89292f3a-535d-4ba0-882a-10cff9e21bcc
#define NS_PIDOMEVENTTARGET_IID \
{ 0x89292f3a, 0x535d, 0x4ba0, \
{ 0x88, 0x2a, 0x10, 0xcf, 0xf9, 0xe2, 0x1b, 0xcc } }
class nsPIDOMEventTarget : public nsISupports
{
public:
NS_DECLARE_STATIC_IID_ACCESSOR(NS_PIDOMEVENTTARGET_IID)
/**
* Returns the nsPIDOMEventTarget object which should be used as the target
* of DOMEvents.
* Usually |this| is returned, but for example global object returns
* the outer object.
*/
virtual nsPIDOMEventTarget* GetTargetForDOMEvent() { return this; }
/**
* Returns the nsPIDOMEventTarget object which should be used as the target
* of the event and when constructing event target chain.
* Usually |this| is returned, but for example global object returns
* the inner object.
*/
virtual nsPIDOMEventTarget* GetTargetForEventTargetChain() { return this; }
/**
* Called before the capture phase of the event flow.
* This is used to create the event target chain and implementations
* should set the necessary members of nsEventChainPreVisitor.
* At least aVisitor.mCanHandle must be set,
* usually also aVisitor.mParentTarget if mCanHandle is PR_TRUE.
* First one tells that this object can handle the aVisitor.mEvent event and
* the latter one is the possible parent object for the event target chain.
* @see nsEventDispatcher.h for more documentation about aVisitor.
*
* @param aVisitor the visitor object which is used to create the
* event target chain for event dispatching.
*
* @note Only nsEventDispatcher should call this method.
*/
virtual nsresult PreHandleEvent(nsEventChainPreVisitor& aVisitor) = 0;
/**
* If nsEventChainPreVisitor.mWantsWillHandleEvent is set PR_TRUE,
* called just before possible event handlers on this object will be called.
*/
virtual nsresult WillHandleEvent(nsEventChainPostVisitor& aVisitor)
{
return NS_OK;
}
/**
* Called after the bubble phase of the system event group.
* The default handling of the event should happen here.
* @param aVisitor the visitor object which is used during post handling.
*
* @see nsEventDispatcher.h for documentation about aVisitor.
* @note Only nsEventDispatcher should call this method.
*/
virtual nsresult PostHandleEvent(nsEventChainPostVisitor& aVisitor) = 0;
/**
* Dispatch an event.
* @param aEvent the event that is being dispatched.
* @param aDOMEvent the event that is being dispatched, use if you want to
* dispatch nsIDOMEvent, not only nsEvent.
* @param aPresContext the current presentation context, can be nsnull.
* @param aEventStatus the status returned from the function, can be nsnull.
*
* @note If both aEvent and aDOMEvent are used, aEvent must be the internal
* event of the aDOMEvent.
*
* If aDOMEvent is not nsnull (in which case aEvent can be nsnull) it is used
* for dispatching, otherwise aEvent is used.
*
* @deprecated This method is here just until all the callers outside Gecko
* have been converted to use nsIDOMEventTarget::dispatchEvent.
*/
virtual nsresult DispatchDOMEvent(nsEvent* aEvent,
nsIDOMEvent* aDOMEvent,
nsPresContext* aPresContext,
nsEventStatus* aEventStatus) = 0;
/**
* Get the event listener manager, the guy you talk to to register for events
* on this node.
* @param aMayCreate If PR_FALSE, returns a listener manager only if
* one already exists.
*/
virtual nsIEventListenerManager* GetListenerManager(PRBool aMayCreate) = 0;
/**
* Add an event listener for nsIID.
*/
virtual nsresult AddEventListenerByIID(nsIDOMEventListener *aListener,
const nsIID& aIID) = 0;
/**
* Remove event listener for nsIID.
*/
virtual nsresult RemoveEventListenerByIID(nsIDOMEventListener *aListener,
const nsIID& aIID) = 0;
/**
* Get the system event group.
*/
virtual nsresult GetSystemEventGroup(nsIDOMEventGroup** aGroup) = 0;
/**
* Get the script context in which the event handlers should be run.
* May return null.
* @note Caller *must* check the value of aRv.
*/
virtual nsIScriptContext* GetContextForEventHandlers(nsresult* aRv) = 0;
/**
* If the method above returns null, but a success code, this method
* is called.
*/
virtual JSContext* GetJSContextForEventHandlers() { return nsnull; }
};
NS_DEFINE_STATIC_IID_ACCESSOR(nsPIDOMEventTarget, NS_PIDOMEVENTTARGET_IID)
#endif
#endif // !defined(nsPIDOMEventTarget_h_)

2
content/events/src/nsDOMDataTransfer.cpp
Просмотреть файл

@ -469,7 +469,7 @@ nsDOMDataTransfer::MozGetDataAt(const nsAString& aFormat,
nsCOMPtr<nsISupports> data;
formatitem.mData->GetAsISupports(getter_AddRefs(data));
// Make sure the code that is calling us is same-origin with the data.
nsCOMPtr<nsPIDOMEventTarget> pt = do_QueryInterface(data);
nsCOMPtr<nsIDOMEventTarget> pt = do_QueryInterface(data);
if (pt) {
nsresult rv = NS_OK;
nsIScriptContext* c = pt->GetContextForEventHandlers(&rv);

4
content/events/src/nsDOMEvent.cpp
Просмотреть файл

@ -280,10 +280,10 @@ NS_METHOD nsDOMEvent::GetType(nsAString& aType)
}
static nsresult
GetDOMEventTarget(nsPIDOMEventTarget* aTarget,
GetDOMEventTarget(nsIDOMEventTarget* aTarget,
nsIDOMEventTarget** aDOMTarget)
{
nsPIDOMEventTarget* realTarget =
nsIDOMEventTarget* realTarget =
aTarget ? aTarget->GetTargetForDOMEvent() : aTarget;
if (realTarget) {
return CallQueryInterface(realTarget, aDOMTarget);

8
content/events/src/nsDOMEventTargetHelper.cpp
Просмотреть файл

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

4
content/events/src/nsDOMEventTargetHelper.h
Просмотреть файл

@ -41,7 +41,7 @@
#include "nsCOMPtr.h"
#include "nsAutoPtr.h"
#include "nsPIDOMEventTarget.h"
#include "nsIDOMEventTarget.h"
#include "nsIDOMEventListener.h"
#include "nsIDOMEventTarget.h"
#include "nsCycleCollectionParticipant.h"
@ -73,7 +73,7 @@ public:
virtual ~nsDOMEventTargetHelper() {}
NS_DECL_CYCLE_COLLECTING_ISUPPORTS
NS_DECL_CYCLE_COLLECTION_CLASS_AMBIGUOUS(nsDOMEventTargetHelper,
nsPIDOMEventTarget)
nsIDOMEventTarget)
NS_DECL_NSIDOMEVENTTARGET

34
content/events/src/nsEventDispatcher.cpp
Просмотреть файл

@ -37,7 +37,7 @@
#include "nsEventDispatcher.h"
#include "nsDOMEvent.h"
#include "nsPIDOMEventTarget.h"
#include "nsIDOMEventTarget.h"
#include "nsPresContext.h"
#include "nsIPrivateDOMEvent.h"
#include "nsEventListenerManager.h"
@ -64,12 +64,12 @@ static nsEventTargetChainItem* gCachedETCI = nsnull;
class nsEventTargetChainItem
{
private:
nsEventTargetChainItem(nsPIDOMEventTarget* aTarget,
nsEventTargetChainItem(nsIDOMEventTarget* aTarget,
nsEventTargetChainItem* aChild = nsnull);
public:
static nsEventTargetChainItem* Create(nsFixedSizeAllocator* aAllocator,
nsPIDOMEventTarget* aTarget,
nsIDOMEventTarget* aTarget,
nsEventTargetChainItem* aChild = nsnull)
{
void* place = nsnull;
@ -109,12 +109,12 @@ public:
return !!(mTarget);
}
nsPIDOMEventTarget* GetNewTarget()
nsIDOMEventTarget* GetNewTarget()
{
return mNewTarget;
}
void SetNewTarget(nsPIDOMEventTarget* aNewTarget)
void SetNewTarget(nsIDOMEventTarget* aNewTarget)
{
mNewTarget = aNewTarget;
}
@ -161,7 +161,7 @@ public:
return !!(mFlags & NS_TARGET_CHAIN_MAY_HAVE_MANAGER);
}
nsPIDOMEventTarget* CurrentTarget()
nsIDOMEventTarget* CurrentTarget()
{
return mTarget;
}
@ -232,7 +232,7 @@ public:
sMaxEtciCount = 0;
}
nsCOMPtr<nsPIDOMEventTarget> 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<nsPIDOMEventTarget> mNewTarget;
nsCOMPtr<nsIDOMEventTarget> mNewTarget;
// Cache mTarget's event listener manager.
nsRefPtr<nsEventListenerManager> mManager;
@ -254,7 +254,7 @@ public:
PRUint32 nsEventTargetChainItem::sMaxEtciCount = 0;
PRUint32 nsEventTargetChainItem::sCurrentEtciCount = 0;
nsEventTargetChainItem::nsEventTargetChainItem(nsPIDOMEventTarget* aTarget,
nsEventTargetChainItem::nsEventTargetChainItem(nsIDOMEventTarget* aTarget,
nsEventTargetChainItem* aChild)
: mChild(aChild), mParent(nsnull), mFlags(0), mItemFlags(0)
{
@ -298,7 +298,7 @@ nsEventTargetChainItem::HandleEventTargetChain(nsEventChainPostVisitor& aVisitor
{
PRUint32 createdELMs = nsEventListenerManager::sCreatedCount;
// Save the target so that it can be restored later.
nsCOMPtr<nsPIDOMEventTarget> firstTarget = aVisitor.mEvent->target;
nsCOMPtr<nsIDOMEventTarget> firstTarget = aVisitor.mEvent->target;
// Capture
nsEventTargetChainItem* item = this;
@ -318,7 +318,7 @@ nsEventTargetChainItem::HandleEventTargetChain(nsEventChainPostVisitor& aVisitor
// item is at anonymous boundary. Need to retarget for the child items.
nsEventTargetChainItem* nextTarget = item->mChild;
while (nextTarget) {
nsPIDOMEventTarget* newTarget = nextTarget->GetNewTarget();
nsIDOMEventTarget* newTarget = nextTarget->GetNewTarget();
if (newTarget) {
aVisitor.mEvent->target = newTarget;
break;
@ -351,7 +351,7 @@ nsEventTargetChainItem::HandleEventTargetChain(nsEventChainPostVisitor& aVisitor
aVisitor.mEvent->flags &= ~NS_EVENT_FLAG_CAPTURE;
item = item->mParent;
while (item) {
nsPIDOMEventTarget* newTarget = item->GetNewTarget();
nsIDOMEventTarget* newTarget = item->GetNewTarget();
if (newTarget) {
// Item is at anonymous boundary. Need to retarget for the current item
// and for parent items.
@ -468,7 +468,7 @@ nsEventDispatcher::Dispatch(nsISupports* aTarget,
nsIDOMEvent* aDOMEvent,
nsEventStatus* aEventStatus,
nsDispatchingCallback* aCallback,
nsCOMArray<nsPIDOMEventTarget>* aTargets)
nsCOMArray<nsIDOMEventTarget>* aTargets)
{
NS_ASSERTION(aEvent, "Trying to dispatch without nsEvent!");
NS_ENSURE_TRUE(!NS_IS_EVENT_IN_DISPATCH(aEvent),
@ -487,7 +487,7 @@ nsEventDispatcher::Dispatch(nsISupports* aTarget,
timer_event_name ? timer_event_name : "<other>");
#endif
nsCOMPtr<nsPIDOMEventTarget> target = do_QueryInterface(aTarget);
nsCOMPtr<nsIDOMEventTarget> target = do_QueryInterface(aTarget);
PRBool retargeted = PR_FALSE;
@ -518,14 +518,14 @@ nsEventDispatcher::Dispatch(nsISupports* aTarget,
if (!nsContentUtils::IsChromeDoc(doc)) {
nsPIDOMWindow* win = doc ? doc->GetInnerWindow() : nsnull;
// If we can't dispatch the event to chrome, do nothing.
nsPIDOMEventTarget* piTarget = win ? win->GetChromeEventHandler() : nsnull;
nsIDOMEventTarget* piTarget = win ? win->GetChromeEventHandler() : nsnull;
NS_ENSURE_TRUE(piTarget, NS_OK);
nsCOMPtr<nsIFrameLoaderOwner> flo = do_QueryInterface(piTarget);
if (flo) {
nsRefPtr<nsFrameLoader> fl = flo->GetFrameLoader();
if (fl) {
nsPIDOMEventTarget* t = fl->GetTabChildGlobalAsEventTarget();
nsIDOMEventTarget* t = fl->GetTabChildGlobalAsEventTarget();
piTarget = t ? t : piTarget;
}
}
@ -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<nsPIDOMEventTarget> t = do_QueryInterface(aEvent->target);
nsCOMPtr<nsIDOMEventTarget> t = do_QueryInterface(aEvent->target);
targetEtci->SetNewTarget(t);
nsEventTargetChainItem* topEtci = targetEtci;
while (preVisitor.mParentTarget) {

6
content/events/src/nsEventListenerManager.cpp
Просмотреть файл

@ -1092,7 +1092,7 @@ nsresult
nsEventListenerManager::HandleEventSubType(nsListenerStruct* aListenerStruct,
nsIDOMEventListener* aListener,
nsIDOMEvent* aDOMEvent,
nsPIDOMEventTarget* aCurrentTarget,
nsIDOMEventTarget* aCurrentTarget,
PRUint32 aPhaseFlags,
nsCxPusher* aPusher)
{
@ -1153,7 +1153,7 @@ nsresult
nsEventListenerManager::HandleEventInternal(nsPresContext* aPresContext,
nsEvent* aEvent,
nsIDOMEvent** aDOMEvent,
nsPIDOMEventTarget* aCurrentTarget,
nsIDOMEventTarget* aCurrentTarget,
PRUint32 aFlags,
nsEventStatus* aEventStatus,
nsCxPusher* aPusher)
@ -1572,7 +1572,7 @@ nsEventListenerManager::HasListeners()
nsresult
nsEventListenerManager::GetListenerInfo(nsCOMArray<nsIEventListenerInfo>* aList)
{
nsCOMPtr<nsPIDOMEventTarget> target = do_QueryInterface(mTarget);
nsCOMPtr<nsIDOMEventTarget> target = do_QueryInterface(mTarget);
NS_ENSURE_STATE(target);
aList->Clear();
PRUint32 count = mListeners.Length();

6
content/events/src/nsEventListenerManager.h
Просмотреть файл

@ -117,7 +117,7 @@ public:
nsresult HandleEvent(nsPresContext* aPresContext,
nsEvent* aEvent,
nsIDOMEvent** aDOMEvent,
nsPIDOMEventTarget* aCurrentTarget,
nsIDOMEventTarget* aCurrentTarget,
PRUint32 aFlags,
nsEventStatus* aEventStatus,
nsCxPusher* aPusher)
@ -149,7 +149,7 @@ public:
nsresult HandleEventInternal(nsPresContext* aPresContext,
nsEvent* aEvent,
nsIDOMEvent** aDOMEvent,
nsPIDOMEventTarget* aCurrentTarget,
nsIDOMEventTarget* aCurrentTarget,
PRUint32 aFlags,
nsEventStatus* aEventStatus,
nsCxPusher* aPusher);
@ -191,7 +191,7 @@ protected:
nsresult HandleEventSubType(nsListenerStruct* aListenerStruct,
nsIDOMEventListener* aListener,
nsIDOMEvent* aDOMEvent,
nsPIDOMEventTarget* aCurrentTarget,
nsIDOMEventTarget* aCurrentTarget,
PRUint32 aPhaseFlags,
nsCxPusher* aPusher);
nsresult CompileEventHandlerInternal(nsIScriptContext *aContext,

10
content/events/src/nsEventListenerService.cpp
Просмотреть файл

@ -37,7 +37,7 @@
#include "nsEventListenerService.h"
#include "nsCOMArray.h"
#include "nsEventListenerManager.h"
#include "nsPIDOMEventTarget.h"
#include "nsIDOMEventTarget.h"
#include "nsIVariant.h"
#include "nsIServiceManager.h"
#include "nsMemory.h"
@ -202,7 +202,7 @@ nsEventListenerService::GetListenerInfoFor(nsIDOMEventTarget* aEventTarget,
*aCount = 0;
*aOutArray = nsnull;
nsCOMArray<nsIEventListenerInfo> listenerInfos;
nsCOMPtr<nsPIDOMEventTarget> target = do_QueryInterface(aEventTarget);
nsCOMPtr<nsIDOMEventTarget> target = do_QueryInterface(aEventTarget);
if (target) {
nsCOMPtr<nsIEventListenerManager> elm =
target->GetListenerManager(PR_FALSE);
@ -235,10 +235,10 @@ nsEventListenerService::GetEventTargetChainFor(nsIDOMEventTarget* aEventTarget,
{
*aCount = 0;
*aOutArray = nsnull;
nsCOMPtr<nsPIDOMEventTarget> target = do_QueryInterface(aEventTarget);
nsCOMPtr<nsIDOMEventTarget> target = do_QueryInterface(aEventTarget);
NS_ENSURE_ARG(target);
nsEvent event(PR_TRUE, NS_EVENT_TYPE_NULL);
nsCOMArray<nsPIDOMEventTarget> targets;
nsCOMArray<nsIDOMEventTarget> targets;
nsresult rv = nsEventDispatcher::Dispatch(target, nsnull, &event,
nsnull, nsnull, nsnull, &targets);
NS_ENSURE_SUCCESS(rv, rv);
@ -249,7 +249,7 @@ nsEventListenerService::GetEventTargetChainFor(nsIDOMEventTarget* aEventTarget,
*aOutArray =
static_cast<nsIDOMEventTarget**>(
nsMemory::Alloc(sizeof(nsPIDOMEventTarget*) * count));
nsMemory::Alloc(sizeof(nsIDOMEventTarget*) * count));
NS_ENSURE_TRUE(*aOutArray, NS_ERROR_OUT_OF_MEMORY);
for (PRInt32 i = 0; i < count; ++i) {

2
content/events/src/nsEventListenerService.h
Просмотреть файл

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

2
content/html/content/src/nsGenericHTMLElement.cpp
Просмотреть файл

@ -1147,7 +1147,7 @@ nsGenericHTMLElement::GetEventListenerManagerForAttr(nsIEventListenerManager** a
// bail if it does.
if (document &&
(win = document->GetInnerWindow()) && win->IsInnerWindow()) {
nsCOMPtr<nsPIDOMEventTarget> piTarget(do_QueryInterface(win));
nsCOMPtr<nsIDOMEventTarget> piTarget(do_QueryInterface(win));
NS_ENSURE_TRUE(piTarget, NS_ERROR_FAILURE);
*aManager = piTarget->GetListenerManager(PR_TRUE);

2
content/smil/nsSMILTimeValueSpec.cpp
Просмотреть файл

@ -377,7 +377,7 @@ nsSMILTimeValueSpec::GetEventListenerManager(Element* aTarget,
NS_ABORT_IF_FALSE(aSystemGroup && !*aSystemGroup,
"Bad out param for system group");
nsCOMPtr<nsPIDOMEventTarget> piTarget;
nsCOMPtr<nsIDOMEventTarget> piTarget;
if (mParams.mType == nsSMILTimeValueSpecParams::ACCESSKEY) {
nsIDocument* doc = aTarget->GetCurrentDoc();

4
content/xbl/src/nsXBLEventHandler.cpp
Просмотреть файл

@ -83,7 +83,7 @@ nsXBLEventHandler::HandleEvent(nsIDOMEvent* aEvent)
nsCOMPtr<nsIDOMEventTarget> target;
aEvent->GetCurrentTarget(getter_AddRefs(target));
nsCOMPtr<nsPIDOMEventTarget> piTarget = do_QueryInterface(target);
nsCOMPtr<nsIDOMEventTarget> piTarget = do_QueryInterface(target);
mProtoHandler->ExecuteHandler(piTarget, aEvent);
@ -133,7 +133,7 @@ nsXBLKeyEventHandler::ExecuteMatchedHandlers(nsIDOMKeyEvent* aKeyEvent,
nsCOMPtr<nsIDOMEventTarget> target;
aKeyEvent->GetCurrentTarget(getter_AddRefs(target));
nsCOMPtr<nsPIDOMEventTarget> piTarget = do_QueryInterface(target);
nsCOMPtr<nsIDOMEventTarget> piTarget = do_QueryInterface(target);
PRBool executed = PR_FALSE;
for (PRUint32 i = 0; i < mProtoHandlers.Length(); ++i) {

6
content/xbl/src/nsXBLPrototypeHandler.cpp
Просмотреть файл

@ -214,7 +214,7 @@ nsXBLPrototypeHandler::InitAccessKeys()
}
nsresult
nsXBLPrototypeHandler::ExecuteHandler(nsPIDOMEventTarget* aTarget,
nsXBLPrototypeHandler::ExecuteHandler(nsIDOMEventTarget* aTarget,
nsIDOMEvent* aEvent)
{
nsresult rv = NS_ERROR_FAILURE;
@ -379,7 +379,7 @@ nsXBLPrototypeHandler::EnsureEventHandler(nsIScriptGlobalObject* aGlobal,
}
nsresult
nsXBLPrototypeHandler::DispatchXBLCommand(nsPIDOMEventTarget* aTarget, nsIDOMEvent* aEvent)
nsXBLPrototypeHandler::DispatchXBLCommand(nsIDOMEventTarget* aTarget, nsIDOMEvent* aEvent)
{
// This is a special-case optimization to make command handling fast.
// It isn't really a part of XBL, but it helps speed things up.
@ -547,7 +547,7 @@ nsXBLPrototypeHandler::GetEventName()
}
already_AddRefed<nsIController>
nsXBLPrototypeHandler::GetController(nsPIDOMEventTarget* aTarget)
nsXBLPrototypeHandler::GetController(nsIDOMEventTarget* aTarget)
{
// XXX Fix this so there's a generic interface that describes controllers,
// This code should have no special knowledge of what objects might have controllers.

8
content/xbl/src/nsXBLService.cpp
Просмотреть файл

@ -709,11 +709,11 @@ nsXBLService::ResolveTag(nsIContent* aContent, PRInt32* aNameSpaceID,
// then extra work needs to be done to hook it up to the document (XXX WHY??)
//
NS_IMETHODIMP
nsXBLService::AttachGlobalKeyHandler(nsPIDOMEventTarget* aTarget)
nsXBLService::AttachGlobalKeyHandler(nsIDOMEventTarget* aTarget)
{
// check if the receiver is a content node (not a document), and hook
// it to the document if that is the case.
nsCOMPtr<nsPIDOMEventTarget> piTarget = aTarget;
nsCOMPtr<nsIDOMEventTarget> piTarget = aTarget;
nsCOMPtr<nsIContent> contentNode(do_QueryInterface(aTarget));
if (contentNode) {
// Only attach if we're really in a document
@ -765,9 +765,9 @@ nsXBLService::AttachGlobalKeyHandler(nsPIDOMEventTarget* aTarget)
// Removes a key handler added by DeatchGlobalKeyHandler.
//
NS_IMETHODIMP
nsXBLService::DetachGlobalKeyHandler(nsPIDOMEventTarget* aTarget)
nsXBLService::DetachGlobalKeyHandler(nsIDOMEventTarget* aTarget)
{
nsCOMPtr<nsPIDOMEventTarget> piTarget = aTarget;
nsCOMPtr<nsIDOMEventTarget> piTarget = aTarget;
nsCOMPtr<nsIContent> contentNode(do_QueryInterface(aTarget));
if (!contentNode) // detaching is only supported for content nodes
return NS_ERROR_FAILURE;

6
content/xbl/src/nsXBLWindowKeyHandler.cpp
Просмотреть файл

@ -179,7 +179,7 @@ nsXBLSpecialDocInfo* nsXBLWindowKeyHandler::sXBLSpecialDocInfo = nsnull;
PRUint32 nsXBLWindowKeyHandler::sRefCnt = 0;
nsXBLWindowKeyHandler::nsXBLWindowKeyHandler(nsIDOMElement* aElement,
nsPIDOMEventTarget* aTarget)
nsIDOMEventTarget* aTarget)
: mTarget(aTarget),
mHandler(nsnull),
mUserHandler(nsnull)
@ -566,7 +566,7 @@ nsXBLWindowKeyHandler::WalkHandlersAndExecute(nsIDOMKeyEvent* aKeyEvent,
}
}
nsCOMPtr<nsPIDOMEventTarget> piTarget;
nsCOMPtr<nsIDOMEventTarget> piTarget;
nsCOMPtr<nsIDOMElement> element = GetElement();
if (element) {
piTarget = do_QueryInterface(commandElt);
@ -595,7 +595,7 @@ nsXBLWindowKeyHandler::GetElement()
///////////////////////////////////////////////////////////////////////////////////
nsresult
NS_NewXBLWindowKeyHandler(nsIDOMElement* aElement, nsPIDOMEventTarget* aTarget,
NS_NewXBLWindowKeyHandler(nsIDOMElement* aElement, nsIDOMEventTarget* aTarget,
nsXBLWindowKeyHandler** aResult)
{
*aResult = new nsXBLWindowKeyHandler(aElement, aTarget);

4
content/xul/content/src/nsXULElement.cpp
Просмотреть файл

@ -533,7 +533,7 @@ nsXULElement::GetEventListenerManagerForAttr(nsIEventListenerManager** aManager,
if ((!root || root == this) && !mNodeInfo->Equals(nsGkAtoms::overlay) &&
(window = doc->GetInnerWindow()) && window->IsInnerWindow()) {
nsCOMPtr<nsPIDOMEventTarget> piTarget = do_QueryInterface(window);
nsCOMPtr<nsIDOMEventTarget> piTarget = do_QueryInterface(window);
if (!piTarget)
return NS_ERROR_UNEXPECTED;
@ -2192,7 +2192,7 @@ PopupListenerPropertyDtor(void* aObject, nsIAtom* aPropertyName,
do_QueryInterface(static_cast<nsINode*>(aObject));
if (target) {
nsCOMPtr<nsIDOMEventGroup> systemGroup;
static_cast<nsPIDOMEventTarget*>(aObject)->
static_cast<nsIDOMEventTarget*>(aObject)->
GetSystemEventGroup(getter_AddRefs(systemGroup));
if (systemGroup) {
target->RemoveGroupedEventListener(NS_LITERAL_STRING("mousedown"),

4
content/xul/document/src/nsXULDocument.cpp
Просмотреть файл

@ -1717,7 +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<nsPIDOMEventTarget> piTarget(do_QueryInterface(aElement));
nsCOMPtr<nsIDOMEventTarget> piTarget(do_QueryInterface(aElement));
xblService->AttachGlobalKeyHandler(piTarget);
}
}
@ -1793,7 +1793,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<nsPIDOMEventTarget> piTarget(do_QueryInterface(aElement));
nsCOMPtr<nsIDOMEventTarget> piTarget(do_QueryInterface(aElement));
xblService->DetachGlobalKeyHandler(piTarget);
}
}

2
docshell/base/nsDocShell.cpp
Просмотреть файл

@ -1773,7 +1773,7 @@ nsDocShell::GetContentViewer(nsIContentViewer ** aContentViewer)
NS_IMETHODIMP
nsDocShell::SetChromeEventHandler(nsIDOMEventTarget* aChromeEventHandler)
{
nsCOMPtr<nsPIDOMEventTarget> piTarget =
nsCOMPtr<nsIDOMEventTarget> piTarget =
do_QueryInterface(aChromeEventHandler);
// Weak reference. Don't addref.
mChromeEventHandler = piTarget;

4
docshell/base/nsDocShell.h
Просмотреть файл

@ -106,7 +106,7 @@
#include "nsISecureBrowserUI.h"
#include "nsIObserver.h"
#include "nsDocShellLoadTypes.h"
#include "nsPIDOMEventTarget.h"
#include "nsIDOMEventTarget.h"
#include "nsILoadContext.h"
#include "nsIWidget.h"
#include "nsIWebShellServices.h"
@ -768,7 +768,7 @@ protected:
// For that reasons don't use nsCOMPtr.
nsIDocShellTreeOwner * mTreeOwner; // Weak Reference
nsPIDOMEventTarget * mChromeEventHandler; //Weak Reference
nsIDOMEventTarget * mChromeEventHandler; //Weak Reference
eCharsetReloadState mCharsetReloadState;

4
dom/base/nsDOMClassInfo.cpp
Просмотреть файл

@ -7749,11 +7749,11 @@ nsEventReceiverSH::RegisterCompileHandler(nsIXPConnectWrappedNative *wrapper,
nsIScriptContext *script_cx = nsJSUtils::GetStaticScriptContext(cx, obj);
NS_ENSURE_TRUE(script_cx, NS_ERROR_UNEXPECTED);
nsCOMPtr<nsPIDOMEventTarget> piTarget =
nsCOMPtr<nsIDOMEventTarget> piTarget =
do_QueryWrappedNative(wrapper, obj);
if (!piTarget) {
// Doesn't do events
NS_WARNING("Doesn't QI to nsPIDOMEventTarget?");
NS_WARNING("Doesn't QI to nsIDOMEventTarget?");
return NS_OK;
}

8
dom/base/nsFocusManager.cpp
Просмотреть файл

@ -108,7 +108,7 @@ struct nsDelayedBlurOrFocusEvent
nsDelayedBlurOrFocusEvent(PRUint32 aType,
nsIPresShell* aPresShell,
nsIDocument* aDocument,
nsPIDOMEventTarget* aTarget)
nsIDOMEventTarget* aTarget)
: mType(aType),
mPresShell(aPresShell),
mDocument(aDocument),
@ -123,7 +123,7 @@ struct nsDelayedBlurOrFocusEvent
PRUint32 mType;
nsCOMPtr<nsIPresShell> mPresShell;
nsCOMPtr<nsIDocument> mDocument;
nsCOMPtr<nsPIDOMEventTarget> mTarget;
nsCOMPtr<nsIDOMEventTarget> mTarget;
};
NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(nsFocusManager)
@ -1008,7 +1008,7 @@ nsFocusManager::FireDelayedEvents(nsIDocument* aDocument)
if (mDelayedBlurFocusEvents[i].mDocument == aDocument &&
!aDocument->EventHandlingSuppressed()) {
PRUint32 type = mDelayedBlurFocusEvents[i].mType;
nsCOMPtr<nsPIDOMEventTarget> target = mDelayedBlurFocusEvents[i].mTarget;
nsCOMPtr<nsIDOMEventTarget> target = mDelayedBlurFocusEvents[i].mTarget;
nsCOMPtr<nsIPresShell> presShell = mDelayedBlurFocusEvents[i].mPresShell;
mDelayedBlurFocusEvents.RemoveElementAt(i);
SendFocusOrBlurEvent(type, presShell, aDocument, target, 0, PR_FALSE);
@ -1851,7 +1851,7 @@ nsFocusManager::SendFocusOrBlurEvent(PRUint32 aType,
NS_ASSERTION(aType == NS_FOCUS_CONTENT || aType == NS_BLUR_CONTENT,
"Wrong event type for SendFocusOrBlurEvent");
nsCOMPtr<nsPIDOMEventTarget> eventTarget = do_QueryInterface(aTarget);
nsCOMPtr<nsIDOMEventTarget> eventTarget = do_QueryInterface(aTarget);
// for focus events, if this event was from a mouse or key and event
// handling on the document is suppressed, queue the event and fire it

16
dom/base/nsGlobalWindow.cpp
Просмотреть файл

@ -1851,7 +1851,7 @@ nsGlobalWindow::SetNewDocument(nsIDocument* aDocument,
if (internal == static_cast<nsIDOMWindowInternal *>(this)) {
nsCOMPtr<nsIXBLService> xblService = do_GetService("@mozilla.org/xbl;1");
if (xblService) {
nsCOMPtr<nsPIDOMEventTarget> piTarget =
nsCOMPtr<nsIDOMEventTarget> piTarget =
do_QueryInterface(mChromeEventHandler);
xblService->AttachGlobalKeyHandler(piTarget);
}
@ -2517,17 +2517,17 @@ nsGlobalWindow::GetIsTabModalPromptAllowed()
return allowTabModal;
}
nsPIDOMEventTarget*
nsIDOMEventTarget*
nsGlobalWindow::GetTargetForDOMEvent()
{
return static_cast<nsPIDOMEventTarget*>(GetOuterWindowInternal());
return static_cast<nsIDOMEventTarget*>(GetOuterWindowInternal());
}
nsPIDOMEventTarget*
nsIDOMEventTarget*
nsGlobalWindow::GetTargetForEventTargetChain()
{
return IsInnerWindow() ?
this : static_cast<nsPIDOMEventTarget*>(GetCurrentInnerWindowInternal());
this : static_cast<nsIDOMEventTarget*>(GetCurrentInnerWindowInternal());
}
nsresult
@ -2707,7 +2707,7 @@ nsGlobalWindow::PostHandleEvent(nsEventChainPostVisitor& aVisitor)
/* mChromeEventHandler and mContext go dangling in the middle of this
function under some circumstances (events that destroy the window)
without this addref. */
nsCOMPtr<nsPIDOMEventTarget> kungFuDeathGrip1(mChromeEventHandler);
nsCOMPtr<nsIDOMEventTarget> kungFuDeathGrip1(mChromeEventHandler);
nsCOMPtr<nsIScriptContext> kungFuDeathGrip2(GetContextInternal());
if (aVisitor.mEvent->message == NS_RESIZE_EVENT) {
@ -7365,7 +7365,7 @@ nsGlobalWindow::GetListenerManager(PRBool aCreateIfNotFound)
mListenerManager = do_CreateInstance(kEventListenerManagerCID);
if (mListenerManager) {
mListenerManager->SetListenerTarget(
static_cast<nsPIDOMEventTarget*>(this));
static_cast<nsIDOMEventTarget*>(this));
}
}
@ -7587,7 +7587,7 @@ nsGlobalWindow::DisableDeviceMotionUpdates()
}
void
nsGlobalWindow::SetChromeEventHandler(nsPIDOMEventTarget* aChromeEventHandler)
nsGlobalWindow::SetChromeEventHandler(nsIDOMEventTarget* aChromeEventHandler)
{
SetChromeEventHandlerInternal(aChromeEventHandler);
if (IsOuterWindow()) {

4
dom/base/nsGlobalWindow.h
Просмотреть файл

@ -102,7 +102,7 @@
#include "nsIDOMStorageEvent.h"
#include "nsIDOMStorageIndexedDB.h"
#include "nsIDOMOfflineResourceList.h"
#include "nsPIDOMEventTarget.h"
#include "nsIDOMEventTarget.h"
#include "nsIArray.h"
#include "nsIContent.h"
#include "nsIIDBFactory.h"
@ -347,7 +347,7 @@ public:
virtual NS_HIDDEN_(nsPIDOMWindow*) GetPrivateRoot();
virtual NS_HIDDEN_(void) ActivateOrDeactivate(PRBool aActivate);
virtual NS_HIDDEN_(void) SetActive(PRBool aActive);
virtual NS_HIDDEN_(void) SetChromeEventHandler(nsPIDOMEventTarget* aChromeEventHandler);
virtual NS_HIDDEN_(void) SetChromeEventHandler(nsIDOMEventTarget* aChromeEventHandler);
virtual NS_HIDDEN_(void) SetOpenerScriptPrincipal(nsIPrincipal* aPrincipal);
virtual NS_HIDDEN_(nsIPrincipal*) GetOpenerScriptPrincipal();

14
dom/base/nsPIDOMWindow.h
Просмотреть файл

@ -45,7 +45,7 @@
#include "nsIDOMXULCommandDispatcher.h"
#include "nsIDOMElement.h"
#include "nsIDOMWindowInternal.h"
#include "nsPIDOMEventTarget.h"
#include "nsIDOMEventTarget.h"
#include "nsIDOMDocument.h"
#include "nsCOMPtr.h"
#include "nsEvent.h"
@ -115,14 +115,14 @@ public:
return mIsBackground;
}
nsPIDOMEventTarget* GetChromeEventHandler() const
nsIDOMEventTarget* GetChromeEventHandler() const
{
return mChromeEventHandler;
}
virtual void SetChromeEventHandler(nsPIDOMEventTarget* aChromeEventHandler) = 0;
virtual void SetChromeEventHandler(nsIDOMEventTarget* aChromeEventHandler) = 0;
nsPIDOMEventTarget* GetParentTarget()
nsIDOMEventTarget* GetParentTarget()
{
if (!mParentTarget) {
UpdateParentTarget();
@ -588,7 +588,7 @@ protected:
~nsPIDOMWindow();
void SetChromeEventHandlerInternal(nsPIDOMEventTarget* aChromeEventHandler) {
void SetChromeEventHandlerInternal(nsIDOMEventTarget* aChromeEventHandler) {
mChromeEventHandler = aChromeEventHandler;
// mParentTarget will be set when the next event is dispatched.
mParentTarget = nsnull;
@ -599,10 +599,10 @@ protected:
// These two variables are special in that they're set to the same
// value on both the outer window and the current inner window. Make
// sure you keep them in sync!
nsCOMPtr<nsPIDOMEventTarget> mChromeEventHandler; // strong
nsCOMPtr<nsIDOMEventTarget> mChromeEventHandler; // strong
nsCOMPtr<nsIDOMDocument> mDocument; // strong
nsCOMPtr<nsPIDOMEventTarget> mParentTarget; // strong
nsCOMPtr<nsIDOMEventTarget> mParentTarget; // strong
// These members are only used on outer windows.
nsCOMPtr<nsIDOMElement> mFrameElement;

6
dom/base/nsPIWindowRoot.h
Просмотреть файл

@ -41,7 +41,7 @@
#define nsPIWindowRoot_h__
#include "nsISupports.h"
#include "nsPIDOMEventTarget.h"
#include "nsIDOMEventTarget.h"
class nsPIDOMWindow;
class nsIControllers;
@ -68,8 +68,8 @@ public:
nsIController** aResult) = 0;
virtual nsresult GetControllers(nsIControllers** aResult) = 0;
virtual void SetParentTarget(nsPIDOMEventTarget* aTarget) = 0;
virtual nsPIDOMEventTarget* GetParentTarget() = 0;
virtual void SetParentTarget(nsIDOMEventTarget* aTarget) = 0;
virtual nsIDOMEventTarget* GetParentTarget() = 0;
};
NS_DEFINE_STATIC_IID_ACCESSOR(nsPIWindowRoot, NS_IWINDOWROOT_IID)

8
dom/base/nsWindowRoot.cpp
Просмотреть файл

@ -105,7 +105,7 @@ nsWindowRoot::DispatchEvent(nsIDOMEvent* aEvt, PRBool *aRetVal)
{
nsEventStatus status = nsEventStatus_eIgnore;
nsresult rv = nsEventDispatcher::DispatchDOMEvent(
static_cast<nsPIDOMEventTarget*>(this), nsnull, aEvt, nsnull, &status);
static_cast<nsIDOMEventTarget*>(this), nsnull, aEvt, nsnull, &status);
*aRetVal = (status != nsEventStatus_eConsumeNoDefault);
return rv;
}
@ -116,7 +116,7 @@ nsWindowRoot::DispatchDOMEvent(nsEvent* aEvent,
nsPresContext* aPresContext,
nsEventStatus* aEventStatus)
{
return nsEventDispatcher::DispatchDOMEvent(static_cast<nsPIDOMEventTarget*>(this),
return nsEventDispatcher::DispatchDOMEvent(static_cast<nsIDOMEventTarget*>(this),
aEvent, aDOMEvent,
aPresContext, aEventStatus);
}
@ -208,7 +208,7 @@ nsWindowRoot::GetListenerManager(PRBool aCreateIfNotFound)
mListenerManager = do_CreateInstance(kEventListenerManagerCID);
if (mListenerManager) {
mListenerManager->SetListenerTarget(
static_cast<nsPIDOMEventTarget*>(this));
static_cast<nsIDOMEventTarget*>(this));
}
}
@ -355,7 +355,7 @@ nsWindowRoot::SetPopupNode(nsIDOMNode* aNode)
///////////////////////////////////////////////////////////////////////////////////
nsresult
NS_NewWindowRoot(nsPIDOMWindow* aWindow, nsPIDOMEventTarget** aResult)
NS_NewWindowRoot(nsPIDOMWindow* aWindow, nsIDOMEventTarget** aResult)
{
*aResult = new nsWindowRoot(aWindow);
if (!*aResult)

8
dom/base/nsWindowRoot.h
Просмотреть файл

@ -76,11 +76,11 @@ public:
virtual nsIDOMNode* GetPopupNode();
virtual void SetPopupNode(nsIDOMNode* aNode);
virtual void SetParentTarget(nsPIDOMEventTarget* aTarget)
virtual void SetParentTarget(nsIDOMEventTarget* aTarget)
{
mParent = aTarget;
}
virtual nsPIDOMEventTarget* GetParentTarget() { return mParent; }
virtual nsIDOMEventTarget* GetParentTarget() { return mParent; }
NS_DECL_CYCLE_COLLECTION_CLASS_AMBIGUOUS(nsWindowRoot, nsIDOMEventTarget)
@ -92,11 +92,11 @@ protected:
nsCOMPtr<nsIDOMNode> mPopupNode; // [OWNER]
nsCOMPtr<nsPIDOMEventTarget> mParent;
nsCOMPtr<nsIDOMEventTarget> mParent;
};
extern nsresult
NS_NewWindowRoot(nsPIDOMWindow* aWindow,
nsPIDOMEventTarget** aResult);
nsIDOMEventTarget** aResult);
#endif

4
dom/indexedDB/IDBCursor.cpp
Просмотреть файл

@ -301,9 +301,9 @@ NS_IMPL_CYCLE_COLLECTION_CLASS(IDBCursor)
NS_IMPL_CYCLE_COLLECTION_TRAVERSE_BEGIN(IDBCursor)
NS_IMPL_CYCLE_COLLECTION_TRAVERSE_SCRIPT_OBJECTS
NS_IMPL_CYCLE_COLLECTION_TRAVERSE_NSCOMPTR_AMBIGUOUS(mRequest,
nsPIDOMEventTarget)
nsIDOMEventTarget)
NS_IMPL_CYCLE_COLLECTION_TRAVERSE_NSCOMPTR_AMBIGUOUS(mTransaction,
nsPIDOMEventTarget)
nsIDOMEventTarget)
NS_IMPL_CYCLE_COLLECTION_TRAVERSE_NSCOMPTR(mObjectStore)
NS_IMPL_CYCLE_COLLECTION_TRAVERSE_NSCOMPTR(mIndex)
NS_IMPL_CYCLE_COLLECTION_TRAVERSE_NSCOMPTR(mOwner)

4
dom/indexedDB/IDBDatabase.cpp
Просмотреть файл

@ -712,7 +712,7 @@ IDBDatabase::SetVersion(const nsAString& aVersion,
NS_ENSURE_TRUE(transaction, NS_ERROR_DOM_INDEXEDDB_UNKNOWN_ERR);
nsRefPtr<IDBVersionChangeRequest> request =
IDBVersionChangeRequest::Create(static_cast<nsPIDOMEventTarget*>(this),
IDBVersionChangeRequest::Create(static_cast<nsIDOMEventTarget*>(this),
ScriptContext(), Owner(), transaction);
NS_ENSURE_TRUE(request, NS_ERROR_DOM_INDEXEDDB_UNKNOWN_ERR);
@ -966,7 +966,7 @@ SetVersionHelper::GetSuccessResult(JSContext* aCx,
}
info->version = mVersion;
nsresult rv = WrapNative(aCx, NS_ISUPPORTS_CAST(nsPIDOMEventTarget*,
nsresult rv = WrapNative(aCx, NS_ISUPPORTS_CAST(nsIDOMEventTarget*,
mTransaction),
aVal);
NS_ENSURE_SUCCESS(rv, rv);

2
dom/indexedDB/IDBDatabase.h
Просмотреть файл

@ -80,7 +80,7 @@ public:
DatabaseInfo* aDatabaseInfo,
const nsACString& aASCIIOrigin);
// nsPIDOMEventTarget
// nsIDOMEventTarget
virtual nsresult PostHandleEvent(nsEventChainPostVisitor& aVisitor);
PRUint32 Id()

2
dom/indexedDB/IDBFactory.cpp
Просмотреть файл

@ -1080,6 +1080,6 @@ OpenDatabaseHelper::GetSuccessResult(JSContext* aCx,
return NS_ERROR_DOM_INDEXEDDB_UNKNOWN_ERR;
}
return WrapNative(aCx, NS_ISUPPORTS_CAST(nsPIDOMEventTarget*, database),
return WrapNative(aCx, NS_ISUPPORTS_CAST(nsIDOMEventTarget*, database),
aVal);
}

2
dom/indexedDB/IDBObjectStore.cpp
Просмотреть файл

@ -991,7 +991,7 @@ NS_IMPL_CYCLE_COLLECTION_CLASS(IDBObjectStore)
NS_IMPL_CYCLE_COLLECTION_TRAVERSE_BEGIN(IDBObjectStore)
NS_IMPL_CYCLE_COLLECTION_TRAVERSE_NSCOMPTR_AMBIGUOUS(mTransaction,
nsPIDOMEventTarget)
nsIDOMEventTarget)
NS_IMPL_CYCLE_COLLECTION_TRAVERSE_NSCOMPTR(mOwner)
NS_IMPL_CYCLE_COLLECTION_TRAVERSE_NSCOMPTR(mScriptContext)

2
dom/indexedDB/IDBRequest.h
Просмотреть файл

@ -72,7 +72,7 @@ public:
nsPIDOMWindow* aOwner,
IDBTransaction* aTransaction);
// nsPIDOMEventTarget
// nsIDOMEventTarget
virtual nsresult PreHandleEvent(nsEventChainPreVisitor& aVisitor);
nsISupports* Source()

2
dom/indexedDB/IDBTransaction.cpp
Просмотреть файл

@ -628,7 +628,7 @@ NS_IMPL_CYCLE_COLLECTION_CLASS(IDBTransaction)
NS_IMPL_CYCLE_COLLECTION_TRAVERSE_BEGIN_INHERITED(IDBTransaction,
nsDOMEventTargetHelper)
NS_IMPL_CYCLE_COLLECTION_TRAVERSE_NSCOMPTR_AMBIGUOUS(mDatabase,
nsPIDOMEventTarget)
nsIDOMEventTarget)
NS_IMPL_CYCLE_COLLECTION_TRAVERSE_NSCOMPTR(mOnErrorListener)
NS_IMPL_CYCLE_COLLECTION_TRAVERSE_NSCOMPTR(mOnCompleteListener)
NS_IMPL_CYCLE_COLLECTION_TRAVERSE_NSCOMPTR(mOnAbortListener)

2
dom/indexedDB/IDBTransaction.h
Просмотреть файл

@ -89,7 +89,7 @@ public:
PRUint32 aTimeout,
bool aDispatchDelayed = false);
// nsPIDOMEventTarget
// nsIDOMEventTarget
virtual nsresult PreHandleEvent(nsEventChainPreVisitor& aVisitor);
void OnNewRequest();

4
dom/ipc/TabChild.cpp
Просмотреть файл

@ -758,7 +758,7 @@ TabChild::RecvAsyncMessage(const nsString& aMessage,
nsFrameScriptCx cx(static_cast<nsIWebBrowserChrome*>(this), this);
nsRefPtr<nsFrameMessageManager> mm =
static_cast<nsFrameMessageManager*>(mTabChildGlobal->mMessageManager.get());
mm->ReceiveMessage(static_cast<nsPIDOMEventTarget*>(mTabChildGlobal),
mm->ReceiveMessage(static_cast<nsIDOMEventTarget*>(mTabChildGlobal),
aMessage, PR_FALSE, aJSON, nsnull, nsnull);
}
return true;
@ -866,7 +866,7 @@ TabChild::InitTabChildGlobal()
mTabChildGlobal = scope;
nsISupports* scopeSupports =
NS_ISUPPORTS_CAST(nsPIDOMEventTarget*, scope);
NS_ISUPPORTS_CAST(nsIDOMEventTarget*, scope);
JS_SetContextPrivate(cx, scopeSupports);
nsresult rv =

4
dom/src/events/nsJSEventListener.cpp
Просмотреть файл

@ -52,7 +52,7 @@
#include "nsVariant.h"
#include "nsIDOMBeforeUnloadEvent.h"
#include "nsGkAtoms.h"
#include "nsPIDOMEventTarget.h"
#include "nsIDOMEventTarget.h"
#include "nsIJSContextStack.h"
#ifdef NS_DEBUG
#include "nsDOMJSUtils.h"
@ -132,7 +132,7 @@ NS_IMPL_CYCLE_COLLECTING_RELEASE(nsJSEventListener)
nsresult
nsJSEventListener::GetJSVal(const nsAString& aEventName, jsval* aJSVal)
{
nsCOMPtr<nsPIDOMEventTarget> target = do_QueryInterface(mTarget);
nsCOMPtr<nsIDOMEventTarget> target = do_QueryInterface(mTarget);
if (target && mContext) {
nsAutoString eventString = NS_LITERAL_STRING("on") + aEventName;
nsCOMPtr<nsIAtom> atomName = do_GetAtom(eventString);

6
editor/libeditor/base/nsEditor.cpp
Просмотреть файл

@ -45,7 +45,7 @@
#include "nsIDOMNSHTMLElement.h"
#include "nsIDOMEventTarget.h"
#include "nsIDOMNSEvent.h"
#include "nsPIDOMEventTarget.h"
#include "nsIDOMEventTarget.h"
#include "nsIMEStateManager.h"
#include "nsFocusManager.h"
#include "nsUnicharUtils.h"
@ -5237,7 +5237,7 @@ nsEditor::GetNativeKeyEvent(nsIDOMKeyEvent* aDOMKeyEvent)
already_AddRefed<nsIContent>
nsEditor::GetFocusedContent()
{
nsCOMPtr<nsPIDOMEventTarget> piTarget = GetPIDOMEventTarget();
nsCOMPtr<nsIDOMEventTarget> piTarget = GetPIDOMEventTarget();
if (!piTarget) {
return nsnull;
}
@ -5252,7 +5252,7 @@ nsEditor::GetFocusedContent()
PRBool
nsEditor::IsActiveInDOMWindow()
{
nsCOMPtr<nsPIDOMEventTarget> piTarget = GetPIDOMEventTarget();
nsCOMPtr<nsIDOMEventTarget> piTarget = GetPIDOMEventTarget();
if (!piTarget) {
return PR_FALSE;
}

6
editor/libeditor/base/nsEditor.h
Просмотреть файл

@ -62,7 +62,7 @@
#include "nsSelectionState.h"
#include "nsIEditorSpellCheck.h"
#include "nsIInlineSpellChecker.h"
#include "nsPIDOMEventTarget.h"
#include "nsIDOMEventTarget.h"
#include "nsStubMutationObserver.h"
#include "nsIViewManager.h"
#include "nsCycleCollectionParticipant.h"
@ -613,7 +613,7 @@ public:
nsIDOMNode *aEndNode,
PRInt32 aEndOffset);
virtual already_AddRefed<nsPIDOMEventTarget> GetPIDOMEventTarget() = 0;
virtual already_AddRefed<nsIDOMEventTarget> GetPIDOMEventTarget() = 0;
// Fast non-refcounting editor root element accessor
nsIDOMElement *GetRoot();
@ -764,7 +764,7 @@ protected:
PRInt8 mDocDirtyState; // -1 = not initialized
nsWeakPtr mDocWeak; // weak reference to the nsIDOMDocument
// The form field as an event receiver
nsCOMPtr<nsPIDOMEventTarget> mEventTarget;
nsCOMPtr<nsIDOMEventTarget> mEventTarget;
nsString* mPhonetic;

6
editor/libeditor/base/nsEditorEventListener.cpp
Просмотреть файл

@ -44,7 +44,7 @@
#include "nsIDOMEvent.h"
#include "nsIDOMNSEvent.h"
#include "nsIDOMDocument.h"
#include "nsPIDOMEventTarget.h"
#include "nsIDOMEventTarget.h"
#include "nsIDocument.h"
#include "nsIPresShell.h"
#include "nsISelection.h"
@ -125,7 +125,7 @@ nsEditorEventListener::InstallToEditor()
{
NS_PRECONDITION(mEditor, "The caller must set mEditor");
nsCOMPtr<nsPIDOMEventTarget> piTarget = mEditor->GetPIDOMEventTarget();
nsCOMPtr<nsIDOMEventTarget> piTarget = mEditor->GetPIDOMEventTarget();
NS_ENSURE_TRUE(piTarget, NS_ERROR_FAILURE);
nsresult rv;
@ -204,7 +204,7 @@ nsEditorEventListener::Disconnect()
void
nsEditorEventListener::UninstallFromEditor()
{
nsCOMPtr<nsPIDOMEventTarget> piTarget = mEditor->GetPIDOMEventTarget();
nsCOMPtr<nsIDOMEventTarget> piTarget = mEditor->GetPIDOMEventTarget();
if (!piTarget) {
return;
}

4
editor/libeditor/html/nsHTMLAbsPosition.cpp
Просмотреть файл

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

6
editor/libeditor/html/nsHTMLEditor.cpp
Просмотреть файл

@ -473,7 +473,7 @@ nsHTMLEditor::RemoveEventListeners()
return;
}
nsCOMPtr<nsPIDOMEventTarget> piTarget = GetPIDOMEventTarget();
nsCOMPtr<nsIDOMEventTarget> piTarget = GetPIDOMEventTarget();
nsCOMPtr<nsIDOMEventTarget> target = do_QueryInterface(piTarget);
if (piTarget && target)
@ -5826,14 +5826,14 @@ nsHTMLEditor::IsActiveInDOMWindow()
return PR_TRUE;
}
already_AddRefed<nsPIDOMEventTarget>
already_AddRefed<nsIDOMEventTarget>
nsHTMLEditor::GetPIDOMEventTarget()
{
// 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<nsPIDOMEventTarget> piTarget = do_QueryReferent(mDocWeak.get());
nsCOMPtr<nsIDOMEventTarget> piTarget = do_QueryReferent(mDocWeak.get());
return piTarget.forget();
}

2
editor/libeditor/html/nsHTMLEditor.h
Просмотреть файл

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

6
editor/libeditor/html/nsHTMLObjectResizer.cpp
Просмотреть файл

@ -40,7 +40,7 @@
#include "nsIDOMEventTarget.h"
#include "nsIDOMNSHTMLElement.h"
#include "nsPIDOMEventTarget.h"
#include "nsIDOMEventTarget.h"
#include "nsIDOMText.h"
#include "nsIDOMCSSValue.h"
@ -497,7 +497,7 @@ nsHTMLEditor::HideResizers(void)
// don't forget to remove the listeners !
nsCOMPtr<nsPIDOMEventTarget> piTarget = GetPIDOMEventTarget();
nsCOMPtr<nsIDOMEventTarget> piTarget = GetPIDOMEventTarget();
nsCOMPtr<nsIDOMEventTarget> target = do_QueryInterface(piTarget);
if (target && mMouseMotionListenerP)
@ -606,7 +606,7 @@ nsHTMLEditor::StartResizing(nsIDOMElement *aHandle)
return NS_ERROR_OUT_OF_MEMORY;
}
nsCOMPtr<nsPIDOMEventTarget> piTarget = GetPIDOMEventTarget();
nsCOMPtr<nsIDOMEventTarget> piTarget = GetPIDOMEventTarget();
nsCOMPtr<nsIDOMEventTarget> target = do_QueryInterface(piTarget);
NS_ENSURE_TRUE(target, NS_ERROR_FAILURE);

2
editor/libeditor/text/nsPlaintextEditor.cpp
Просмотреть файл

@ -1715,7 +1715,7 @@ nsPlaintextEditor::SelectEntireDocument(nsISelection *aSelection)
return NS_OK;
}
already_AddRefed<nsPIDOMEventTarget>
already_AddRefed<nsIDOMEventTarget>
nsPlaintextEditor::GetPIDOMEventTarget()
{
NS_IF_ADDREF(mEventTarget);

2
editor/libeditor/text/nsPlaintextEditor.h
Просмотреть файл

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

12
embedding/browser/webBrowser/nsDocShellTreeOwner.cpp
Просмотреть файл

@ -102,7 +102,7 @@
#include "nsPresContext.h"
#include "nsIViewManager.h"
#include "nsIView.h"
#include "nsPIDOMEventTarget.h"
#include "nsIDOMEventTarget.h"
#include "nsIEventListenerManager.h"
#include "nsIDOMEventGroup.h"
#include "nsIDOMDragEvent.h"
@ -112,10 +112,10 @@
// GetEventReceiver
//
// A helper routine that navigates the tricky path from a |nsWebBrowser| to
// a |nsPIDOMEventTarget| via the window root and chrome event handler.
// a |nsIDOMEventTarget| via the window root and chrome event handler.
//
static nsresult
GetPIDOMEventTarget( nsWebBrowser* inBrowser, nsPIDOMEventTarget** aTarget)
GetPIDOMEventTarget( nsWebBrowser* inBrowser, nsIDOMEventTarget** aTarget)
{
NS_ENSURE_ARG_POINTER(inBrowser);
@ -127,7 +127,7 @@ GetPIDOMEventTarget( nsWebBrowser* inBrowser, nsPIDOMEventTarget** aTarget)
NS_ENSURE_TRUE(domWindowPrivate, NS_ERROR_FAILURE);
nsPIDOMWindow *rootWindow = domWindowPrivate->GetPrivateRoot();
NS_ENSURE_TRUE(rootWindow, NS_ERROR_FAILURE);
nsCOMPtr<nsPIDOMEventTarget> piTarget =
nsCOMPtr<nsIDOMEventTarget> piTarget =
do_QueryInterface(rootWindow->GetChromeEventHandler());
NS_ENSURE_TRUE(piTarget, NS_ERROR_FAILURE);
*aTarget = piTarget;
@ -888,7 +888,7 @@ nsDocShellTreeOwner::AddChromeListeners()
}
// register dragover and drop event listeners with the listener manager
nsCOMPtr<nsPIDOMEventTarget> piTarget;
nsCOMPtr<nsIDOMEventTarget> piTarget;
GetPIDOMEventTarget(mWebBrowser, getter_AddRefs(piTarget));
nsCOMPtr<nsIDOMEventGroup> sysGroup;
@ -922,7 +922,7 @@ nsDocShellTreeOwner::RemoveChromeListeners()
NS_RELEASE(mChromeContextMenuListener);
}
nsCOMPtr<nsPIDOMEventTarget> piTarget;
nsCOMPtr<nsIDOMEventTarget> piTarget;
GetPIDOMEventTarget(mWebBrowser, getter_AddRefs(piTarget));
if (!piTarget)
return NS_OK;

6
embedding/browser/webBrowser/nsDocShellTreeOwner.h
Просмотреть файл

@ -66,7 +66,7 @@
#include "nsITooltipTextProvider.h"
#include "nsCTooltipTextProvider.h"
#include "nsIDroppedLinkHandler.h"
#include "nsPIDOMEventTarget.h"
#include "nsIDOMEventTarget.h"
#include "nsCommandHandler.h"
class nsWebBrowser;
@ -225,7 +225,7 @@ private:
NS_IMETHOD HideTooltip ( ) ;
nsWebBrowser* mWebBrowser;
nsCOMPtr<nsPIDOMEventTarget> mEventTarget;
nsCOMPtr<nsIDOMEventTarget> mEventTarget;
nsCOMPtr<nsITooltipTextProvider> mTooltipTextProvider;
// This must be a strong ref in order to make sure we can hide the tooltip
@ -292,7 +292,7 @@ private:
PRPackedBool mContextMenuListenerInstalled;
nsWebBrowser* mWebBrowser;
nsCOMPtr<nsPIDOMEventTarget> mEventTarget;
nsCOMPtr<nsIDOMEventTarget> mEventTarget;
nsCOMPtr<nsIWebBrowserChrome> mWebBrowserChrome;
}; // class ChromeContextMenuListener

6
extensions/spellcheck/src/mozInlineSpellChecker.cpp
Просмотреть файл

@ -73,7 +73,7 @@
#include "nsIDOMDocument.h"
#include "nsIDOMElement.h"
#include "nsIDOMEventTarget.h"
#include "nsPIDOMEventTarget.h"
#include "nsIDOMEventTarget.h"
#include "nsIDOMMouseEvent.h"
#include "nsIDOMKeyEvent.h"
#include "nsIDOMNode.h"
@ -645,7 +645,7 @@ mozInlineSpellChecker::RegisterEventListeners()
nsresult rv = editor->GetDocument(getter_AddRefs(doc));
NS_ENSURE_SUCCESS(rv, rv);
nsCOMPtr<nsPIDOMEventTarget> piTarget = do_QueryInterface(doc, &rv);
nsCOMPtr<nsIDOMEventTarget> piTarget = do_QueryInterface(doc, &rv);
NS_ENSURE_SUCCESS(rv, rv);
nsIEventListenerManager* elmP = piTarget->GetListenerManager(PR_TRUE);
@ -678,7 +678,7 @@ mozInlineSpellChecker::UnregisterEventListeners()
editor->GetDocument(getter_AddRefs(doc));
NS_ENSURE_TRUE(doc, NS_ERROR_NULL_POINTER);
nsCOMPtr<nsPIDOMEventTarget> piTarget = do_QueryInterface(doc);
nsCOMPtr<nsIDOMEventTarget> piTarget = do_QueryInterface(doc);
NS_ENSURE_TRUE(piTarget, NS_ERROR_NULL_POINTER);
nsCOMPtr<nsIEventListenerManager> elmP =

6
extensions/widgetutils/src/nsWidgetUtils.cpp
Просмотреть файл

@ -445,7 +445,7 @@ nsWidgetUtils::GetChromeEventHandler(nsIDOMWindow *aDOMWin,
nsIDOMEventTarget **aChromeTarget)
{
nsCOMPtr<nsPIDOMWindow> privateDOMWindow(do_QueryInterface(aDOMWin));
nsPIDOMEventTarget* chromeEventHandler = nsnull;
nsIDOMEventTarget* chromeEventHandler = nsnull;
if (privateDOMWindow) {
chromeEventHandler = privateDOMWindow->GetChromeEventHandler();
}
@ -467,7 +467,7 @@ nsWidgetUtils::RemoveWindowListeners(nsIDOMWindow *aDOMWin)
}
// Use capturing, otherwise the normal find next will get activated when ours should
nsCOMPtr<nsPIDOMEventTarget> piTarget(do_QueryInterface(chromeEventHandler));
nsCOMPtr<nsIDOMEventTarget> piTarget(do_QueryInterface(chromeEventHandler));
// Remove DOM Text listener for IME text events
rv = piTarget->RemoveEventListenerByIID(static_cast<nsIDOMMouseListener*>(this),
@ -495,7 +495,7 @@ nsWidgetUtils::AttachWindowListeners(nsIDOMWindow *aDOMWin)
}
// Use capturing, otherwise the normal find next will get activated when ours should
nsCOMPtr<nsPIDOMEventTarget> piTarget(do_QueryInterface(chromeEventHandler));
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),

6
layout/base/nsPresContext.cpp
Просмотреть файл

@ -1711,7 +1711,7 @@ nsPresContext::MediaFeatureValuesChanged(PRBool aCallerWillRebuildStyleData)
if (!notifyList.IsEmpty()) {
nsPIDOMWindow *win = mDocument->GetInnerWindow();
nsCOMPtr<nsPIDOMEventTarget> et = do_QueryInterface(win);
nsCOMPtr<nsIDOMEventTarget> et = do_QueryInterface(win);
nsCxPusher pusher;
for (PRUint32 i = 0, i_end = notifyList.Length(); i != i_end; ++i) {
@ -2066,7 +2066,7 @@ MayHavePaintEventListener(nsPIDOMWindow* aInnerWindow)
if (aInnerWindow->HasPaintEventListeners())
return PR_TRUE;
nsPIDOMEventTarget* parentTarget = aInnerWindow->GetParentTarget();
nsIDOMEventTarget* parentTarget = aInnerWindow->GetParentTarget();
if (!parentTarget)
return PR_FALSE;
@ -2096,7 +2096,7 @@ MayHavePaintEventListener(nsPIDOMWindow* aInnerWindow)
return MayHavePaintEventListener(window);
nsCOMPtr<nsPIWindowRoot> root = do_QueryInterface(parentTarget);
nsPIDOMEventTarget* tabChildGlobal;
nsIDOMEventTarget* tabChildGlobal;
return root &&
(tabChildGlobal = root->GetParentTarget()) &&
(manager = tabChildGlobal->GetListenerManager(PR_FALSE)) &&

4
toolkit/components/satchel/nsFormFillController.cpp
Просмотреть файл

@ -1123,7 +1123,7 @@ nsFormFillController::AddWindowListeners(nsIDOMWindow *aWindow)
return;
nsCOMPtr<nsPIDOMWindow> privateDOMWindow(do_QueryInterface(aWindow));
nsPIDOMEventTarget* chromeEventHandler = nsnull;
nsIDOMEventTarget* chromeEventHandler = nsnull;
if (privateDOMWindow)
chromeEventHandler = privateDOMWindow->GetChromeEventHandler();
@ -1185,7 +1185,7 @@ nsFormFillController::RemoveWindowListeners(nsIDOMWindow *aWindow)
mPwmgrInputs.Enumerate(RemoveForDOMDocumentEnumerator, domDoc);
nsCOMPtr<nsPIDOMWindow> privateDOMWindow(do_QueryInterface(aWindow));
nsPIDOMEventTarget* chromeEventHandler = nsnull;
nsIDOMEventTarget* chromeEventHandler = nsnull;
if (privateDOMWindow)
chromeEventHandler = privateDOMWindow->GetChromeEventHandler();

8
widget/public/nsGUIEvent.h
Просмотреть файл

@ -52,7 +52,7 @@
#include "nsIDOMKeyEvent.h"
#include "nsIDOMNSMouseEvent.h"
#include "nsIDOMDataTransfer.h"
#include "nsPIDOMEventTarget.h"
#include "nsIDOMEventTarget.h"
#include "nsWeakPtr.h"
#include "nsIWidget.h"
#include "nsTArray.h"
@ -602,9 +602,9 @@ public:
// Additional type info for user defined events
nsCOMPtr<nsIAtom> userType;
// Event targets, needed by DOM Events
nsCOMPtr<nsPIDOMEventTarget> target;
nsCOMPtr<nsPIDOMEventTarget> currentTarget;
nsCOMPtr<nsPIDOMEventTarget> originalTarget;
nsCOMPtr<nsIDOMEventTarget> target;
nsCOMPtr<nsIDOMEventTarget> currentTarget;
nsCOMPtr<nsIDOMEventTarget> originalTarget;
};
/**

2
xpfe/appshell/src/nsWebShellWindow.cpp
Просмотреть файл

@ -744,7 +744,7 @@ PRBool nsWebShellWindow::ExecuteCloseHandler()
nsCOMPtr<nsIXULWindow> kungFuDeathGrip(this);
nsCOMPtr<nsPIDOMWindow> window(do_GetInterface(mDocShell));
nsCOMPtr<nsPIDOMEventTarget> eventTarget = do_QueryInterface(window);
nsCOMPtr<nsIDOMEventTarget> eventTarget = do_QueryInterface(window);
if (eventTarget) {
nsCOMPtr<nsIContentViewer> contentViewer;