Changeset 107125 in webkit

Timestamp:

Feb 8, 2012, 1:12:58 PM (15 years ago)

Author:

commit-queue@webkit.org

Message:

Add support for pinch gesture processing in the MT compositor.
​https://bugs.webkit.org/show_bug.cgi?id=77804

Patch by Sadrul Habib Chowdhury <​sadrul@chromium.org> on 2012-02-08
Reviewed by James Robinson.

• public/WebInputEvent.h:
• src/WebCompositorInputHandlerImpl.cpp:

(WebKit::WebCompositorInputHandlerImpl::WebCompositorInputHandlerImpl):
(WebKit::WebCompositorInputHandlerImpl::handleInputEvent):

• src/WebCompositorInputHandlerImpl.h:

(WebCompositorInputHandlerImpl):

• src/WebInputEventConversion.cpp:

(WebKit::PlatformGestureEventBuilder::PlatformGestureEventBuilder):

• src/WebPopupMenuImpl.cpp:

(WebKit::WebPopupMenuImpl::handleInputEvent):

• src/WebViewImpl.cpp:

(WebKit::WebViewImpl::handleInputEvent):

• tests/WebCompositorInputHandlerImplTest.cpp:

Location:

trunk/Source/WebKit/chromium

Files:

• ChangeLog (modified) (1 diff)
• public/WebInputEvent.h (modified) (2 diffs)
• src/WebCompositorInputHandlerImpl.cpp (modified) (2 diffs)
• src/WebCompositorInputHandlerImpl.h (modified) (1 diff)
• src/WebInputEventConversion.cpp (modified) (1 diff)
• src/WebPopupMenuImpl.cpp (modified) (1 diff)
• src/WebViewImpl.cpp (modified) (1 diff)
• tests/WebCompositorInputHandlerImplTest.cpp (modified) (5 diffs)

trunk/Source/WebKit/chromium/ChangeLog

@@ +1 @@
+2012-02-08  Sadrul Habib Chowdhury  <sadrul@chromium.org>
+
+        Add support for pinch gesture processing in the MT compositor.
+        https://bugs.webkit.org/show_bug.cgi?id=77804
+
+        Reviewed by James Robinson.
+
+        * public/WebInputEvent.h:
+        * src/WebCompositorInputHandlerImpl.cpp:
+        (WebKit::WebCompositorInputHandlerImpl::WebCompositorInputHandlerImpl):
+        (WebKit::WebCompositorInputHandlerImpl::handleInputEvent):
+        * src/WebCompositorInputHandlerImpl.h:
+        (WebCompositorInputHandlerImpl):
+        * src/WebInputEventConversion.cpp:
+        (WebKit::PlatformGestureEventBuilder::PlatformGestureEventBuilder):
+        * src/WebPopupMenuImpl.cpp:
+        (WebKit::WebPopupMenuImpl::handleInputEvent):
+        * src/WebViewImpl.cpp:
+        (WebKit::WebViewImpl::handleInputEvent):
+        * tests/WebCompositorInputHandlerImplTest.cpp:
+
 2012-02-08  Nico Weber  <nicolasweber@gmx.de>
 

trunk/Source/WebKit/chromium/public/WebInputEvent.h

@@ -110 +110 @@
         GestureTapDown,
         GestureDoubleTap,
+        GesturePinchBegin,
+        GesturePinchEnd,
+        GesturePinchUpdate,
 
         // WebTouchEvent
@@ -352 +355 @@
     int globalX;
     int globalY;
+
+    // NOTE: |deltaX| and |deltaY| represents the amount to scroll for Scroll gesture events. For Pinch gesture events, |deltaX| represents the scaling/magnification factor.
     float deltaX;
     float deltaY;

trunk/Source/WebKit/chromium/src/WebCompositorInputHandlerImpl.cpp

@@ -84 +84 @@
 #ifndef NDEBUG
     , m_expectScrollUpdateEnd(false)
+    , m_expectPinchUpdateEnd(false)
 #endif
     , m_scrollStarted(false)
