| Index: content/renderer/render_thread_impl.cc
|
| diff --git a/content/renderer/render_thread_impl.cc b/content/renderer/render_thread_impl.cc
|
| index 6c449b0ef8a7dd6ddc9001b877d116caf3464c5b..3975856b9b0a14cfd62120fd9ddbb8ec296a849c 100644
|
| --- a/content/renderer/render_thread_impl.cc
|
| +++ b/content/renderer/render_thread_impl.cc
|
| @@ -72,6 +72,7 @@
|
| #include "content/renderer/dom_storage/dom_storage_dispatcher.h"
|
| #include "content/renderer/dom_storage/webstoragearea_impl.h"
|
| #include "content/renderer/dom_storage/webstoragenamespace_impl.h"
|
| +#include "content/renderer/gamepad_shared_memory_reader.h"
|
| #include "content/renderer/gpu/compositor_output_surface.h"
|
| #include "content/renderer/gpu/gpu_benchmarking_extension.h"
|
| #include "content/renderer/input/input_event_filter.h"
|
| @@ -897,6 +898,10 @@ void RenderThreadImpl::EnsureWebKitInitialized() {
|
| CompositorOutputSurface::CreateFilter(output_surface_loop.get());
|
| AddFilter(compositor_output_surface_filter_.get());
|
|
|
| + gamepad_shared_memory_reader_.reset(
|
| + new GamepadSharedMemoryReader(webkit_platform_support_.get()));
|
| + AddObserver(gamepad_shared_memory_reader_.get());
|
| +
|
| RenderThreadImpl::RegisterSchemes();
|
|
|
| EnableBlinkPlatformLogChannels(
|
| @@ -1612,7 +1617,11 @@ void RenderThreadImpl::SetFlingCurveParameters(
|
| }
|
|
|
| void RenderThreadImpl::SampleGamepads(blink::WebGamepads* data) {
|
| - webkit_platform_support_->sampleGamepads(*data);
|
| + gamepad_shared_memory_reader_->SampleGamepads(*data);
|
| +}
|
| +
|
| +void RenderThreadImpl::SetGamepadListener(blink::WebGamepadListener* listener) {
|
| + gamepad_shared_memory_reader_->SetGamepadListener(listener);
|
| }
|
|
|
| void RenderThreadImpl::WidgetCreated() {
|
|
|