Skip to content

Commit 73191e0

Browse files
masayuki-nakanomasayuki-nakano
committed
Bug 920377 part.27 Get rid of nsMouseEvent_base r=roc
1 parent 84078f9 commit 73191e0

10 files changed

+34
-28
lines changed

‎content/events/src/nsDOMEvent.cpp

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -143,11 +143,13 @@ NS_IMPL_CYCLE_COLLECTION_UNLINK_BEGIN(nsDOMEvent)
143143
case NS_MOUSE_SCROLL_EVENT:
144144
case NS_WHEEL_EVENT:
145145
case NS_SIMPLE_GESTURE_EVENT:
146-
static_cast<nsMouseEvent_base*>(tmp->mEvent)->relatedTarget = nullptr;
146+
static_cast<WidgetMouseEventBase*>(tmp->mEvent)->relatedTarget =
147+
nullptr;
147148
break;
148149
case NS_DRAG_EVENT:
149150
static_cast<nsDragEvent*>(tmp->mEvent)->dataTransfer = nullptr;
150-
static_cast<nsMouseEvent_base*>(tmp->mEvent)->relatedTarget = nullptr;
151+
static_cast<WidgetMouseEventBase*>(tmp->mEvent)->relatedTarget =
152+
nullptr;
151153
break;
152154
case NS_CLIPBOARD_EVENT:
153155
static_cast<InternalClipboardEvent*>(tmp->mEvent)->clipboardData =
@@ -182,15 +184,15 @@ NS_IMPL_CYCLE_COLLECTION_TRAVERSE_BEGIN(nsDOMEvent)
182184
case NS_SIMPLE_GESTURE_EVENT:
183185
NS_CYCLE_COLLECTION_NOTE_EDGE_NAME(cb, "mEvent->relatedTarget");
184186
cb.NoteXPCOMChild(
185-
static_cast<nsMouseEvent_base*>(tmp->mEvent)->relatedTarget);
187+
static_cast<WidgetMouseEventBase*>(tmp->mEvent)->relatedTarget);
186188
break;
187189
case NS_DRAG_EVENT:
188190
NS_CYCLE_COLLECTION_NOTE_EDGE_NAME(cb, "mEvent->dataTransfer");
189191
cb.NoteXPCOMChild(
190192
static_cast<nsDragEvent*>(tmp->mEvent)->dataTransfer);
191193
NS_CYCLE_COLLECTION_NOTE_EDGE_NAME(cb, "mEvent->relatedTarget");
192194
cb.NoteXPCOMChild(
193-
static_cast<nsMouseEvent_base*>(tmp->mEvent)->relatedTarget);
195+
static_cast<WidgetMouseEventBase*>(tmp->mEvent)->relatedTarget);
194196
break;
195197
case NS_CLIPBOARD_EVENT:
196198
NS_CYCLE_COLLECTION_NOTE_EDGE_NAME(cb, "mEvent->clipboardData");

