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

0 commit comments

Comments
 (0)