Index: content/browser/gamepad/gamepad_service.cc |
diff --git a/content/browser/gamepad/gamepad_service.cc b/content/browser/gamepad/gamepad_service.cc |
index a742cc817f645fe716acfc81fc5ba60c39aac51e..8450fe713b57da55032e3aa561c41e11731655a0 100644 |
--- a/content/browser/gamepad/gamepad_service.cc |
+++ b/content/browser/gamepad/gamepad_service.cc |
@@ -11,11 +11,13 @@ |
#include "base/memory/ptr_util.h" |
#include "base/memory/singleton.h" |
#include "content/browser/gamepad/gamepad_shared_buffer_impl.h" |
+#include "content/common/gamepad_hardware_buffer.h" |
#include "content/public/browser/browser_thread.h" |
#include "content/public/browser/render_process_host.h" |
#include "device/gamepad/gamepad_consumer.h" |
#include "device/gamepad/gamepad_data_fetcher.h" |
#include "device/gamepad/gamepad_provider.h" |
+#include "mojo/public/cpp/system/platform_handle.h" |
namespace content { |
@@ -153,6 +155,16 @@ base::SharedMemoryHandle GamepadService::GetSharedMemoryHandleForProcess( |
return provider_->GetSharedMemoryHandleForProcess(handle); |
} |
+mojo::ScopedSharedBufferHandle GamepadService::GetSharedBufferHandle() { |
+ DCHECK(thread_checker_.CalledOnValidThread()); |
+ |
+ // TODO(heke): Use mojo::SharedBuffer rather than base::SharedMemory in |
+ // GamepadSharedBuffer. See crbug.com/670655 for details. |
+ return mojo::WrapSharedMemoryHandle(provider_->GetSharedMemoryHandle(), |
+ sizeof(GamepadHardwareBuffer), |
+ true /* read_only */); |
+} |
+ |
void GamepadService::OnUserGesture() { |
DCHECK(thread_checker_.CalledOnValidThread()); |