| Index: content/renderer/render_view_impl.h
|
| diff --git a/content/renderer/render_view_impl.h b/content/renderer/render_view_impl.h
|
| index 9f097ed73ac7f746a130b397c7a23dd1344b8a6f..175684ba241ef110a98a45c73955049d651427b4 100644
|
| --- a/content/renderer/render_view_impl.h
|
| +++ b/content/renderer/render_view_impl.h
|
| @@ -134,6 +134,7 @@ class WebTouchEvent;
|
| class WebURLLoader;
|
| class WebURLRequest;
|
| class WebUserMediaClient;
|
| +struct WebActiveWheelFlingParameters;
|
| struct WebFileChooserParams;
|
| struct WebFindOptions;
|
| struct WebMediaPlayerAction;
|
| @@ -323,6 +324,9 @@ class RenderViewImpl : public RenderWidget,
|
| webkit::WebPluginInfo* plugin_info,
|
| std::string* actual_mime_type);
|
|
|
| + void TransferActiveWheelFlingAnimation(
|
| + const WebKit::WebActiveWheelFlingParameters& params);
|
| +
|
| // IPC::Channel::Listener implementation -------------------------------------
|
|
|
| virtual bool OnMessageReceived(const IPC::Message& msg) OVERRIDE;
|
| @@ -339,6 +343,7 @@ class RenderViewImpl : public RenderWidget,
|
| virtual bool requestPointerLock();
|
| virtual void requestPointerUnlock();
|
| virtual bool isPointerLocked();
|
| + virtual void didActivateCompositor(int input_handler_identifier);
|
|
|
| // WebKit::WebViewClient implementation --------------------------------------
|
|
|
|
|