Skip to content

Commit 84078f9

Browse files
masayuki-nakanomasayuki-nakano
committed
Bug 920377 part.26 Get rid of nsInputEvent r=roc
1 parent e98333c commit 84078f9

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

53 files changed

+146
-129
lines changed

‎content/base/public/Element.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -761,7 +761,7 @@ class Element : public FragmentOrElement
761761
* will be respected.
762762
*/
763763
static nsresult DispatchClickEvent(nsPresContext* aPresContext,
764-
nsInputEvent* aSourceEvent,
764+
WidgetInputEvent* aSourceEvent,
765765
nsIContent* aTarget,
766766
bool aFullDispatch,
767767
const EventFlags* aFlags,

‎content/base/src/Element.cpp

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1405,7 +1405,7 @@ Element::DispatchEvent(nsPresContext* aPresContext,
14051405
/* static */
14061406
nsresult
14071407
Element::DispatchClickEvent(nsPresContext* aPresContext,
1408-
nsInputEvent* aSourceEvent,
1408+
WidgetInputEvent* aSourceEvent,
14091409
nsIContent* aTarget,
14101410
bool aFullDispatch,
14111411
const EventFlags* aExtraEventFlags,
@@ -2217,7 +2217,8 @@ Element::PostHandleEventForLinks(nsEventChainPostVisitor& aVisitor)
22172217

22182218
case NS_MOUSE_CLICK:
22192219
if (aVisitor.mEvent->IsLeftClickEvent()) {
2220-
nsInputEvent* inputEvent = static_cast<nsInputEvent*>(aVisitor.mEvent);
2220+
WidgetInputEvent* inputEvent =
2221+
static_cast<WidgetInputEvent*>(aVisitor.mEvent);
22212222
if (inputEvent->IsControl() || inputEvent->IsMeta() ||
22222223
inputEvent->IsAlt() ||inputEvent->IsShift()) {
22232224
break;

‎content/events/src/nsDOMDragEvent.cpp

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,11 @@
99
#include "prtime.h"
1010
#include "mozilla/MouseEvents.h"
1111

12+
using namespace mozilla;
13+
1214
nsDOMDragEvent::nsDOMDragEvent(mozilla::dom::EventTarget* aOwner,
1315
nsPresContext* aPresContext,
14-
nsInputEvent* aEvent)
16+
WidgetInputEvent* aEvent)
1517
: nsDOMMouseEvent(aOwner, aPresContext, aEvent ? aEvent :
1618
new nsDragEvent(false, 0, nullptr))
1719
{

‎content/events/src/nsDOMDragEvent.h

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,8 @@ class nsDOMDragEvent : public nsDOMMouseEvent,
1616
{
1717
public:
1818
nsDOMDragEvent(mozilla::dom::EventTarget* aOwner,
19-
nsPresContext* aPresContext, nsInputEvent* aEvent);
19+
nsPresContext* aPresContext,
20+
mozilla::WidgetInputEvent* aEvent);
2021
virtual ~nsDOMDragEvent();
2122

2223
NS_DECL_ISUPPORTS_INHERITED

‎content/events/src/nsDOMEvent.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -530,8 +530,8 @@ nsDOMEvent::DuplicatePrivateData()
530530
}
531531
case NS_INPUT_EVENT:
532532
{
533-
nsInputEvent* oldInputEvent = static_cast<nsInputEvent*>(mEvent);
534-
nsInputEvent* inputEvent = new nsInputEvent(false, msg, nullptr);
533+
WidgetInputEvent* oldInputEvent = static_cast<WidgetInputEvent*>(mEvent);
534+
WidgetInputEvent* inputEvent = new WidgetInputEvent(false, msg, nullptr);
535535
inputEvent->AssignInputEventData(*oldInputEvent, true);
536536
newEvent = inputEvent;
537537
break;

‎content/events/src/nsDOMKeyboardEvent.h

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -37,22 +37,22 @@ class nsDOMKeyboardEvent : public nsDOMUIEvent,
3737

3838
bool AltKey()
3939
{
40-
return static_cast<nsInputEvent*>(mEvent)->IsAlt();
40+
return static_cast<mozilla::WidgetInputEvent*>(mEvent)->IsAlt();
4141
}
4242

4343
bool CtrlKey()
4444
{
45-
return static_cast<nsInputEvent*>(mEvent)->IsControl();
45+
return static_cast<mozilla::WidgetInputEvent*>(mEvent)->IsControl();
4646
}
4747

4848
bool ShiftKey()
4949
{
50-
return static_cast<nsInputEvent*>(mEvent)->IsShift();
50+
return static_cast<mozilla::WidgetInputEvent*>(mEvent)->IsShift();
5151
}
5252

5353
bool MetaKey()
5454
{
55-
return static_cast<nsInputEvent*>(mEvent)->IsMeta();
55+
return static_cast<mozilla::WidgetInputEvent*>(mEvent)->IsMeta();
5656
}
5757

5858
bool GetModifierState(const nsAString& aKey)

‎content/events/src/nsDOMMouseEvent.cpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ using namespace mozilla;
1313

1414
nsDOMMouseEvent::nsDOMMouseEvent(mozilla::dom::EventTarget* aOwner,
1515
nsPresContext* aPresContext,
16-
nsInputEvent* aEvent)
16+
WidgetInputEvent* aEvent)
1717
: nsDOMUIEvent(aOwner, aPresContext, aEvent ? aEvent :
1818
new nsMouseEvent(false, 0, nullptr,
1919
nsMouseEvent::eReal))
@@ -88,7 +88,7 @@ nsDOMMouseEvent::InitMouseEvent(const nsAString & aType, bool aCanBubble, bool a
8888
{
8989
static_cast<nsMouseEvent_base*>(mEvent)->relatedTarget = aRelatedTarget;
9090
static_cast<nsMouseEvent_base*>(mEvent)->button = aButton;
91-
nsInputEvent* inputEvent = static_cast<nsInputEvent*>(mEvent);
91+
WidgetInputEvent* inputEvent = static_cast<WidgetInputEvent*>(mEvent);
9292
inputEvent->InitBasicModifiers(aCtrlKey, aAltKey, aShiftKey, aMetaKey);
9393
mClientPoint.x = aClientX;
9494
mClientPoint.y = aClientY;
@@ -139,7 +139,7 @@ nsDOMMouseEvent::InitMouseEvent(const nsAString& aType,
139139
case NS_WHEEL_EVENT:
140140
case NS_DRAG_EVENT:
141141
case NS_SIMPLE_GESTURE_EVENT:
142-
static_cast<nsInputEvent*>(mEvent)->modifiers = modifiers;
142+
static_cast<WidgetInputEvent*>(mEvent)->modifiers = modifiers;
143143
return NS_OK;
144144
default:
145145
MOZ_CRASH("There is no space to store the modifiers");
@@ -430,7 +430,7 @@ nsDOMMouseEvent::GetMozInputSource(uint16_t* aInputSource)
430430
nsresult NS_NewDOMMouseEvent(nsIDOMEvent** aInstancePtrResult,
431431
mozilla::dom::EventTarget* aOwner,
432432
nsPresContext* aPresContext,
433-
nsInputEvent *aEvent)
433+
WidgetInputEvent* aEvent)
434434
{
435435
nsDOMMouseEvent* it = new nsDOMMouseEvent(aOwner, aPresContext, aEvent);
436436
return CallQueryInterface(it, aInstancePtrResult);

‎content/events/src/nsDOMMouseEvent.h

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,8 @@ class nsDOMMouseEvent : public nsDOMUIEvent,
1616
{
1717
public:
1818
nsDOMMouseEvent(mozilla::dom::EventTarget* aOwner,
19-
nsPresContext* aPresContext, nsInputEvent* aEvent);
19+
nsPresContext* aPresContext,
20+
mozilla::WidgetInputEvent* aEvent);
2021
virtual ~nsDOMMouseEvent();
2122

2223
NS_DECL_ISUPPORTS_INHERITED
@@ -45,19 +46,19 @@ class nsDOMMouseEvent : public nsDOMUIEvent,
4546
int32_t ClientY();
4647
bool CtrlKey()
4748
{
48-
return static_cast<nsInputEvent*>(mEvent)->IsControl();
49+
return static_cast<mozilla::WidgetInputEvent*>(mEvent)->IsControl();
4950
}
5051
bool ShiftKey()
5152
{
52-
return static_cast<nsInputEvent*>(mEvent)->IsShift();
53+
return static_cast<mozilla::WidgetInputEvent*>(mEvent)->IsShift();
5354
}
5455
bool AltKey()
5556
{
56-
return static_cast<nsInputEvent*>(mEvent)->IsAlt();
57+
return static_cast<mozilla::WidgetInputEvent*>(mEvent)->IsAlt();
5758
}
5859
bool MetaKey()
5960
{
60-
return static_cast<nsInputEvent*>(mEvent)->IsMeta();
61+
return static_cast<mozilla::WidgetInputEvent*>(mEvent)->IsMeta();
6162
}
6263
uint16_t Button();
6364
uint16_t Buttons();

‎content/events/src/nsDOMMouseScrollEvent.cpp

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,11 @@
77
#include "prtime.h"
88
#include "mozilla/MouseEvents.h"
99

10+
using namespace mozilla;
11+
1012
nsDOMMouseScrollEvent::nsDOMMouseScrollEvent(mozilla::dom::EventTarget* aOwner,
1113
nsPresContext* aPresContext,
12-
nsInputEvent* aEvent)
14+
WidgetInputEvent* aEvent)
1315
: nsDOMMouseEvent(aOwner, aPresContext,
1416
aEvent ? aEvent : new nsMouseScrollEvent(false, 0, nullptr))
1517
{
@@ -94,7 +96,7 @@ nsDOMMouseScrollEvent::Axis()
9496
nsresult NS_NewDOMMouseScrollEvent(nsIDOMEvent** aInstancePtrResult,
9597
mozilla::dom::EventTarget* aOwner,
9698
nsPresContext* aPresContext,
97-
nsInputEvent *aEvent)
99+
WidgetInputEvent* aEvent)
98100
{
99101
nsDOMMouseScrollEvent* it =
100102
new nsDOMMouseScrollEvent(aOwner, aPresContext, aEvent);

‎content/events/src/nsDOMMouseScrollEvent.h

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,8 @@ class nsDOMMouseScrollEvent : public nsDOMMouseEvent,
1515
{
1616
public:
1717
nsDOMMouseScrollEvent(mozilla::dom::EventTarget* aOwner,
18-
nsPresContext* aPresContext, nsInputEvent* aEvent);
18+
nsPresContext* aPresContext,
19+
mozilla::WidgetInputEvent* aEvent);
1920
virtual ~nsDOMMouseScrollEvent();
2021

2122
NS_DECL_ISUPPORTS_INHERITED

‎content/events/src/nsDOMTouchEvent.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -115,8 +115,8 @@ nsDOMTouchEvent::InitTouchEvent(const nsAString& aType,
115115
return;
116116
}
117117

118-
static_cast<nsInputEvent*>(mEvent)->InitBasicModifiers(aCtrlKey, aAltKey,
119-
aShiftKey, aMetaKey);
118+
static_cast<WidgetInputEvent*>(mEvent)->
119+
InitBasicModifiers(aCtrlKey, aAltKey, aShiftKey, aMetaKey);
120120
mTouches = aTouches;
121121
mTargetTouches = aTargetTouches;
122122
mChangedTouches = aChangedTouches;

‎content/events/src/nsDOMTouchEvent.h

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -101,22 +101,22 @@ class nsDOMTouchEvent : public nsDOMUIEvent
101101

102102
bool AltKey()
103103
{
104-
return static_cast<nsInputEvent*>(mEvent)->IsAlt();
104+
return static_cast<mozilla::WidgetInputEvent*>(mEvent)->IsAlt();
105105
}
106106

107107
bool MetaKey()
108108
{
109-
return static_cast<nsInputEvent*>(mEvent)->IsMeta();
109+
return static_cast<mozilla::WidgetInputEvent*>(mEvent)->IsMeta();
110110
}
111111

112112
bool CtrlKey()
113113
{
114-
return static_cast<nsInputEvent*>(mEvent)->IsControl();
114+
return static_cast<mozilla::WidgetInputEvent*>(mEvent)->IsControl();
115115
}
116116

117117
bool ShiftKey()
118118
{
119-
return static_cast<nsInputEvent*>(mEvent)->IsShift();
119+
return static_cast<mozilla::WidgetInputEvent*>(mEvent)->IsShift();
120120
}
121121

122122
void InitTouchEvent(const nsAString& aType,

‎content/events/src/nsDOMUIEvent.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -463,9 +463,9 @@ bool
463463
nsDOMUIEvent::GetModifierStateInternal(const nsAString& aKey)
464464
{
465465
if (!mEvent->IsInputDerivedEvent()) {
466-
MOZ_CRASH("mEvent must be nsInputEvent or derived class");
466+
MOZ_CRASH("mEvent must be WidgetInputEvent or derived class");
467467
}
468-
nsInputEvent* inputEvent = static_cast<nsInputEvent*>(mEvent);
468+
WidgetInputEvent* inputEvent = static_cast<WidgetInputEvent*>(mEvent);
469469
if (aKey.EqualsLiteral(NS_DOM_KEYNAME_SHIFT)) {
470470
return inputEvent->IsShift();
471471
}

‎content/events/src/nsDOMXULCommandEvent.cpp

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,13 @@
77
#include "nsDOMXULCommandEvent.h"
88
#include "prtime.h"
99

10+
using namespace mozilla;
11+
1012
nsDOMXULCommandEvent::nsDOMXULCommandEvent(mozilla::dom::EventTarget* aOwner,
1113
nsPresContext* aPresContext,
12-
nsInputEvent* aEvent)
14+
WidgetInputEvent* aEvent)
1315
: nsDOMUIEvent(aOwner, aPresContext,
14-
aEvent ? aEvent : new nsInputEvent(false, 0, nullptr))
16+
aEvent ? aEvent : new WidgetInputEvent(false, 0, nullptr))
1517
{
1618
if (aEvent) {
1719
mEventIsInternal = false;
@@ -95,7 +97,7 @@ nsDOMXULCommandEvent::InitCommandEvent(const nsAString& aType,
9597
nsresult NS_NewDOMXULCommandEvent(nsIDOMEvent** aInstancePtrResult,
9698
mozilla::dom::EventTarget* aOwner,
9799
nsPresContext* aPresContext,
98-
nsInputEvent *aEvent)
100+
WidgetInputEvent* aEvent)
99101
{
100102
nsDOMXULCommandEvent* it =
101103
new nsDOMXULCommandEvent(aOwner, aPresContext, aEvent);

‎content/events/src/nsDOMXULCommandEvent.h

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,8 @@ class nsDOMXULCommandEvent : public nsDOMUIEvent,
1818
{
1919
public:
2020
nsDOMXULCommandEvent(mozilla::dom::EventTarget* aOwner,
21-
nsPresContext* aPresContext, nsInputEvent* aEvent);
21+
nsPresContext* aPresContext,
22+
mozilla::WidgetInputEvent* aEvent);
2223

2324
NS_DECL_ISUPPORTS_INHERITED
2425
NS_DECL_CYCLE_COLLECTION_CLASS_INHERITED(nsDOMXULCommandEvent, nsDOMUIEvent)
@@ -76,8 +77,8 @@ class nsDOMXULCommandEvent : public nsDOMUIEvent,
7677

7778
protected:
7879
// Convenience accessor for the event
79-
nsInputEvent* Event() {
80-
return static_cast<nsInputEvent*>(mEvent);
80+
mozilla::WidgetInputEvent* Event() {
81+
return static_cast<mozilla::WidgetInputEvent*>(mEvent);
8182
}
8283

8384
nsCOMPtr<nsIDOMEvent> mSourceEvent;

‎content/events/src/nsEventDispatcher.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -710,13 +710,13 @@ nsEventDispatcher::CreateEvent(mozilla::dom::EventTarget* aOwner,
710710
aPresContext, static_cast<WidgetCompositionEvent*>(aEvent));
711711
case NS_MOUSE_EVENT:
712712
return NS_NewDOMMouseEvent(aDOMEvent, aOwner, aPresContext,
713-
static_cast<nsInputEvent*>(aEvent));
713+
static_cast<WidgetInputEvent*>(aEvent));
714714
case NS_FOCUS_EVENT:
715715
return NS_NewDOMFocusEvent(aDOMEvent, aOwner, aPresContext,
716716
static_cast<InternalFocusEvent*>(aEvent));
717717
case NS_MOUSE_SCROLL_EVENT:
718718
return NS_NewDOMMouseScrollEvent(aDOMEvent, aOwner, aPresContext,
719-
static_cast<nsInputEvent*>(aEvent));
719+
static_cast<WidgetInputEvent*>(aEvent));
720720
case NS_WHEEL_EVENT:
721721
return NS_NewDOMWheelEvent(aDOMEvent, aOwner, aPresContext,
722722
static_cast<WheelEvent*>(aEvent));

‎content/events/src/nsEventStateManager.cpp

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3400,10 +3400,9 @@ nsEventStateManager::PostHandleEvent(nsPresContext* aPresContext,
34003400
nsIFocusManager* fm = nsFocusManager::GetFocusManager();
34013401
if (fm && mDocument) {
34023402
// Shift focus forward or back depending on shift key
3403-
bool isDocMove = ((nsInputEvent*)aEvent)->IsControl() ||
3404-
(keyEvent->keyCode == NS_VK_F6);
3405-
uint32_t dir =
3406-
static_cast<nsInputEvent*>(aEvent)->IsShift() ?
3403+
bool isDocMove =
3404+
keyEvent->IsControl() || keyEvent->keyCode == NS_VK_F6;
3405+
uint32_t dir = keyEvent->IsShift() ?
34073406
(isDocMove ? static_cast<uint32_t>(nsIFocusManager::MOVEFOCUS_BACKWARDDOC) :
34083407
static_cast<uint32_t>(nsIFocusManager::MOVEFOCUS_BACKWARD)) :
34093408
(isDocMove ? static_cast<uint32_t>(nsIFocusManager::MOVEFOCUS_FORWARDDOC) :

‎content/html/content/src/HTMLInputElement.cpp

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3696,7 +3696,8 @@ HTMLInputElement::PostHandleEventForRangeThumb(nsEventChainPostVisitor& aVisitor
36963696
if (nsIPresShell::GetCapturingContent()) {
36973697
break; // don't start drag if someone else is already capturing
36983698
}
3699-
nsInputEvent* inputEvent = static_cast<nsInputEvent*>(aVisitor.mEvent);
3699+
WidgetInputEvent* inputEvent =
3700+
static_cast<WidgetInputEvent*>(aVisitor.mEvent);
37003701
if (inputEvent->IsShift() || inputEvent->IsControl() ||
37013702
inputEvent->IsAlt() || inputEvent->IsMeta() ||
37023703
inputEvent->IsAltGraph() || inputEvent->IsFn() ||
@@ -3732,8 +3733,9 @@ HTMLInputElement::PostHandleEventForRangeThumb(nsEventChainPostVisitor& aVisitor
37323733
CancelRangeThumbDrag();
37333734
break;
37343735
}
3735-
SetValueOfRangeForUserEvent(rangeFrame->GetValueAtEventPoint(
3736-
static_cast<nsInputEvent*>(aVisitor.mEvent)));
3736+
SetValueOfRangeForUserEvent(
3737+
rangeFrame->GetValueAtEventPoint(
3738+
static_cast<WidgetInputEvent*>(aVisitor.mEvent)));
37373739
aVisitor.mEvent->mFlags.mMultipleActionsPrevented = true;
37383740
break;
37393741

@@ -3746,7 +3748,7 @@ HTMLInputElement::PostHandleEventForRangeThumb(nsEventChainPostVisitor& aVisitor
37463748
// call CancelRangeThumbDrag() if that is the case. We just finish off
37473749
// the drag and set our final value (unless someone has called
37483750
// preventDefault() and prevents us getting here).
3749-
FinishRangeThumbDrag(static_cast<nsInputEvent*>(aVisitor.mEvent));
3751+
FinishRangeThumbDrag(static_cast<WidgetInputEvent*>(aVisitor.mEvent));
37503752
aVisitor.mEvent->mFlags.mMultipleActionsPrevented = true;
37513753
break;
37523754

‎content/html/content/src/HTMLLabelElement.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -197,7 +197,7 @@ HTMLLabelElement::PostHandleEvent(nsEventChainPostVisitor& aVisitor)
197197
EventFlags eventFlags;
198198
eventFlags.mMultipleActionsPrevented = true;
199199
DispatchClickEvent(aVisitor.mPresContext,
200-
static_cast<nsInputEvent*>(aVisitor.mEvent),
200+
static_cast<WidgetInputEvent*>(aVisitor.mEvent),
201201
content, false, &eventFlags, &status);
202202
// Do we care about the status this returned? I don't think we do...
203203
// Don't run another <label> off of this click

‎content/xbl/src/nsXBLPrototypeHandler.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -912,7 +912,7 @@ nsXBLPrototypeHandler::ModifiersMatchMask(nsIDOMUIEvent* aEvent,
912912
{
913913
nsEvent* event = aEvent->GetInternalNSEvent();
914914
NS_ENSURE_TRUE(event && event->IsInputDerivedEvent(), false);
915-
nsInputEvent* inputEvent = static_cast<nsInputEvent*>(event);
915+
WidgetInputEvent* inputEvent = static_cast<WidgetInputEvent*>(event);
916916

917917
if (mKeyMask & cMetaMask) {
918918
if (inputEvent->IsMeta() != ((mKeyMask & cMeta) != 0)) {

‎content/xul/content/src/nsXULElement.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1190,8 +1190,8 @@ nsXULElement::PreHandleEvent(nsEventChainPreVisitor& aVisitor)
11901190
}
11911191
}
11921192

1193-
nsInputEvent* orig =
1194-
static_cast<nsInputEvent*>(aVisitor.mEvent);
1193+
WidgetInputEvent* orig =
1194+
static_cast<WidgetInputEvent*>(aVisitor.mEvent);
11951195
nsContentUtils::DispatchXULCommand(
11961196
commandContent,
11971197
aVisitor.mEvent->mFlags.mIsTrusted,

0 commit comments

Comments
 (0)