Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(305)

Unified Diff: Source/WebKit/chromium/src/WebCompositorInputHandlerImpl.h

Issue 9931004: Merge 112364 - [chromium] Transfer wheel fling via WebCompositorInputHandlerClient (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/1084/
Patch Set: Created 8 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: Source/WebKit/chromium/src/WebCompositorInputHandlerImpl.h
===================================================================
--- Source/WebKit/chromium/src/WebCompositorInputHandlerImpl.h (revision 112613)
+++ Source/WebKit/chromium/src/WebCompositorInputHandlerImpl.h (working copy)
@@ -26,7 +26,7 @@
#ifndef WebCompositorInputHandlerImpl_h
#define WebCompositorInputHandlerImpl_h
-#include "IntPoint.h"
+#include "WebActiveWheelFlingParameters.h"
#include "WebCompositor.h"
#include "WebCompositorInputHandler.h"
#include "WebInputEvent.h"
@@ -41,6 +41,7 @@
}
namespace WebCore {
+class IntPoint;
class CCGestureCurveTarget;
class CCInputHandlerClient;
class CCThread;
@@ -83,7 +84,8 @@
bool cancelCurrentFling();
OwnPtr<WebCore::CCActiveGestureAnimation> m_wheelFlingAnimation;
- WebCore::IntPoint m_wheelFlingPoint; // Pointer position for the current fling.
+ // Parameters for the active fling animation, stored in case we need to transfer it out later.
+ WebActiveWheelFlingParameters m_wheelFlingParameters;
WebCompositorInputHandlerClient* m_client;
int m_identifier;
« no previous file with comments | « Source/WebKit/chromium/public/WebView.h ('k') | Source/WebKit/chromium/src/WebCompositorInputHandlerImpl.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698