‎content/events/src/nsDOMMouseEvent.cpp

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -86,8 +86,9 @@ nsDOMMouseEvent::InitMouseEvent(const nsAString & aType, bool aCanBubble, bool a
8686
case NS_DRAG_EVENT:
8787
case NS_SIMPLE_GESTURE_EVENT:
8888
{
89-
static_cast<nsMouseEvent_base*>(mEvent)->relatedTarget = aRelatedTarget;
90-
static_cast<nsMouseEvent_base*>(mEvent)->button = aButton;
89+
static_cast<WidgetMouseEventBase*>(mEvent)->relatedTarget =
90+
aRelatedTarget;
91+
static_cast<WidgetMouseEventBase*>(mEvent)->button = aButton;
9192
WidgetInputEvent* inputEvent = static_cast<WidgetInputEvent*>(mEvent);
9293
inputEvent->InitBasicModifiers(aCtrlKey, aAltKey, aShiftKey, aMetaKey);
9394
mClientPoint.x = aClientX;
@@ -169,7 +170,7 @@ nsDOMMouseEvent::Constructor(const mozilla::dom::GlobalObject& aGlobal,
169170
case NS_WHEEL_EVENT:
170171
case NS_DRAG_EVENT:
171172
case NS_SIMPLE_GESTURE_EVENT:
172-
static_cast<nsMouseEvent_base*>(e->mEvent)->buttons = aParam.mButtons;
173+
static_cast<WidgetMouseEventBase*>(e->mEvent)->buttons = aParam.mButtons;
173174
break;
174175
default:
175176
break;
@@ -192,8 +193,8 @@ nsDOMMouseEvent::InitNSMouseEvent(const nsAString & aType, bool aCanBubble, bool
192193
aMetaKey, aButton, aRelatedTarget);
193194
NS_ENSURE_SUCCESS(rv, rv);
194195

195-
static_cast<nsMouseEvent_base*>(mEvent)->pressure = aPressure;
196-
static_cast<nsMouseEvent_base*>(mEvent)->inputSource = aInputSource;
196+
static_cast<WidgetMouseEventBase*>(mEvent)->pressure = aPressure;
197+
static_cast<WidgetMouseEventBase*>(mEvent)->inputSource = aInputSource;
197198
return NS_OK;
198199
}
199200

@@ -215,7 +216,7 @@ nsDOMMouseEvent::Button()
215216
case NS_WHEEL_EVENT:
216217
case NS_DRAG_EVENT:
217218
case NS_SIMPLE_GESTURE_EVENT:
218-
return static_cast<nsMouseEvent_base*>(mEvent)->button;
219+
return static_cast<WidgetMouseEventBase*>(mEvent)->button;
219220
default:
220221
NS_WARNING("Tried to get mouse button for non-mouse event!");
221222
return nsMouseEvent::eLeftButton;
@@ -240,7 +241,7 @@ nsDOMMouseEvent::Buttons()
240241
case NS_WHEEL_EVENT:
241242
case NS_DRAG_EVENT:
242243
case NS_SIMPLE_GESTURE_EVENT:
243-
return static_cast<nsMouseEvent_base*>(mEvent)->buttons;
244+
return static_cast<WidgetMouseEventBase*>(mEvent)->buttons;
244245
default:
245246
MOZ_CRASH("Tried to get mouse buttons for non-mouse event!");
246247
}
@@ -265,7 +266,8 @@ nsDOMMouseEvent::GetRelatedTarget()
265266
case NS_WHEEL_EVENT:
266267
case NS_DRAG_EVENT:
267268
case NS_SIMPLE_GESTURE_EVENT:
268-
relatedTarget = do_QueryInterface(static_cast<nsMouseEvent_base*>(mEvent)->relatedTarget);
269+
relatedTarget = do_QueryInterface(
270+
static_cast<WidgetMouseEventBase*>(mEvent)->relatedTarget);
269271
break;
270272
default:
271273
break;

‎content/events/src/nsDOMMouseEvent.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -95,11 +95,11 @@ class nsDOMMouseEvent : public nsDOMUIEvent,
9595
}
9696
float MozPressure() const
9797
{
98-
return static_cast<nsMouseEvent_base*>(mEvent)->pressure;
98+
return static_cast<mozilla::WidgetMouseEventBase*>(mEvent)->pressure;
9999
}
100100
uint16_t MozInputSource() const
101101
{
102-
return static_cast<nsMouseEvent_base*>(mEvent)->inputSource;
102+
return static_cast<mozilla::WidgetMouseEventBase*>(mEvent)->inputSource;
103103
}
104104
void InitNSMouseEvent(const nsAString & aType, bool aCanBubble, bool aCancelable,
105105
nsIDOMWindow *aView, int32_t aDetail, int32_t aScreenX,

‎widget/EventForwards.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,6 @@ class InternalMutationEvent;
105105
// TODO: Remove following typedefs
106106
typedef mozilla::WidgetEvent nsEvent;
107107
typedef mozilla::WidgetGUIEvent nsGUIEvent;
108-
typedef mozilla::WidgetMouseEventBase nsMouseEvent_base;
109108
typedef mozilla::WidgetMouseEvent nsMouseEvent;
110109
typedef mozilla::WidgetDragEvent nsDragEvent;
111110
typedef mozilla::WidgetMouseScrollEvent nsMouseScrollEvent;

‎widget/MouseEvents.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -424,7 +424,6 @@ typedef WidgetWheelEvent WheelEvent;
424424
} // namespace mozilla
425425

426426
// TODO: Remove following typedefs
427-
typedef mozilla::WidgetMouseEventBase nsMouseEvent_base;
428427
typedef mozilla::WidgetMouseEvent nsMouseEvent;
429428
typedef mozilla::WidgetDragEvent nsDragEvent;
430429
typedef mozilla::WidgetMouseScrollEvent nsMouseScrollEvent;

