Changeset 115071 in webkit

Timestamp:

Apr 24, 2012 9:28:20 AM (12 years ago)

Author:

commit-queue@webkit.org

Message:

[Qt][WK2] Convert touch-point area
​https://bugs.webkit.org/show_bug.cgi?id=84434

Patch by Allan Sandfeld Jensen <​allan.jensen@nokia.com> on 2012-04-24
Reviewed by Kenneth Rohde Christiansen.

Fix failing test after r114917 by also adding the new EventSender API
to WebKitTestRunner.

• WebKitTestRunner/EventSenderProxy.h:

(EventSenderProxy):

• WebKitTestRunner/InjectedBundle/Bindings/EventSendingController.idl:
• WebKitTestRunner/InjectedBundle/EventSendingController.cpp:

(WTR::EventSendingController::setTouchPointRadius):

• WebKitTestRunner/InjectedBundle/EventSendingController.h:

(EventSendingController):

• WebKitTestRunner/TestController.cpp:

(WTR::TestController::didReceiveSynchronousMessageFromInjectedBundle):

• WebKitTestRunner/qt/EventSenderProxyQt.cpp:

(WTR::EventSenderProxy::addTouchPoint):
(WTR::EventSenderProxy::updateTouchPoint):
(WTR::EventSenderProxy::setTouchPointRadius):
(WTR::EventSenderProxy::clearTouchPoints):

Location:

trunk/Tools

Files:

• ChangeLog (modified) (1 diff)
• WebKitTestRunner/EventSenderProxy.h (modified) (2 diffs)
• WebKitTestRunner/InjectedBundle/Bindings/EventSendingController.idl (modified) (1 diff)
• WebKitTestRunner/InjectedBundle/EventSendingController.cpp (modified) (1 diff)
• WebKitTestRunner/InjectedBundle/EventSendingController.h (modified) (1 diff)
• WebKitTestRunner/TestController.cpp (modified) (1 diff)
• WebKitTestRunner/qt/EventSenderProxyQt.cpp (modified) (4 diffs)

trunk/Tools/ChangeLog

@@ +1 @@
+2012-04-24  Allan Sandfeld Jensen  <allan.jensen@nokia.com>
+
+        [Qt][WK2] Convert touch-point area
+        https://bugs.webkit.org/show_bug.cgi?id=84434
+
+        Reviewed by Kenneth Rohde Christiansen.
+
+        Fix failing test after r114917 by also adding the new EventSender API
+        to WebKitTestRunner.
+
+        * WebKitTestRunner/EventSenderProxy.h:
+        (EventSenderProxy):
+        * WebKitTestRunner/InjectedBundle/Bindings/EventSendingController.idl:
+        * WebKitTestRunner/InjectedBundle/EventSendingController.cpp:
+        (WTR::EventSendingController::setTouchPointRadius):
+        * WebKitTestRunner/InjectedBundle/EventSendingController.h:
+        (EventSendingController):
+        * WebKitTestRunner/TestController.cpp:
+        (WTR::TestController::didReceiveSynchronousMessageFromInjectedBundle):
+        * WebKitTestRunner/qt/EventSenderProxyQt.cpp:
+        (WTR::EventSenderProxy::addTouchPoint):
+        (WTR::EventSenderProxy::updateTouchPoint):
+        (WTR::EventSenderProxy::setTouchPointRadius):
+        (WTR::EventSenderProxy::clearTouchPoints):
+
 2012-04-24  Mikhail Naganov  <mnaganov@chromium.org>
 

trunk/Tools/WebKitTestRunner/EventSenderProxy.h

@@ -62 +62 @@
     void updateTouchPoint(int index, int x, int y);
     void setTouchModifier(WKEventModifiers, bool enable);
+    void setTouchPointRadius(int radiusX, int radiusY);
     void touchStart();
     void touchMove();
@@ -109 +110 @@
     QList<QTouchEvent::TouchPoint> m_touchPoints;
     Qt::KeyboardModifiers m_touchModifiers;
+    QPoint m_touchPointRadius;
     bool m_touchActive;
 #endif

trunk/Tools/WebKitTestRunner/InjectedBundle/Bindings/EventSendingController.idl

@@ -48 +48 @@
         void updateTouchPoint(in long index, in long x, in long y);
         void setTouchModifier(in DOMString modifier, in boolean enable);
+        void setTouchPointRadius(in long radiusX, in long radiusY);
         void touchStart();
         void touchMove();

trunk/Tools/WebKitTestRunner/InjectedBundle/EventSendingController.cpp

@@ -399 +399 @@
 }
 
