summaryrefslogtreecommitdiffstats
path: root/dom
diff options
context:
space:
mode:
authorwolfbeast <mcwerewolf@gmail.com>2018-06-26 13:53:12 +0200
committerwolfbeast <mcwerewolf@gmail.com>2018-06-26 13:53:12 +0200
commita7bc62dcfe5495c8b53532c1b585af07171b4403 (patch)
tree40856bf1ba28f0c304d86769519ec52821605c39 /dom
parent783f57d74b0caf84cec01a0ae43a2a8cb8697673 (diff)
downloadUXP-a7bc62dcfe5495c8b53532c1b585af07171b4403.tar
UXP-a7bc62dcfe5495c8b53532c1b585af07171b4403.tar.gz
UXP-a7bc62dcfe5495c8b53532c1b585af07171b4403.tar.lz
UXP-a7bc62dcfe5495c8b53532c1b585af07171b4403.tar.xz
UXP-a7bc62dcfe5495c8b53532c1b585af07171b4403.zip
Issue #12 Part 2: Stop using nsIDOMEvent in IsAcceptableInputEvent.
Diffstat (limited to 'dom')
-rwxr-xr-xdom/events/Event.cpp16
1 files changed, 3 insertions, 13 deletions
diff --git a/dom/events/Event.cpp b/dom/events/Event.cpp
index 4b9776c0a..f33bfa5a8 100755
--- a/dom/events/Event.cpp
+++ b/dom/events/Event.cpp
@@ -280,16 +280,10 @@ Event::GetType(nsAString& aType)
return NS_OK;
}
-static EventTarget*
-GetDOMEventTarget(nsIDOMEventTarget* aTarget)
-{
- return aTarget ? aTarget->GetTargetForDOMEvent() : nullptr;
-}
-
EventTarget*
Event::GetTarget() const
{
- return GetDOMEventTarget(mEvent->mTarget);
+ return mEvent->GetDOMEventTarget();
}
NS_IMETHODIMP
@@ -302,7 +296,7 @@ Event::GetTarget(nsIDOMEventTarget** aTarget)
EventTarget*
Event::GetCurrentTarget() const
{
- return GetDOMEventTarget(mEvent->mCurrentTarget);
+ return mEvent->GetCurrentDOMEventTarget();
}
NS_IMETHODIMP
@@ -349,11 +343,7 @@ Event::GetExplicitOriginalTarget(nsIDOMEventTarget** aRealEventTarget)
EventTarget*
Event::GetOriginalTarget() const
{
- if (mEvent->mOriginalTarget) {
- return GetDOMEventTarget(mEvent->mOriginalTarget);
- }
-
- return GetTarget();
+ return mEvent->GetOriginalDOMEventTarget();
}
NS_IMETHODIMP