wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 835171 - get rid of remaining traces of nsPIDOMEventTarget; r=smaug

Browse Source
This commit is contained in:
Edwin Casasola 2013-01-29 11:46:07 +01:00
parent c04208962b
commit 2f218c35f1
3 changed files with 10 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -490,7 +490,7 @@ nsEventDispatcher::Dispatch(nsISupports* aTarget,
if (aEvent->mFlags.mRetargetToNonNativeAnonymous) {
nsCOMPtr<nsIContent> content = do_QueryInterface(target);
if (content && content->IsInNativeAnonymousSubtree()) {
nsCOMPtr<nsPIDOMEventTarget> newTarget =
nsCOMPtr<nsIDOMEventTarget> newTarget =
do_QueryInterface(content->FindFirstNonChromeOnlyAccessContent());
NS_ENSURE_STATE(newTarget);

10
dom/interfaces/events/nsIDOMEventTarget.idl
View File

@ -186,7 +186,7 @@ interface nsIDOMEventTarget : nsISupports
raises(DOMException);
/**
* Returns the nsPIDOMEventTarget object which should be used as the target
* Returns the nsIDOMEventTarget object which should be used as the target
* of DOMEvents.
* Usually |this| is returned, but for example global object returns
* the outer object.
@ -194,7 +194,7 @@ interface nsIDOMEventTarget : nsISupports
[notxpcom, nostdcall] nsIDOMEventTarget GetTargetForDOMEvent();
/**
* Returns the nsPIDOMEventTarget object which should be used as the target
* Returns the nsIDOMEventTarget 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.
@ -286,11 +286,9 @@ interface nsIDOMEventTarget : nsISupports
%{C++
typedef nsIDOMEventTarget nsPIDOMEventTarget;
#define NS_IMPL_DOMTARGET_DEFAULTS(_class) \
nsPIDOMEventTarget* _class::GetTargetForDOMEvent() { return this; } \
nsPIDOMEventTarget* _class::GetTargetForEventTargetChain() { return this; } \
nsIDOMEventTarget* _class::GetTargetForDOMEvent() { return this; } \
nsIDOMEventTarget* _class::GetTargetForEventTargetChain() { return this; } \
nsresult _class::WillHandleEvent(nsEventChainPostVisitor& aVisitor) { return NS_OK; } \
JSContext* _class::GetJSContextForEventHandlers() { return nullptr; }

10
layout/base/nsPresShell.cpp
View File

@ -6013,7 +6013,7 @@ PresShell::HandleEvent(nsIFrame *aFrame,
nsCOMPtr<nsIDOMTouch> oldTouch;
gCaptureTouchList.Get(id, getter_AddRefs(oldTouch));
if (oldTouch) {
nsCOMPtr<nsPIDOMEventTarget> targetPtr;
nsCOMPtr<nsIDOMEventTarget> targetPtr;
oldTouch->GetTarget(getter_AddRefs(targetPtr));
domtouch->SetTarget(targetPtr);
gCaptureTouchList.Put(id, touch);
@ -6093,7 +6093,7 @@ PresShell::HandleEvent(nsIFrame *aFrame,
break;
}
nsCOMPtr<nsPIDOMEventTarget> targetPtr;
nsCOMPtr<nsIDOMEventTarget> targetPtr;
oldTouch->GetTarget(getter_AddRefs(targetPtr));
nsCOMPtr<nsIContent> content = do_QueryInterface(targetPtr);
if (!content) {
@ -6463,7 +6463,7 @@ PresShell::HandleEventInternal(nsEvent* aEvent, nsEventStatus* aStatus)
if (!oldTouch) {
continue;
}
nsCOMPtr<nsPIDOMEventTarget> targetPtr;
nsCOMPtr<nsIDOMEventTarget> targetPtr;
oldTouch->GetTarget(getter_AddRefs(targetPtr));
mCurrentEventContent = do_QueryInterface(targetPtr);
@ -6501,7 +6501,7 @@ PresShell::HandleEventInternal(nsEvent* aEvent, nsEventStatus* aStatus)
haveChanged = true;
}
nsCOMPtr<nsPIDOMEventTarget> targetPtr;
nsCOMPtr<nsIDOMEventTarget> targetPtr;
oldTouch->GetTarget(getter_AddRefs(targetPtr));
if (!targetPtr) {
touches.RemoveElementAt(i);
@ -6654,7 +6654,7 @@ PresShell::DispatchTouchEvent(nsEvent *aEvent,
continue;
}
nsCOMPtr<nsPIDOMEventTarget> targetPtr;
nsCOMPtr<nsIDOMEventTarget> targetPtr;
touch->GetTarget(getter_AddRefs(targetPtr));
nsCOMPtr<nsIContent> content = do_QueryInterface(targetPtr);
if (!content) {