Changeset 106803 in webkit

Timestamp:

Feb 6, 2012 6:07:27 AM (12 years ago)

Author:

commit-queue@webkit.org

Message:

WebGestureEvent can not encode delta and area.
​https://bugs.webkit.org/show_bug.cgi?id=77728

Source/WebCore:

Add area field to PlatformGestureEvent.

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

• platform/PlatformGestureEvent.h:

(WebCore::PlatformGestureEvent::PlatformGestureEvent):
(WebCore::PlatformGestureEvent::area):

Source/WebKit2:

Support delta and area fields in WebGestureEvent, and send area with Qt tap gesture.

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

• Shared/WebEvent.h:

(WebKit::WebGestureEvent::area):
(WebKit::WebGestureEvent::delta):

• Shared/WebEventConversion.cpp:

(WebKit::WebKit2PlatformGestureEvent::WebKit2PlatformGestureEvent):

• Shared/WebGestureEvent.cpp:

(WebKit::WebGestureEvent::WebGestureEvent):
(WebKit::WebGestureEvent::encode):
(WebKit::WebGestureEvent::decode):

• UIProcess/qt/QtWebPageEventHandler.cpp:

(QtWebPageEventHandler::handleSingleTapEvent):

Location:

trunk/Source

Files:

• WebCore/ChangeLog (modified) (1 diff)
• WebCore/platform/PlatformGestureEvent.h (modified) (3 diffs)
• WebKit2/ChangeLog (modified) (1 diff)
• WebKit2/Shared/WebEvent.h (modified) (3 diffs)
• WebKit2/Shared/WebEventConversion.cpp (modified) (1 diff)
• WebKit2/Shared/WebGestureEvent.cpp (modified) (3 diffs)
• WebKit2/UIProcess/qt/QtWebPageEventHandler.cpp (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-02-06  Allan Sandfeld Jensen  <allan.jensen@nokia.com>
+
+        WebGestureEvent can not encode delta and area.
+        https://bugs.webkit.org/show_bug.cgi?id=77728
+
+        Add area field to PlatformGestureEvent.
+
+        Reviewed by Kenneth Rohde Christiansen.
+
+        * platform/PlatformGestureEvent.h:
+        (WebCore::PlatformGestureEvent::PlatformGestureEvent):
+        (WebCore::PlatformGestureEvent::area):
+
 2012-02-06  Charles Wei  <charles.wei@torchmobile.com.cn>
 

trunk/Source/WebCore/platform/PlatformGestureEvent.h

@@ -29 +29 @@
 #if ENABLE(GESTURE_EVENTS)
 
+#include "FloatPoint.h"
 #include "IntPoint.h"
+#include "IntSize.h"
 #include "PlatformEvent.h"
 
@@ -52 +54 @@
     }
 
+    PlatformGestureEvent(Type type, const IntPoint& position, const IntPoint& globalPosition, double timestamp, const IntSize& area, const FloatPoint& delta, bool shiftKey, bool ctrlKey, bool altKey, bool metaKey)
+        : PlatformEvent(type, shiftKey, ctrlKey, altKey, metaKey, timestamp)
+        , m_position(position)
+        , m_globalPosition(globalPosition)
+        , m_area(area)
+        , m_deltaX(delta.x())
+        , m_deltaY(delta.y())
+    {
+    }
+
     const IntPoint& position() const { return m_position; } // PlatformWindow coordinates.
     const IntPoint& globalPosition() const { return m_globalPosition; } // Screen coordinates.
+
+    const IntSize& area() const { return m_area; }
 
     float deltaX() const { return m_deltaX; }
@@ -61 +75 @@
     IntPoint m_position;
     IntPoint m_globalPosition;