‎widget/cocoa/nsChildView.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -381,7 +381,7 @@ class ChildViewMouseTracker {
381381
static void ReEvaluateMouseEnterState(NSEvent* aEvent = nil, ChildView* aOldView = nil);
382382
static void ResendLastMouseMoveEvent();
383383
static ChildView* ViewForEvent(NSEvent* aEvent);
384-
static void AttachPluginEvent(nsMouseEvent_base& aMouseEvent,
384+
static void AttachPluginEvent(mozilla::WidgetMouseEventBase& aMouseEvent,
385385
ChildView* aView,
386386
NSEvent* aNativeMouseEvent,
387387
int aPluginEventType,

‎widget/cocoa/nsChildView.mm

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4852,8 +4852,8 @@ - (void) convertCocoaMouseEvent:(NSEvent*)aMouseEvent
48524852
outGeckoEvent->refPoint = LayoutDeviceIntPoint::FromUntyped(
48534853
mGeckoChild->CocoaPointsToDevPixels(localPoint));
48544854

4855-
nsMouseEvent_base* mouseEvent =
4856-
static_cast<nsMouseEvent_base*>(outGeckoEvent);
4855+
WidgetMouseEventBase* mouseEvent =
4856+
static_cast<WidgetMouseEventBase*>(outGeckoEvent);
48574857
mouseEvent->buttons = 0;
48584858
NSUInteger mouseButtons = [NSEvent pressedMouseButtons];
48594859

@@ -6137,7 +6137,7 @@ - (id)accessibilityAttributeValue:(NSString*)attribute
61376137
}
61386138

61396139
void
6140-
ChildViewMouseTracker::AttachPluginEvent(nsMouseEvent_base& aMouseEvent,
6140+
ChildViewMouseTracker::AttachPluginEvent(WidgetMouseEventBase& aMouseEvent,
61416141
ChildView* aView,
61426142
NSEvent* aNativeMouseEvent,
61436143
int aPluginEventType,

‎widget/gtk/nsGtkKeyUtils.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -560,7 +560,8 @@ KeymapWrapper::InitInputEvent(WidgetInputEvent& aInputEvent,
560560
return;
561561
}
562562

563-
nsMouseEvent_base& mouseEvent = static_cast<nsMouseEvent_base&>(aInputEvent);
563+
WidgetMouseEventBase& mouseEvent =
564+
static_cast<WidgetMouseEventBase&>(aInputEvent);
564565
mouseEvent.buttons = 0;
565566
if (aModifierState & GDK_BUTTON1_MASK) {
566567
mouseEvent.buttons |= nsMouseEvent::eLeftButtonFlag;

‎widget/nsGUIEventIPC.h

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -100,9 +100,9 @@ struct ParamTraits<mozilla::WidgetInputEvent>
100100
};
101101

102102
template<>
103-
struct ParamTraits<nsMouseEvent_base>
103+
struct ParamTraits<mozilla::WidgetMouseEventBase>
104104
{
105-
typedef nsMouseEvent_base paramType;
105+
typedef mozilla::WidgetMouseEventBase paramType;
106106

107107
static void Write(Message* aMsg, const paramType& aParam)
108108
{
@@ -131,7 +131,7 @@ struct ParamTraits<mozilla::WheelEvent>
131131

132132
static void Write(Message* aMsg, const paramType& aParam)
133133
{
134-
WriteParam(aMsg, static_cast<nsMouseEvent_base>(aParam));
134+
WriteParam(aMsg, static_cast<mozilla::WidgetMouseEventBase>(aParam));
135135
WriteParam(aMsg, aParam.deltaX);
136136
WriteParam(aMsg, aParam.deltaY);
137137
WriteParam(aMsg, aParam.deltaZ);
@@ -150,7 +150,8 @@ struct ParamTraits<mozilla::WheelEvent>
150150
{
151151
int32_t scrollType = 0;
152152
bool rv =
153-
ReadParam(aMsg, aIter, static_cast<nsMouseEvent_base*>(aResult)) &&
153+
ReadParam(aMsg, aIter,
154+
static_cast<mozilla::WidgetMouseEventBase*>(aResult)) &&
154155
ReadParam(aMsg, aIter, &aResult->deltaX) &&
155156
ReadParam(aMsg, aIter, &aResult->deltaY) &&
156157
ReadParam(aMsg, aIter, &aResult->deltaZ) &&
@@ -176,7 +177,7 @@ struct ParamTraits<nsMouseEvent>
176177

177178
static void Write(Message* aMsg, const paramType& aParam)
178179
{
179-
WriteParam(aMsg, static_cast<nsMouseEvent_base>(aParam));
180+
WriteParam(aMsg, static_cast<mozilla::WidgetMouseEventBase>(aParam));
180181
WriteParam(aMsg, aParam.ignoreRootScrollFrame);
181182
WriteParam(aMsg, (uint8_t) aParam.reason);
182183
WriteParam(aMsg, (uint8_t) aParam.context);
@@ -188,7 +189,8 @@ struct ParamTraits<nsMouseEvent>
188189
{
189190
bool rv;
190191
uint8_t reason = 0, context = 0, exit = 0;
191-
rv = ReadParam(aMsg, aIter, static_cast<nsMouseEvent_base*>(aResult)) &&
192+
rv = ReadParam(aMsg, aIter,
193+
static_cast<mozilla::WidgetMouseEventBase*>(aResult)) &&
192194
ReadParam(aMsg, aIter, &aResult->ignoreRootScrollFrame) &&
193195
ReadParam(aMsg, aIter, &reason) &&
194196
ReadParam(aMsg, aIter, &context) &&

‎widget/windows/KeyboardLayout.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -151,7 +151,8 @@ ModifierKeyState::InitMouseEvent(WidgetInputEvent& aMouseEvent) const
151151
aMouseEvent.eventStructType == NS_SIMPLE_GESTURE_EVENT,
152152
"called with non-mouse event");
153153

154-
nsMouseEvent_base& mouseEvent = static_cast<nsMouseEvent_base&>(aMouseEvent);
154+
WidgetMouseEventBase& mouseEvent =
155+
static_cast<WidgetMouseEventBase&>(aMouseEvent);
155156
mouseEvent.buttons = 0;
156157
if (::GetKeyState(VK_LBUTTON) < 0) {
157158
mouseEvent.buttons |= nsMouseEvent::eLeftButtonFlag;

0 commit comments

Comments
 (0)