Skip to content

Commit 117dfcd

Browse files
author
Oleg Romashin
committed
Backed out 3 changesets (bug 822898) for mochitest bustage on B2G ICS emulator
1 parent d696206 commit 117dfcd

27 files changed

+1
-819
lines changed

‎content/base/src/nsGkAtomList.h

-12
Original file line numberDiff line numberDiff line change
@@ -1758,18 +1758,6 @@ GK_ATOM(onMozEdgeUIStarted, "onMozEdgeUIStarted")
17581758
GK_ATOM(onMozEdgeUICanceled, "onMozEdgeUICanceled")
17591759
GK_ATOM(onMozEdgeUICompleted, "onMozEdgeUICompleted")
17601760

1761-
// Pointer events
1762-
GK_ATOM(onpointerdown, "onpointerdown")
1763-
GK_ATOM(onpointermove, "onpointermove")
1764-
GK_ATOM(onpointerup, "onpointerup")
1765-
GK_ATOM(onpointercancel, "onpointercancel")
1766-
GK_ATOM(onpointerover, "onpointerover")
1767-
GK_ATOM(onpointerout, "onpointerout")
1768-
GK_ATOM(onpointerenter, "onpointerenter")
1769-
GK_ATOM(onpointerleave, "onpointerleave")
1770-
GK_ATOM(ongotpointercapture, "ongotpointercapture")
1771-
GK_ATOM(onlostpointercapture, "onlostpointercapture")
1772-
17731761
// orientation support
17741762
GK_ATOM(ondevicemotion, "ondevicemotion")
17751763
GK_ATOM(ondeviceorientation, "ondeviceorientation")

‎content/events/public/nsEventNameList.h

