[webkit-changes] [133502] trunk/Source

Mon, 05 Nov 2012 11:08:27 -0800

Title: [133502] trunk/Source
Revision
133502
Author
[email protected]
Date
2012-11-05 11:09:55 -0800 (Mon, 05 Nov 2012)

Log Message

[BLACKBERRY] Update touch code to reflect touch refactor
https://bugs.webkit.org/show_bug.cgi?id=101227

Patch by Genevieve Mak <[email protected]> on 2012-11-05
Reviewed by Rob Buis.

PR #2706785
Reviewed Internally by: Mike Lattanzio

Source/WebCore:

* platform/blackberry/PlatformTouchEventBlackBerry.cpp:
(WebCore::touchEventType):
(WebCore::PlatformTouchEvent::PlatformTouchEvent):

Source/WebKit/blackberry:

* Api/WebPage.cpp:
(BlackBerry::WebKit::WebPage::touchEvent):
(BlackBerry::WebKit::WebPagePrivate::dispatchTouchEventToFullScreenPlugin):

Modified Paths

Diff

Modified: trunk/Source/WebCore/ChangeLog (133501 => 133502)


--- trunk/Source/WebCore/ChangeLog	2012-11-05 19:08:26 UTC (rev 133501)
+++ trunk/Source/WebCore/ChangeLog	2012-11-05 19:09:55 UTC (rev 133502)
@@ -1,3 +1,17 @@
+2012-11-05  Genevieve Mak  <[email protected]>
+
+        [BLACKBERRY] Update touch code to reflect touch refactor
+        https://bugs.webkit.org/show_bug.cgi?id=101227
+
+        Reviewed by Rob Buis.
+
+        PR #2706785
+        Reviewed Internally by: Mike Lattanzio
+
+        * platform/blackberry/PlatformTouchEventBlackBerry.cpp:
+        (WebCore::touchEventType):
+        (WebCore::PlatformTouchEvent::PlatformTouchEvent):
+
 2012-11-05  Alok Priyadarshi  <[email protected]>
 
         [chromium] Pass canPaintLCDText to WebContentLayerClient::paintContents

Modified: trunk/Source/WebCore/platform/blackberry/PlatformTouchEventBlackBerry.cpp (133501 => 133502)


--- trunk/Source/WebCore/platform/blackberry/PlatformTouchEventBlackBerry.cpp	2012-11-05 19:08:26 UTC (rev 133501)
+++ trunk/Source/WebCore/platform/blackberry/PlatformTouchEventBlackBerry.cpp	2012-11-05 19:09:55 UTC (rev 133502)
@@ -41,6 +41,8 @@
         return PlatformEvent::TouchEnd;
     case BlackBerry::Platform::TouchEvent::TouchCancel:
         return PlatformEvent::TouchCancel;
+    case BlackBerry::Platform::TouchEvent::TouchInjected:
+        return PlatformEvent::TouchMove;
     }
 
     ASSERT_NOT_REACHED();
@@ -59,20 +61,13 @@
     for (unsigned i = 0; i < event->m_points.size(); ++i)
         m_touchPoints.append(PlatformTouchPoint(event->m_points[i]));
 
-    if (event->m_gestures.empty())
-        return;
+    if (event->isPinch()) {
+        m_rotation = event->pinchData().m_angle * 180 / M_PI;
+        m_scale = event->pinchData().m_scale;
+    }
 
-    BlackBerry::Platform::Gesture pinch;
-    if (event->hasGesture(BlackBerry::Platform::Gesture::Pinch, &pinch)) {
-        BlackBerry::Platform::PinchGestureData* data = ""
-        if (data) {
-            m_rotation = rad2deg(data->m_angle);
-            m_scale = data->m_scale;
-        }
-    } else if (event->hasGesture(BlackBerry::Platform::Gesture::DoubleTap))
-        m_doubleTap = true;
-    else if (event->hasGesture(BlackBerry::Platform::Gesture::TouchHold))
-        m_touchHold = true;
+    m_doubleTap = event->isDoubleTap();
+    m_touchHold = event->isTouchHold();
 }
 
 } // namespace WebCore

Modified: trunk/Source/WebKit/blackberry/Api/WebPage.cpp (133501 => 133502)


--- trunk/Source/WebKit/blackberry/Api/WebPage.cpp	2012-11-05 19:08:26 UTC (rev 133501)
+++ trunk/Source/WebKit/blackberry/Api/WebPage.cpp	2012-11-05 19:09:55 UTC (rev 133502)
@@ -4033,7 +4033,7 @@
         tEvent.m_points[i].m_screenPos = d->mapFromTransformed(tEvent.m_points[i].m_screenPos);
     }
 
-    if (event.hasGesture(Platform::Gesture::SingleTap))
+    if (event.isSingleTap())
         d->m_pluginMayOpenNewTab = true;
     else if (tEvent.m_type == Platform::TouchEvent::TouchStart || tEvent.m_type == Platform::TouchEvent::TouchCancel)
         d->m_pluginMayOpenNewTab = false;
@@ -4043,7 +4043,7 @@
 
     bool handled = false;
 
-    if (d->m_needTouchEvents && !event.hasGesture(Platform::Gesture::Injected))
+    if (d->m_needTouchEvents && !event.m_type != Platform::TouchEvent::TouchInjected)
         handled = d->m_mainFrame->eventHandler()->handleTouchEvent(PlatformTouchEvent(&tEvent));
 
     // Unpress mouse if touch end is consumed by a _javascript_ touch handler, otherwise the mouse state will remain pressed
@@ -4063,7 +4063,7 @@
         return true;
     }
 
-    if (event.hasGesture(Platform::Gesture::TouchHold))
+    if (event.isTouchHold())
         d->m_touchEventHandler->touchHoldEvent();
 #endif
 
@@ -4094,9 +4094,9 @@
 {
     NPTouchEvent npTouchEvent;
 
-    if (event.hasGesture(Platform::Gesture::DoubleTap))
+    if (event.isDoubleTap())
         npTouchEvent.type = TOUCH_EVENT_DOUBLETAP;
-    else if (event.hasGesture(Platform::Gesture::TouchHold))
+    else if (event.isTouchHold())
         npTouchEvent.type = TOUCH_EVENT_TOUCHHOLD;
     else {
         switch (event.m_type) {

Modified: trunk/Source/WebKit/blackberry/ChangeLog (133501 => 133502)


--- trunk/Source/WebKit/blackberry/ChangeLog	2012-11-05 19:08:26 UTC (rev 133501)
+++ trunk/Source/WebKit/blackberry/ChangeLog	2012-11-05 19:09:55 UTC (rev 133502)
@@ -1,3 +1,17 @@
+2012-11-05  Genevieve Mak  <[email protected]>
+
+        [BLACKBERRY] Update touch code to reflect touch refactor
+        https://bugs.webkit.org/show_bug.cgi?id=101227
+
+        Reviewed by Rob Buis.
+
+        PR #2706785
+        Reviewed Internally by: Mike Lattanzio
+
+        * Api/WebPage.cpp:
+        (BlackBerry::WebKit::WebPage::touchEvent):
+        (BlackBerry::WebKit::WebPagePrivate::dispatchTouchEventToFullScreenPlugin):
+
 2012-11-05  Konrad Piascik  <[email protected]>
 
         [BlackBerry] Web Inspector: Add InspectorInstrumentaiton calls for timeline compositing.

_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to