[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc
commit-queue at webkit.org
commit-queue at webkit.org
Wed Dec 22 15:48:01 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit 8030893d9665e1ecef09beaa785ee96bc184f741
Author: commit-queue at webkit.org <commit-queue at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Fri Nov 12 17:43:07 2010 +0000
2010-11-12 Robert Kroeger <rjkroege at chromium.org>
Reviewed by James Robinson.
[Chromium/DRT] Make EventSendingController send complete touch events.
https://bugs.webkit.org/show_bug.cgi?id=49285
* DumpRenderTree/chromium/EventSender.cpp:
(EventSender::addTouchPoint):
(EventSender::updateTouchPoint):
(EventSender::sendCurrentTouchEvent):
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@71921 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index c22e0eb..6cc11b4 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,15 @@
+2010-11-12 Robert Kroeger <rjkroege at chromium.org>
+
+ Reviewed by James Robinson.
+
+ [Chromium/DRT] Make EventSendingController send complete touch events.
+ https://bugs.webkit.org/show_bug.cgi?id=49285
+
+ * DumpRenderTree/chromium/EventSender.cpp:
+ (EventSender::addTouchPoint):
+ (EventSender::updateTouchPoint):
+ (EventSender::sendCurrentTouchEvent):
+
2010-11-12 Mihai Parparita <mihaip at chromium.org>
Unreviewed rollout of r71858.
diff --git a/WebKitTools/DumpRenderTree/chromium/EventSender.cpp b/WebKitTools/DumpRenderTree/chromium/EventSender.cpp
index 5707eea..b0385a3 100644
--- a/WebKitTools/DumpRenderTree/chromium/EventSender.cpp
+++ b/WebKitTools/DumpRenderTree/chromium/EventSender.cpp
@@ -837,6 +837,7 @@ void EventSender::addTouchPoint(const CppArgumentList& arguments, CppVariant* re
WebTouchPoint touchPoint;
touchPoint.state = WebTouchPoint::StatePressed;
touchPoint.position = WebPoint(arguments[0].toInt32(), arguments[1].toInt32());
+ touchPoint.screenPosition = touchPoint.position;
touchPoint.id = touchPoints.size();
touchPoints.append(touchPoint);
}
@@ -890,6 +891,7 @@ void EventSender::updateTouchPoint(const CppArgumentList& arguments, CppVariant*
WebTouchPoint* touchPoint = &touchPoints[index];
touchPoint->state = WebTouchPoint::StateMoved;
touchPoint->position = position;
+ touchPoint->screenPosition = position;
}
void EventSender::cancelTouchPoint(const CppArgumentList& arguments, CppVariant* result)
@@ -906,6 +908,8 @@ void EventSender::cancelTouchPoint(const CppArgumentList& arguments, CppVariant*
void EventSender::sendCurrentTouchEvent(const WebInputEvent::Type type)
{
ASSERT(static_cast<unsigned>(WebTouchEvent::touchPointsLengthCap) > touchPoints.size());
+ webview()->layout();
+
WebTouchEvent touchEvent;
touchEvent.type = type;
touchEvent.modifiers = touchModifiers;
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list