| Index: content/renderer/render_thread_impl.cc
|
| diff --git a/content/renderer/render_thread_impl.cc b/content/renderer/render_thread_impl.cc
|
| index 198f5f80406927b652593475bf125edb77901063..d884bee40df8ebdc1fa21f3b60b666aad5afe6be 100644
|
| --- a/content/renderer/render_thread_impl.cc
|
| +++ b/content/renderer/render_thread_impl.cc
|
| @@ -70,7 +70,6 @@
|
| #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"
|
| @@ -877,10 +876,6 @@ 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(
|
| @@ -1578,11 +1573,7 @@ void RenderThreadImpl::SetFlingCurveParameters(
|
| }
|
|
|
| void RenderThreadImpl::SampleGamepads(blink::WebGamepads* data) {
|
| - gamepad_shared_memory_reader_->SampleGamepads(*data);
|
| -}
|
| -
|
| -void RenderThreadImpl::SetGamepadListener(blink::WebGamepadListener* listener) {
|
| - gamepad_shared_memory_reader_->SetGamepadListener(listener);
|
| + webkit_platform_support_->sampleGamepads(*data);
|
| }
|
|
|
| void RenderThreadImpl::WidgetCreated() {
|
|
|