Title: [133528] trunk/Source/WebKit/blackberry
- Revision
- 133528
- Author
- [email protected]
- Date
- 2012-11-05 14:34:38 -0800 (Mon, 05 Nov 2012)
Log Message
[BlackBerry] screenX/Y gives wrong values
https://bugs.webkit.org/show_bug.cgi?id=101259
Reviewed by Yong Li.
PR 237071
Reviewed internally by Gen Mak.
Do not transform screenPos coordinates.
* Api/WebPage.cpp:
(BlackBerry::WebKit::WebPage::mouseEvent):
(BlackBerry::WebKit::WebPage::touchEvent):
(BlackBerry::WebKit::WebPage::touchPointAsMouseEvent):
Modified Paths
Diff
Modified: trunk/Source/WebKit/blackberry/Api/WebPage.cpp (133527 => 133528)
--- trunk/Source/WebKit/blackberry/Api/WebPage.cpp 2012-11-05 22:32:07 UTC (rev 133527)
+++ trunk/Source/WebKit/blackberry/Api/WebPage.cpp 2012-11-05 22:34:38 UTC (rev 133528)
@@ -3895,15 +3895,13 @@
buttonType = MiddleButton;
// Create our event.
- PlatformMouseEvent platformMouseEvent(d->mapFromTransformed(mouseEvent.position()),
- d->mapFromTransformed(mouseEvent.screenPosition()),
+ PlatformMouseEvent platformMouseEvent(d->mapFromTransformed(mouseEvent.position()), mouseEvent.screenPosition(),
toWebCoreMouseEventType(mouseEvent.type()), clickCount, buttonType, PointingDevice);
d->m_lastMouseEvent = platformMouseEvent;
bool success = d->handleMouseEvent(platformMouseEvent);
if (mouseEvent.wheelTicks()) {
- PlatformWheelEvent wheelEvent(d->mapFromTransformed(mouseEvent.position()),
- d->mapFromTransformed(mouseEvent.screenPosition()),
+ PlatformWheelEvent wheelEvent(d->mapFromTransformed(mouseEvent.position()), mouseEvent.screenPosition(),
0, -mouseEvent.wheelDelta(),
0, -mouseEvent.wheelTicks(),
ScrollByPixelWheelEvent,
@@ -4030,7 +4028,7 @@
Platform::TouchEvent tEvent = event;
for (unsigned i = 0; i < event.m_points.size(); i++) {
tEvent.m_points[i].m_pos = d->mapFromTransformed(tEvent.m_points[i].m_pos);
- tEvent.m_points[i].m_screenPos = d->mapFromTransformed(tEvent.m_points[i].m_screenPos);
+ tEvent.m_points[i].m_screenPos = tEvent.m_points[i].m_screenPos;
}
if (event.isSingleTap())
@@ -4161,7 +4159,7 @@
Platform::TouchPoint tPoint = point;
tPoint.m_pos = d->mapFromTransformed(tPoint.m_pos);
- tPoint.m_screenPos = d->mapFromTransformed(tPoint.m_screenPos);
+ tPoint.m_screenPos = tPoint.m_screenPos;
return d->m_touchEventHandler->handleTouchPoint(tPoint, useFatFingers);
}
Modified: trunk/Source/WebKit/blackberry/ChangeLog (133527 => 133528)
--- trunk/Source/WebKit/blackberry/ChangeLog 2012-11-05 22:32:07 UTC (rev 133527)
+++ trunk/Source/WebKit/blackberry/ChangeLog 2012-11-05 22:34:38 UTC (rev 133528)
@@ -43,6 +43,24 @@
2012-11-05 Rob Buis <[email protected]>
+ [BlackBerry] screenX/Y gives wrong values
+ https://bugs.webkit.org/show_bug.cgi?id=101259
+
+ Reviewed by Yong Li.
+
+ PR 237071
+
+ Reviewed internally by Gen Mak.
+
+ Do not transform screenPos coordinates.
+
+ * Api/WebPage.cpp:
+ (BlackBerry::WebKit::WebPage::mouseEvent):
+ (BlackBerry::WebKit::WebPage::touchEvent):
+ (BlackBerry::WebKit::WebPage::touchPointAsMouseEvent):
+
+2012-11-05 Rob Buis <[email protected]>
+
[BlackBerry] Input date should not popup dialog when readonly is set
https://bugs.webkit.org/show_bug.cgi?id=101234
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo/webkit-changes