+    IntSize m_area;
     float m_deltaX;
     float m_deltaY;

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2012-02-06  Allan Sandfeld Jensen  <allan.jensen@nokia.com>
+
+        WebGestureEvent can not encode delta and area.
+        https://bugs.webkit.org/show_bug.cgi?id=77728
+
+        Support delta and area fields in WebGestureEvent, and send area with Qt tap gesture.
+
+        Reviewed by Kenneth Rohde Christiansen.
+
+        * Shared/WebEvent.h:
+        (WebKit::WebGestureEvent::area):
+        (WebKit::WebGestureEvent::delta):
+        * Shared/WebEventConversion.cpp:
+        (WebKit::WebKit2PlatformGestureEvent::WebKit2PlatformGestureEvent):
+        * Shared/WebGestureEvent.cpp:
+        (WebKit::WebGestureEvent::WebGestureEvent):
+        (WebKit::WebGestureEvent::encode):
+        (WebKit::WebGestureEvent::decode):
+        * UIProcess/qt/QtWebPageEventHandler.cpp:
+        (QtWebPageEventHandler::handleSingleTapEvent):
+
 2012-02-03  Zalan Bujtas  <zbujtas@gmail.com>  and  Jocelyn Turcotte  <jocelyn.turcotte@nokia.com>
 

trunk/Source/WebKit2/Shared/WebEvent.h

@@ -30 +30 @@
 // we can use them as the event type.
 
+#include <WebCore/FloatPoint.h>
 #include <WebCore/FloatSize.h>
 #include <WebCore/IntPoint.h>
+#include <WebCore/IntSize.h>
 #include <wtf/text/WTFString.h>
 
@@ -255 +257 @@
     WebGestureEvent() { }
     WebGestureEvent(Type, const WebCore::IntPoint& position, const WebCore::IntPoint& globalPosition, Modifiers, double timestamp);
+    WebGestureEvent(Type, const WebCore::IntPoint& position, const WebCore::IntPoint& globalPosition, Modifiers, double timestamp, const WebCore::IntSize& area, const WebCore::FloatPoint& delta);
 
     const WebCore::IntPoint position() const { return m_position; }
     const WebCore::IntPoint globalPosition() const { return m_globalPosition; }
+    const WebCore::IntSize area() const { return m_area; }
+    const WebCore::FloatPoint delta() const { return m_delta; }
 
     void encode(CoreIPC::ArgumentEncoder*) const;
@@ -267 +272 @@
     WebCore::IntPoint m_position;
     WebCore::IntPoint m_globalPosition;
+    WebCore::IntSize m_area;
+    WebCore::FloatPoint m_delta;
 };
 #endif // ENABLE(GESTURE_EVENTS)

trunk/Source/WebKit2/Shared/WebEventConversion.cpp

@@ -233 +233 @@
         m_position = webEvent.position();
         m_globalPosition = webEvent.globalPosition();
+
+        m_area = webEvent.area();
+        m_deltaX = webEvent.delta().x();
+        m_deltaY = webEvent.delta().y();
     }
 };

trunk/Source/WebKit2/Shared/WebGestureEvent.cpp

@@ -44 +44 @@
 }
 
+WebGestureEvent::WebGestureEvent(Type type, const IntPoint& position, const IntPoint& globalPosition, Modifiers modifiers, double timestamp, const IntSize& area, const FloatPoint& delta)
+    : WebEvent(type, modifiers, timestamp)
+    , m_position(position)
+    , m_globalPosition(globalPosition)
+    , m_area(area)
+    , m_delta(delta)
+{
+    ASSERT(isGestureEventType(type));
+}
+
 void WebGestureEvent::encode(CoreIPC::ArgumentEncoder* encoder) const
 {
@@ -50 +60 @@
     encoder->encode(m_position);
     encoder->encode(m_globalPosition);
+    encoder->encode(m_area);
+    encoder->encode(m_delta);
 }
 
@@ -59 +71 @@
         return false;
     if (!decoder->decode(t.m_globalPosition))
+        return false;
+    if (!decoder->decode(t.m_area))
+        return false;
+    if (!decoder->decode(t.m_delta))
         return false;
     return true;

trunk/Source/WebKit2/UIProcess/qt/QtWebPageEventHandler.cpp

@@ -299 +299 @@
 
     QTransform fromItemTransform = m_webPage->transformFromItem();
-    WebGestureEvent gesture(WebEvent::GestureSingleTap, fromItemTransform.map(point.pos()).toPoint(), point.screenPos().toPoint(), WebEvent::Modifiers(0), 0);
+    WebGestureEvent gesture(WebEvent::GestureSingleTap, fromItemTransform.map(point.pos()).toPoint(), point.screenPos().toPoint(), WebEvent::Modifiers(0), 0, IntSize(point.rect().size().toSize()), FloatPoint(0, 0));
     m_webPageProxy->handleGestureEvent(gesture);
 }