-42
Original file line numberDiff line numberDiff line change
@@ -293,48 +293,6 @@ EVENT(mozpointerlockerror,
293293
NS_POINTERLOCKERROR,
294294
EventNameType_HTML,
295295
NS_EVENT)
296-
297-
EVENT(pointerdown,
298-
NS_POINTER_DOWN,
299-
EventNameType_All,
300-
NS_POINTER_EVENT)
301-
EVENT(pointermove,
302-
NS_POINTER_MOVE,
303-
EventNameType_All,
304-
NS_POINTER_EVENT)
305-
EVENT(pointerup,
306-
NS_POINTER_UP,
307-
EventNameType_All,
308-
NS_POINTER_EVENT)
309-
EVENT(pointercancel,
310-
NS_POINTER_CANCEL,
311-
EventNameType_All,
312-
NS_POINTER_EVENT)
313-
EVENT(pointerover,
314-
NS_POINTER_OVER,
315-
EventNameType_All,
316-
NS_POINTER_EVENT)
317-
EVENT(pointerout,
318-
NS_POINTER_OUT,
319-
EventNameType_All,
320-
NS_POINTER_EVENT)
321-
EVENT(pointerenter,
322-
NS_POINTER_ENTER,
323-
EventNameType_All,
324-
NS_POINTER_EVENT)
325-
EVENT(pointerleave,
326-
NS_POINTER_LEAVE,
327-
EventNameType_All,
328-
NS_POINTER_EVENT)
329-
EVENT(gotpointercapture,
330-
NS_POINTER_GOT_CAPTURE,
331-
EventNameType_All,
332-
NS_POINTER_EVENT)
333-
EVENT(lostpointercapture,
334-
NS_POINTER_LOST_CAPTURE,
335-
EventNameType_All,
336-
NS_POINTER_EVENT)
337-
338296
// Not supported yet; probably never because "wheel" is a better idea.
339297
// EVENT(mousewheel)
340298
EVENT(pause,

‎content/events/src/PointerEvent.cpp

-150
This file was deleted.

‎content/events/src/PointerEvent.h

-50
This file was deleted.

‎content/events/src/moz.build

-2
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@ EXPORTS += [
1414
]
1515

1616
EXPORTS.mozilla.dom += [
17-
'PointerEvent.h',
1817
'Touch.h',
1918
]
2019

@@ -58,7 +57,6 @@ UNIFIED_SOURCES += [
5857
'nsIMEStateManager.cpp',
5958
'nsPaintRequest.cpp',
6059
'nsPrivateTextRange.cpp',
61-
'PointerEvent.cpp',
6260
'TextComposition.cpp',
6361
'Touch.cpp',
6462
]

‎content/events/src/nsDOMEvent.cpp

-19
Original file line numberDiff line numberDiff line change
@@ -145,7 +145,6 @@ NS_IMPL_CYCLE_COLLECTION_UNLINK_BEGIN(nsDOMEvent)
145145
case NS_MOUSE_SCROLL_EVENT:
146146
case NS_WHEEL_EVENT:
147147
case NS_SIMPLE_GESTURE_EVENT:
148-
case NS_POINTER_EVENT:
149148
tmp->mEvent->AsMouseEventBase()->relatedTarget = nullptr;
150149
break;
151150
case NS_DRAG_EVENT: {
@@ -183,7 +182,6 @@ NS_IMPL_CYCLE_COLLECTION_TRAVERSE_BEGIN(nsDOMEvent)
183182
case NS_MOUSE_SCROLL_EVENT:
184183
case NS_WHEEL_EVENT:
185184
case NS_SIMPLE_GESTURE_EVENT:
186-
case NS_POINTER_EVENT:
187185
NS_CYCLE_COLLECTION_NOTE_EDGE_NAME(cb, "mEvent->relatedTarget");
188186
cb.NoteXPCOMChild(tmp->mEvent->AsMouseEventBase()->relatedTarget);
189187
break;
@@ -740,21 +738,6 @@ nsDOMEvent::DuplicatePrivateData()
740738
newEvent = touchEvent;
741739
break;
742740
}
743-
case NS_POINTER_EVENT:
744-
{
745-
WidgetPointerEvent* oldPointerEvent = mEvent->AsPointerEvent();
746-
WidgetPointerEvent* pointerEvent =
747-
new WidgetPointerEvent(false, msg, nullptr,
748-
oldPointerEvent->pointerId,
749-
oldPointerEvent->width,
750-
oldPointerEvent->height,
751-
oldPointerEvent->tiltX,
752-
oldPointerEvent->tiltY,
753-
oldPointerEvent->isPrimary);
754-
pointerEvent->buttons = oldPointerEvent->buttons;
755-
newEvent = pointerEvent;
756-
break;
757-
}
758741
default:
759742
{
760743
NS_WARNING("Unknown event type!!!");
@@ -1039,7 +1022,6 @@ nsDOMEvent::GetScreenCoords(nsPresContext* aPresContext,
10391022
(aEvent->eventStructType != NS_MOUSE_EVENT &&
10401023
aEvent->eventStructType != NS_MOUSE_SCROLL_EVENT &&
10411024
aEvent->eventStructType != NS_WHEEL_EVENT &&
1042-
aEvent->eventStructType != NS_POINTER_EVENT &&
10431025
aEvent->eventStructType != NS_TOUCH_EVENT &&
10441026
aEvent->eventStructType != NS_DRAG_EVENT &&
10451027
aEvent->eventStructType != NS_SIMPLE_GESTURE_EVENT)) {
@@ -1099,7 +1081,6 @@ nsDOMEvent::GetClientCoords(nsPresContext* aPresContext,
10991081
aEvent->eventStructType != NS_WHEEL_EVENT &&
11001082
aEvent->eventStructType != NS_TOUCH_EVENT &&
11011083
aEvent->eventStructType != NS_DRAG_EVENT &&
1102-
aEvent->eventStructType != NS_POINTER_EVENT &&
11031084
aEvent->eventStructType != NS_SIMPLE_GESTURE_EVENT) ||
11041085
!aPresContext ||
11051086
!aEvent->AsGUIEvent()->widget) {

‎content/events/src/nsDOMMouseEvent.cpp

-6
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,6 @@ nsDOMMouseEvent::InitMouseEvent(const nsAString & aType, bool aCanBubble, bool a
6262
case NS_MOUSE_SCROLL_EVENT:
6363
case NS_WHEEL_EVENT:
6464
case NS_DRAG_EVENT:
65-
case NS_POINTER_EVENT:
6665
case NS_SIMPLE_GESTURE_EVENT: {
6766
WidgetMouseEventBase* mouseEventBase = mEvent->AsMouseEventBase();
6867
mouseEventBase->relatedTarget = aRelatedTarget;
@@ -116,7 +115,6 @@ nsDOMMouseEvent::InitMouseEvent(const nsAString& aType,
116115
case NS_MOUSE_SCROLL_EVENT:
117116
case NS_WHEEL_EVENT:
118117
case NS_DRAG_EVENT:
119-
case NS_POINTER_EVENT:
120118
case NS_SIMPLE_GESTURE_EVENT:
121119
mEvent->AsInputEvent()->modifiers = modifiers;
122120
return NS_OK;
@@ -147,7 +145,6 @@ nsDOMMouseEvent::Constructor(const mozilla::dom::GlobalObject& aGlobal,
147145
case NS_MOUSE_SCROLL_EVENT:
148146
case NS_WHEEL_EVENT:
149147
case NS_DRAG_EVENT:
150-
case NS_POINTER_EVENT:
151148
case NS_SIMPLE_GESTURE_EVENT:
152149
e->mEvent->AsMouseEventBase()->buttons = aParam.mButtons;
153150
break;
@@ -195,7 +192,6 @@ nsDOMMouseEvent::Button()
195192
case NS_MOUSE_SCROLL_EVENT:
196193
case NS_WHEEL_EVENT:
197194
case NS_DRAG_EVENT:
198-
case NS_POINTER_EVENT:
199195
case NS_SIMPLE_GESTURE_EVENT:
200196
return mEvent->AsMouseEventBase()->button;
201197
default:
@@ -221,7 +217,6 @@ nsDOMMouseEvent::Buttons()
221217
case NS_MOUSE_SCROLL_EVENT:
222218
case NS_WHEEL_EVENT:
223219
case NS_DRAG_EVENT:
224-
case NS_POINTER_EVENT:
225220
case NS_SIMPLE_GESTURE_EVENT:
226221
return mEvent->AsMouseEventBase()->buttons;
227222
default:
@@ -247,7 +242,6 @@ nsDOMMouseEvent::GetRelatedTarget()
247242
case NS_MOUSE_SCROLL_EVENT:
248243
case NS_WHEEL_EVENT:
249244
case NS_DRAG_EVENT:
250-
case NS_POINTER_EVENT:
251245
case NS_SIMPLE_GESTURE_EVENT:
252246
relatedTarget =
253247
do_QueryInterface(mEvent->AsMouseEventBase()->relatedTarget);

0 commit comments

Comments
 (0)