+
+void EventSendingController::setTouchPointRadius(int radiusX, int radiusY)
+{
+    WKRetainPtr<WKStringRef> EventSenderMessageName(AdoptWK, WKStringCreateWithUTF8CString("EventSender"));
+    WKRetainPtr<WKMutableDictionaryRef> EventSenderMessageBody(AdoptWK, WKMutableDictionaryCreate());
+
+    WKRetainPtr<WKStringRef> subMessageKey(AdoptWK, WKStringCreateWithUTF8CString("SubMessage"));
+    WKRetainPtr<WKStringRef> subMessageName(AdoptWK, WKStringCreateWithUTF8CString("SetTouchPointRadius"));
+    WKDictionaryAddItem(EventSenderMessageBody.get(), subMessageKey.get(), subMessageName.get());
+
+    WKRetainPtr<WKStringRef> xKey(AdoptWK, WKStringCreateWithUTF8CString("RadiusX"));
+    WKRetainPtr<WKUInt64Ref> xRef(AdoptWK, WKUInt64Create(radiusX));
+    WKDictionaryAddItem(EventSenderMessageBody.get(), xKey.get(), xRef.get());
+
+    WKRetainPtr<WKStringRef> yKey(AdoptWK, WKStringCreateWithUTF8CString("RadiusY"));
+    WKRetainPtr<WKUInt64Ref> yRef(AdoptWK, WKUInt64Create(radiusY));
+    WKDictionaryAddItem(EventSenderMessageBody.get(), yKey.get(), yRef.get());
+
+    WKBundlePostSynchronousMessage(InjectedBundle::shared().bundle(), EventSenderMessageName.get(), EventSenderMessageBody.get(), 0);
+}
+
 void EventSendingController::touchStart()
 {

trunk/Tools/WebKitTestRunner/InjectedBundle/EventSendingController.h

@@ -68 +68 @@
     void updateTouchPoint(int index, int x, int y);
     void setTouchModifier(const JSStringRef &modifier, bool enable);
+    void setTouchPointRadius(int radiusX, int radiusY);
     void touchStart();
     void touchMove();

trunk/Tools/WebKitTestRunner/TestController.cpp

@@ -708 +708 @@
         }
 
+        if (WKStringIsEqualToUTF8CString(subMessageName, "SetTouchPointRadius")) {
+            WKRetainPtr<WKStringRef> xKey = adoptWK(WKStringCreateWithUTF8CString("RadiusX"));
+            int x = static_cast<int>(WKUInt64GetValue(static_cast<WKUInt64Ref>(WKDictionaryGetItemForKey(messageBodyDictionary, xKey.get()))));
+
+            WKRetainPtr<WKStringRef> yKey = adoptWK(WKStringCreateWithUTF8CString("RadiusY"));
+            int y = static_cast<int>(WKUInt64GetValue(static_cast<WKUInt64Ref>(WKDictionaryGetItemForKey(messageBodyDictionary, yKey.get()))));
+
+            m_eventSenderProxy->setTouchPointRadius(x, y);
+            return 0;
+        }
+
         if (WKStringIsEqualToUTF8CString(subMessageName, "TouchStart")) {
             WKPageSetShouldSendEventsSynchronously(mainWebView()->page(), true);

trunk/Tools/WebKitTestRunner/qt/EventSenderProxyQt.cpp

@@ -319 +319 @@
     point.setStartPos(pos);
     point.setState(Qt::TouchPointPressed);
+    if (!m_touchPointRadius.isNull())
+        point.setRect(QRectF(pos - m_touchPointRadius, pos + m_touchPointRadius));
     m_touchPoints.append(point);
 }
@@ -325 +327 @@
 {
     ASSERT(index >= 0 && index < m_touchPoints.count());
+    QPointF pos(x, y);
     QTouchEvent::TouchPoint &p = m_touchPoints[index];
-    p.setPos(QPointF(x, y));
+    p.setPos(pos);
     p.setState(Qt::TouchPointMoved);
+    if (!m_touchPointRadius.isNull())
+        p.setRect(QRectF(pos - m_touchPointRadius, pos + m_touchPointRadius));
 }
 
@@ -338 +343 @@
     else
         m_touchModifiers &= ~mod;
+}
+
+void EventSenderProxy::setTouchPointRadius(int radiusX, int radiusY)
+{
+    m_touchPointRadius = QPoint(radiusX, radiusY);
 }
 
@@ -377 +387 @@
     m_touchModifiers = Qt::KeyboardModifiers();
     m_touchActive = false;
+    m_touchPointRadius = QPoint();
 }