wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 1036444 - Kill touchenter and touchleave events. r=smaug

Browse Source
This commit is contained in:
Kartikaya Gupta 2014-07-09 10:27:00 -04:00
parent c3f9348a59
commit 4ff5fbdfab
12 changed files with 2 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
content/base/src/nsGkAtomList.h
View File

@ -835,8 +835,6 @@ GK_ATOM(ontext, "ontext")
GK_ATOM(ontouchstart, "ontouchstart")
GK_ATOM(ontouchend, "ontouchend")
GK_ATOM(ontouchmove, "ontouchmove")
GK_ATOM(ontouchenter, "ontouchenter")
GK_ATOM(ontouchleave, "ontouchleave")
GK_ATOM(ontouchcancel, "ontouchcancel")
GK_ATOM(ontransitionend, "ontransitionend")
GK_ATOM(onunderflow, "onunderflow")

2
dom/events/EventListenerManager.cpp
View File

@ -328,8 +328,6 @@ EventListenerManager::AddEventListenerInternal(
} else if (aTypeAtom == nsGkAtoms::ontouchstart ||
aTypeAtom == nsGkAtoms::ontouchend ||
aTypeAtom == nsGkAtoms::ontouchmove ||
aTypeAtom == nsGkAtoms::ontouchenter ||
aTypeAtom == nsGkAtoms::ontouchleave ||
aTypeAtom == nsGkAtoms::ontouchcancel) {
mMayHaveTouchEventListener = true;
nsPIDOMWindow* window = GetInnerWindowForTarget();

8
dom/events/EventNameList.h
View File

@ -559,14 +559,6 @@ TOUCH_EVENT(touchmove,
NS_TOUCH_MOVE,
EventNameType_All,
NS_TOUCH_EVENT )
TOUCH_EVENT(touchenter,
NS_TOUCH_ENTER,
EventNameType_All,
NS_TOUCH_EVENT )
TOUCH_EVENT(touchleave,
NS_TOUCH_LEAVE,
EventNameType_All,
NS_TOUCH_EVENT)
TOUCH_EVENT(touchcancel,
NS_TOUCH_CANCEL,
EventNameType_All,

2
dom/events/test/test_bug648573.html
View File

@ -74,8 +74,6 @@ var events =
["touchstart",
"touchend",
"touchmove",
"touchenter",
"touchleave",
"touchcancel"];
function runEventTest(type) {

2
dom/interfaces/events/nsIDOMTouchEvent.idl
View File

@ -15,7 +15,5 @@ interface nsITouchEventReceiver : nsISupports {
[implicit_jscontext] attribute jsval ontouchstart;
[implicit_jscontext] attribute jsval ontouchend;
[implicit_jscontext] attribute jsval ontouchmove;
[implicit_jscontext] attribute jsval ontouchenter;
[implicit_jscontext] attribute jsval ontouchleave;
[implicit_jscontext] attribute jsval ontouchcancel;
};

4
dom/webidl/HTMLElement.webidl
View File

@ -110,10 +110,6 @@ interface TouchEventHandlers {
attribute EventHandler ontouchend;
[Func="nsGenericHTMLElement::TouchEventsEnabled"]
attribute EventHandler ontouchmove;
[Func="nsGenericHTMLElement::TouchEventsEnabled"]
attribute EventHandler ontouchenter;
[Func="nsGenericHTMLElement::TouchEventsEnabled"]
attribute EventHandler ontouchleave;
[Func="nsGenericHTMLElement::TouchEventsEnabled"]
attribute EventHandler ontouchcancel;
};

2
gfx/layers/apz/src/GestureEventListener.cpp
View File

@ -74,7 +74,6 @@ nsEventStatus GestureEventListener::HandleInputEvent(const MultiTouchInput& aEve
switch (aEvent.mType) {
case MultiTouchInput::MULTITOUCH_START:
case MultiTouchInput::MULTITOUCH_ENTER:
mTouches.Clear();
for (size_t i = 0; i < aEvent.mTouches.Length(); i++) {
mTouches.AppendElement(aEvent.mTouches[i]);
@ -90,7 +89,6 @@ nsEventStatus GestureEventListener::HandleInputEvent(const MultiTouchInput& aEve
rv = HandleInputTouchMove();
break;
case MultiTouchInput::MULTITOUCH_END:
case MultiTouchInput::MULTITOUCH_LEAVE:
for (size_t i = 0; i < aEvent.mTouches.Length(); i++) {
for (size_t j = 0; j < mTouches.Length(); j++) {
if (aEvent.mTouches[i].mIdentifier == mTouches[j].mIdentifier) {

1
layout/base/TouchCaret.cpp
View File

@ -465,7 +465,6 @@ TouchCaret::HandleEvent(WidgetEvent* aEvent)
switch (aEvent->message) {
case NS_TOUCH_START:
case NS_TOUCH_ENTER:
status = HandleTouchDownEvent(aEvent->AsTouchEvent());
break;
case NS_MOUSE_BUTTON_DOWN:

2
services/sync/tps/extensions/mozmill/resource/driver/mozelement.js
View File

@ -540,7 +540,7 @@ MozMillElement.prototype.rightClick = function (aOffsetX, aOffsetY, aExpectedEve
* @param {Touch[]} [aEvent.touches]
* A TouchList of all the Touch objects representing all current points
* of contact with the surface, regardless of target or changed status
* @param {Number} [aEvent.type=*|touchstart|touchend|touchmove|touchenter|touchleave|touchcancel]
* @param {Number} [aEvent.type=*|touchstart|touchend|touchmove|touchcancel]
* The type of touch event that occurred
* @param {Element} [aEvent.target]
* The target of the touches associated with this event. This target

4
widget/BasicEvents.h
View File

@ -434,9 +434,7 @@ enum nsEventStructType
#define NS_TOUCH_START (NS_TOUCH_EVENT_START)
#define NS_TOUCH_MOVE (NS_TOUCH_EVENT_START+1)
#define NS_TOUCH_END (NS_TOUCH_EVENT_START+2)
#define NS_TOUCH_ENTER (NS_TOUCH_EVENT_START+3)
#define NS_TOUCH_LEAVE (NS_TOUCH_EVENT_START+4)
#define NS_TOUCH_CANCEL (NS_TOUCH_EVENT_START+5)
#define NS_TOUCH_CANCEL (NS_TOUCH_EVENT_START+3)
// Pointerlock DOM API
#define NS_POINTERLOCK_START 5300

2
widget/InputData.h
View File

@ -165,8 +165,6 @@ public:
MULTITOUCH_START,
MULTITOUCH_MOVE,
MULTITOUCH_END,
MULTITOUCH_ENTER,
MULTITOUCH_LEAVE,
MULTITOUCH_CANCEL
};

6
widget/xpwidgets/InputData.cpp
View File

@ -44,12 +44,6 @@ MultiTouchInput::MultiTouchInput(const WidgetTouchEvent& aTouchEvent)
case NS_TOUCH_END:
mType = MULTITOUCH_END;
break;
case NS_TOUCH_ENTER:
mType = MULTITOUCH_ENTER;
break;
case NS_TOUCH_LEAVE:
mType = MULTITOUCH_LEAVE;
break;
case NS_TOUCH_CANCEL:
mType = MULTITOUCH_CANCEL;
break;