Merge 112364 - [chromium] Transfer wheel fling via WebCompositorInputHandlerClient

Source/WebKit/chromium/public/WebView.h

 /*
  * Copyright (C) 2009, 2010, 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 36 matching lines @@
 class WebFrame;
 class WebFrameClient;
 class WebGraphicsContext3D;
 class WebNode;
 class WebPageOverlay;
 class WebPermissionClient;
 class WebSettings;
 class WebSpellCheckClient;
 class WebString;
 class WebViewClient;
+struct WebActiveWheelFlingParameters;
 struct WebMediaPlayerAction;
 struct WebPluginAction;
 struct WebPoint;
 
 class WebView : public WebWidget {
 public:
     WEBKIT_EXPORT static const double textSizeMultiplierRatio;
     WEBKIT_EXPORT static const double minTextSizeMultiplier;
     WEBKIT_EXPORT static const double maxTextSizeMultiplier;
     WEBKIT_EXPORT static const float minPageScaleFactor;
@@ skipping 354 matching lines @@
     // this WebView. One will be created if it doesn't already exist.
     // This is used to set up sharing between this context (which is
     // that used by the compositor) and contexts for WebGL and other
     // APIs.
     virtual WebGraphicsContext3D* graphicsContext3D() = 0;
 
     // Context that's in the compositor's share group, but is not the compositor context itself.
     // Can be used for allocating resources that the compositor will later access.
     virtual WebGraphicsContext3D* sharedGraphicsContext3D() = 0;
 
+    // Called to inform the WebView that a wheel fling animation was started externally (for instance
+    // by the compositor) but must be completed by the WebView.
+    virtual void transferActiveWheelFlingAnimation(const WebActiveWheelFlingParameters&) = 0;
+
     // Visibility -----------------------------------------------------------
 
     // Sets the visibility of the WebView.
     virtual void setVisibilityState(WebPageVisibilityState visibilityState,
                                     bool isInitialState) { }
 
     // PageOverlay ----------------------------------------------------------
 
     // Adds/removes page overlay to this WebView. These functions change the
     // graphical appearance of the WebView. WebPageOverlay paints the
     // contents of the page overlay. It also provides an z-order number for
     // the page overlay. The z-order number defines the paint order the page
     // overlays. Page overlays with larger z-order number will be painted after
     // page overlays with smaller z-order number. That is, they appear above
     // the page overlays with smaller z-order number. If two page overlays have
     // the same z-order number, the later added one will be on top.
     virtual void addPageOverlay(WebPageOverlay*, int /*z-order*/) = 0;
     virtual void removePageOverlay(WebPageOverlay*) = 0;
 
     // Testing functionality for LayoutTestController -----------------------
 
     // Simulates a compositor lost context.
     virtual void loseCompositorContext(int numTimes) = 0;
 
-
 protected:
     ~WebView() {}
 };
 
 } // namespace WebKit
 
 #endif