@@ -174 +175 @@
             return;
         }
+    } else if (event.type == WebInputEvent::GesturePinchBegin) {
+        ASSERT(!m_expectPinchUpdateEnd);
+#ifndef NDEBUG
+        m_expectPinchUpdateEnd = true;
+#endif
+        m_inputHandlerClient->pinchGestureBegin();
+        m_client->didHandleInputEvent();
+        return;
+    } else if (event.type == WebInputEvent::GesturePinchEnd) {
+        ASSERT(m_expectPinchUpdateEnd);
+#ifndef NDEBUG
+        m_expectPinchUpdateEnd = false;
+#endif
+        m_inputHandlerClient->pinchGestureEnd();
+        m_client->didHandleInputEvent();
+        return;
+    } else if (event.type == WebInputEvent::GesturePinchUpdate) {
+        ASSERT(m_expectPinchUpdateEnd);
+        const WebGestureEvent& gestureEvent = *static_cast<const WebGestureEvent*>(&event);
+        m_inputHandlerClient->pinchGestureUpdate(gestureEvent.deltaX, IntPoint(gestureEvent.x, gestureEvent.y));
+        m_client->didHandleInputEvent();
+        return;
     }
     m_client->didNotHandleInputEvent(true /* sendToWidget */);

trunk/Source/WebKit/chromium/src/WebCompositorInputHandlerImpl.h

@@ -73 +73 @@
 #ifndef NDEBUG
     bool m_expectScrollUpdateEnd;
+    bool m_expectPinchUpdateEnd;
 #endif
     bool m_scrollStarted;

trunk/Source/WebKit/chromium/src/WebInputEventConversion.cpp

@@ -156 +156 @@
         m_type = PlatformEvent::GestureDoubleTap;
         break;
+    case WebInputEvent::GesturePinchBegin:
+    case WebInputEvent::GesturePinchEnd:
+    case WebInputEvent::GesturePinchUpdate:
+        // FIXME: Once PlatformGestureEvent is updated to support pinch, this should set m_type to appropriate PlatformEvent type.
+        ASSERT_NOT_REACHED();
     default:
         ASSERT_NOT_REACHED();

trunk/Source/WebKit/chromium/src/WebPopupMenuImpl.cpp

@@ -276 +276 @@
     case WebInputEvent::ContextMenu:
         return false;
+
+    case WebInputEvent::GesturePinchBegin:
+    case WebInputEvent::GesturePinchEnd:
+    case WebInputEvent::GesturePinchUpdate:
+        // FIXME: Once PlatformGestureEvent is updated to support pinch, this should call handleGestureEvent, just like it currently does for gesture scroll.
+        return false;
     }
     return false;

trunk/Source/WebKit/chromium/src/WebViewImpl.cpp

@@ -1417 +1417 @@
 #endif
 
+#if ENABLE(GESTURE_EVENTS)
+    case WebInputEvent::GesturePinchBegin:
+    case WebInputEvent::GesturePinchEnd:
+    case WebInputEvent::GesturePinchUpdate:
+        // FIXME: Once PlatformGestureEvent is updated to support pinch, this should call handleGestureEvent, just like it currently does for gesture scroll.
+        handled = false;
+        break;
+#endif
+
     default:
         handled = false;

trunk/Source/WebKit/chromium/tests/WebCompositorInputHandlerImplTest.cpp

@@ -47 +47 @@
     MockInputHandlerClient()
         : m_scrollStatus(ScrollStarted)
+        , m_pinchStarted(false)
+        , m_pinchEnded(false)
+        , m_pinchMagnification(0)
     {
     }
@@ -52 +55 @@
 
     void setScrollStatus(ScrollStatus status) { m_scrollStatus = status; }
+
+    bool pinchStarted() const { return m_pinchStarted; }
+    bool pinchEnded() const { return m_pinchEnded; }
+    float pinchMaginifcation() const { return m_pinchMagnification; }
+
+    void resetPinch()
+    {
+        m_pinchStarted = m_pinchStarted = false;
+        m_pinchMagnification = 0;
+    }
 
 private:
