Title: [135784] trunk/Source/WebCore
- Revision
- 135784
- Author
- [email protected]
- Date
- 2012-11-26 15:57:29 -0800 (Mon, 26 Nov 2012)
Log Message
[BlackBerry] Stop sending touch events to plugins.
https://bugs.webkit.org/show_bug.cgi?id=103188
Patch by Genevieve Mak <[email protected]> on 2012-11-24
Reviewed by Rob Buis.
Reviewed internally by Jeff Rogers and Mike Lattanzio.
No tests required.
PR #248605
* plugins/blackberry/PluginViewBlackBerry.cpp:
(WebCore::PluginView::handleTouchEvent):
(WebCore::PluginView::handleMouseEvent):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (135783 => 135784)
--- trunk/Source/WebCore/ChangeLog 2012-11-26 23:53:46 UTC (rev 135783)
+++ trunk/Source/WebCore/ChangeLog 2012-11-26 23:57:29 UTC (rev 135784)
@@ -1,3 +1,18 @@
+2012-11-24 Genevieve Mak <[email protected]>
+
+ [BlackBerry] Stop sending touch events to plugins.
+ https://bugs.webkit.org/show_bug.cgi?id=103188
+
+ Reviewed by Rob Buis.
+
+ Reviewed internally by Jeff Rogers and Mike Lattanzio.
+ No tests required.
+ PR #248605
+
+ * plugins/blackberry/PluginViewBlackBerry.cpp:
+ (WebCore::PluginView::handleTouchEvent):
+ (WebCore::PluginView::handleMouseEvent):
+
2012-11-26 Adenilson Cavalcanti <[email protected]>
Removing unnecessary friend classes in RenderObject: LayoutRepainter, RenderSVGContainer
Modified: trunk/Source/WebCore/plugins/blackberry/PluginViewBlackBerry.cpp (135783 => 135784)
--- trunk/Source/WebCore/plugins/blackberry/PluginViewBlackBerry.cpp 2012-11-26 23:53:46 UTC (rev 135783)
+++ trunk/Source/WebCore/plugins/blackberry/PluginViewBlackBerry.cpp 2012-11-26 23:57:29 UTC (rev 135784)
@@ -490,22 +490,15 @@
npTouchEvent.type = TOUCH_EVENT_DOUBLETAP;
else if (event->isTouchHold())
npTouchEvent.type = TOUCH_EVENT_TOUCHHOLD;
- else if (event->type() == eventNames().touchstartEvent)
- npTouchEvent.type = TOUCH_EVENT_START;
- else if (event->type() == eventNames().touchendEvent)
- npTouchEvent.type = TOUCH_EVENT_END;
- else if (event->type() == eventNames().touchmoveEvent)
- npTouchEvent.type = TOUCH_EVENT_MOVE;
else if (event->type() == eventNames().touchcancelEvent)
npTouchEvent.type = TOUCH_EVENT_CANCEL;
- else {
- ASSERT_NOT_REACHED();
+ else
return;
- }
TouchList* touchList;
- // The touches list is empty if in a touch end event. Use changedTouches instead.
- if (npTouchEvent.type == TOUCH_EVENT_DOUBLETAP || npTouchEvent.type == TOUCH_EVENT_END)
+ // The touches list is empty if in a touch end event.
+ // Since DoubleTap is ususally a TouchEnd Use changedTouches instead.
+ if (npTouchEvent.type == TOUCH_EVENT_DOUBLETAP)
touchList = event->changedTouches();
else
touchList = event->touches();
@@ -536,13 +529,6 @@
if (dispatchNPEvent(npEvent))
event->setDefaultHandled();
- else if (npTouchEvent.type == TOUCH_EVENT_DOUBLETAP) {
- // Send Touch Up if double tap not consumed
- npTouchEvent.type = TOUCH_EVENT_END;
- npEvent.data = ""
- if (dispatchNPEvent(npEvent))
- event->setDefaultHandled();
- }
}
void PluginView::handleMouseEvent(MouseEvent* event)
@@ -559,19 +545,17 @@
mouseEvent.x = event->offsetX();
mouseEvent.y = event->offsetY();
- if (event->type() == eventNames().mousedownEvent) {
+ if (event->type() == eventNames().mousedownEvent)
mouseEvent.type = MOUSE_BUTTON_DOWN;
- parentFrame()->eventHandler()->setCapturingMouseEventsNode(node());
- } else if (event->type() == eventNames().mousemoveEvent)
+ else if (event->type() == eventNames().mousemoveEvent)
mouseEvent.type = MOUSE_MOTION;
else if (event->type() == eventNames().mouseoutEvent)
mouseEvent.type = MOUSE_OUTBOUND;
else if (event->type() == eventNames().mouseoverEvent)
mouseEvent.type = MOUSE_OVER;
- else if (event->type() == eventNames().mouseupEvent) {
+ else if (event->type() == eventNames().mouseupEvent)
mouseEvent.type = MOUSE_BUTTON_UP;
- parentFrame()->eventHandler()->setCapturingMouseEventsNode(0);
- } else
+ else
return;
mouseEvent.button = event->button();
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo/webkit-changes
