Modify gesture event types for WebView-tag scroll bubbling.

Source/web/WebViewImpl.cpp

 /*
  * Copyright (C) 2011, 2012 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 669 matching lines @@
             return handleGestureEvent(syntheticGestureEvent);
     }
     return false;
 }
 
 bool WebViewImpl::handleGestureEvent(const WebGestureEvent& event)
 {
     if (!m_client)
         return false;
 
+
     bool eventSwallowed = false;
     bool eventCancelled = false; // for disambiguation
 
     // Special handling for slow-path fling gestures.
     switch (event.type) {
     case WebInputEvent::GestureFlingStart: {
         if (mainFrameImpl()->frame()->eventHandler().isScrollbarHandlingGestures())
             break;
         endActiveFlingAnimation();
         m_client->cancelScheduledContentIntents();
         m_positionOnFlingStart = WebPoint(event.x, event.y);
         m_globalPositionOnFlingStart = WebPoint(event.globalX, event.globalY);
         m_flingModifier = event.modifiers;
         m_flingSourceDevice = event.sourceDevice;
         OwnPtr<WebGestureCurve> flingCurve = adoptPtr(Platform::current()->createFlingAnimationCurve(event.sourceDevice, WebFloatPoint(event.data.flingStart.velocityX, event.data.flingStart.velocityY), WebSize()));
         ASSERT(flingCurve);
         m_gestureAnimation = WebActiveGestureAnimation::createAtAnimationStart(flingCurve.release(), this);
         scheduleAnimation();
         eventSwallowed = true;
 
+        // Plugins may need to see GestureFlingStart to balance
+        // GestureScrollBegin (since the former replaces GestureScrollEnd when
+        // transitioning to a fling).
+        PlatformGestureEventBuilder platformEvent(mainFrameImpl()->frameView(), event);
+        mainFrameImpl()->frame()->eventHandler().handleGestureScrollEvent(platformEvent);
+
         m_client->didHandleGestureEvent(event, eventCancelled);
         return eventSwallowed;
     }
     case WebInputEvent::GestureFlingCancel:
         if (endActiveFlingAnimation())
             eventSwallowed = true;
 
         m_client->didHandleGestureEvent(event, eventCancelled);
         return eventSwallowed;
     default:
@@ skipping 18 matching lines @@
     case WebInputEvent::GestureScrollBegin:
         m_client->cancelScheduledContentIntents();
     case WebInputEvent::GestureScrollEnd:
     case WebInputEvent::GestureScrollUpdate:
     case WebInputEvent::GestureFlingStart:
         // Scrolling-related gesture events invoke EventHandler recursively for each frame down
         // the chain, doing a single-frame hit-test per frame. This matches handleWheelEvent.
         // Perhaps we could simplify things by rewriting scroll handling to work inner frame
         // out, and then unify with other gesture events.
         eventSwallowed = mainFrameImpl()->frame()->eventHandler().handleGestureScrollEvent(platformEvent);
+        if (event.type == WebInputEvent::GestureFlingStart)

[tdresser, 2015/09/11 15:25:20]

Is the indentation here a little off?

[wjmaclean, 2015/09/11 15:31:01]

Ooops, you're right ... will fix this in the next version.

[wjmaclean, 2015/09/11 15:37:23]

Actually, I don't think this should even be here ... removing ...

         m_client->didHandleGestureEvent(event, eventCancelled);
         return eventSwallowed;
     case WebInputEvent::GesturePinchBegin:
     case WebInputEvent::GesturePinchEnd:
     case WebInputEvent::GesturePinchUpdate:
         return false;
     default:
         break;
     }
 
@@ skipping 1099 matching lines @@
     // Create synthetic wheel events as necessary for fling.
     if (m_gestureAnimation) {
         if (m_gestureAnimation->animate(validFrameTime.lastFrameTimeMonotonic))
             scheduleAnimation();
         else {
             endActiveFlingAnimation();
 
             PlatformGestureEvent endScrollEvent(PlatformEvent::GestureScrollEnd,
                 m_positionOnFlingStart, m_globalPositionOnFlingStart,
                 IntSize(), 0, false, false, false, false);
-            endScrollEvent.setScrollGestureData(0, 0, 0, 0, true, false);
+            endScrollEvent.setScrollGestureData(0, 0, 0, 0, true, false, 0);
 
             mainFrameImpl()->frame()->eventHandler().handleGestureScrollEnd(endScrollEvent);
         }
     }
 
     if (!m_page)
         return;
 
     // FIXME: This should probably be using the local root?
     if (m_page->mainFrame()->isLocalFrame())
@@ skipping 2533 matching lines @@
     if (m_pageColorOverlay)
         m_pageColorOverlay->update();
     if (InspectorOverlayImpl* overlay = inspectorOverlay()) {
         PageOverlay* inspectorPageOverlay = overlay->pageOverlay();
         if (inspectorPageOverlay)
             inspectorPageOverlay->update();
     }
 }
 
 } // namespace blink