@@ -63 +76 @@
 
     virtual bool haveWheelEventHandlers() OVERRIDE { return false; }
-    virtual void pinchGestureBegin() OVERRIDE { }
-    virtual void pinchGestureUpdate(float magnifyDelta, const WebCore::IntPoint& anchor) OVERRIDE { }
-    virtual void pinchGestureEnd() OVERRIDE { }
+    virtual void pinchGestureBegin() OVERRIDE
+    {
+        m_pinchStarted = true;
+    }
+    virtual void pinchGestureUpdate(float magnifyDelta, const WebCore::IntPoint& anchor) OVERRIDE
+    {
+        m_pinchMagnification = magnifyDelta;
+    }
+    virtual void pinchGestureEnd() OVERRIDE
+    {
+        m_pinchEnded = true;
+    }
     virtual void startPageScaleAnimation(const WebCore::IntSize& targetPosition,
                                          bool anchorPoint,
@@ -73 +95 @@
 
     ScrollStatus m_scrollStatus;
+    bool m_pinchStarted;
+    bool m_pinchEnded;
+    float m_pinchMagnification;
 };
 
@@ -201 +226 @@
 }
 
-}
+TEST(WebCompositorInputHandlerImpl, gesturePinch)
+{
+    WebKit::WebCompositor::initialize(0);
+#ifndef NDEBUG
+    // WebCompositorInputHandler APIs can only be called from the compositor thread.
+    WebCore::DebugScopedSetImplThread alwaysImplThread;
+#endif
+
+    MockInputHandlerClient mockInputHandler;
+    OwnPtr<WebCompositorInputHandlerImpl> inputHandler = WebCompositorInputHandlerImpl::create(&mockInputHandler);
+    MockWebCompositorInputHandlerClient mockClient;
+    inputHandler->setClient(&mockClient);
+
+    WebKit::WebGestureEvent gesture;
+
+    gesture.type = WebKit::WebInputEvent::GesturePinchBegin;
+    inputHandler->handleInputEvent(gesture);
+    EXPECT_TRUE(mockClient.handled());
+    EXPECT_FALSE(mockClient.sendToWidget());
+    EXPECT_TRUE(mockInputHandler.pinchStarted());
+    mockClient.reset();
+    mockInputHandler.resetPinch();
+
+    gesture.type = WebKit::WebInputEvent::GesturePinchUpdate;
+    gesture.deltaX = 1.5;
+    inputHandler->handleInputEvent(gesture);
+    EXPECT_TRUE(mockClient.handled());
+    EXPECT_FALSE(mockClient.sendToWidget());
+    EXPECT_FALSE(mockInputHandler.pinchEnded());
+    EXPECT_EQ(1.5, mockInputHandler.pinchMaginifcation());
+    mockClient.reset();
+    mockInputHandler.resetPinch();
+
+    gesture.type = WebKit::WebInputEvent::GesturePinchUpdate;
+    gesture.deltaX = 0.5;
+    inputHandler->handleInputEvent(gesture);
+    EXPECT_TRUE(mockClient.handled());
+    EXPECT_FALSE(mockClient.sendToWidget());
+    EXPECT_FALSE(mockInputHandler.pinchEnded());
+    EXPECT_EQ(0.5, mockInputHandler.pinchMaginifcation());
+    mockClient.reset();
+    mockInputHandler.resetPinch();
+
+    gesture.type = WebKit::WebInputEvent::GesturePinchEnd;
+    inputHandler->handleInputEvent(gesture);
+    EXPECT_TRUE(mockClient.handled());
+    EXPECT_FALSE(mockClient.sendToWidget());
+    EXPECT_TRUE(mockInputHandler.pinchEnded());
+    mockClient.reset();
+    mockInputHandler.resetPinch();
+
+    inputHandler->setClient(0);
+
+    WebKit::WebCompositor::shutdown();
+}
+
+}