| Index: content/renderer/render_thread_impl.h
|
| diff --git a/content/renderer/render_thread_impl.h b/content/renderer/render_thread_impl.h
|
| index 5695270eba31e26b25a34ca4c828a8bf6341caef..b96b8aae8abd4a040b2e0176edd02bb47d22d034 100644
|
| --- a/content/renderer/render_thread_impl.h
|
| +++ b/content/renderer/render_thread_impl.h
|
| @@ -33,6 +33,7 @@ struct WorkerProcessMsg_CreateWorker_Params;
|
|
|
| namespace blink {
|
| class WebGamepads;
|
| +class WebGamepadListener;
|
| class WebGraphicsContext3D;
|
| class WebMediaStreamCenter;
|
| class WebMediaStreamCenterClient;
|
| @@ -271,6 +272,10 @@ class CONTENT_EXPORT RenderThreadImpl : public RenderThread,
|
| return vc_manager_.get();
|
| }
|
|
|
| + GamepadSharedMemoryReader* gamepad_shared_memory_reader() const {
|
| + return gamepad_shared_memory_reader_.get();
|
| + }
|
| +
|
| // Get the GPU channel. Returns NULL if the channel is not established or
|
| // has been lost.
|
| GpuChannelHost* GetGpuChannel();
|
| @@ -368,6 +373,10 @@ class CONTENT_EXPORT RenderThreadImpl : public RenderThread,
|
| // Retrieve current gamepad data.
|
| void SampleGamepads(blink::WebGamepads* data);
|
|
|
| + // Set a listener for gamepad connected/disconnected events.
|
| + // A non-null listener must be set first before calling SampleGamepads.
|
| + void SetGamepadListener(blink::WebGamepadListener* listener);
|
| +
|
| // Called by a RenderWidget when it is created or destroyed. This
|
| // allows the process to know when there are no visible widgets.
|
| void WidgetCreated();
|
| @@ -532,7 +541,7 @@ class CONTENT_EXPORT RenderThreadImpl : public RenderThread,
|
|
|
| scoped_ptr<WebRTCIdentityService> webrtc_identity_service_;
|
|
|
| - scoped_ptr<GamepadSharedMemoryReader> gamepad_shared_memory_reader_;
|
| + scoped_refptr<GamepadSharedMemoryReader> gamepad_shared_memory_reader_;
|
|
|
| // TODO(reveman): Allow AllocateGpuMemoryBuffer to be called from
|
| // multiple threads. Current allocation mechanism for IOSurface
|
|
|