Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(160)

Side by Side Diff: device/gamepad/gamepad_provider.cc

Issue 2852803002: Remove base::SharedMemory::ShareToProcess. (Closed)
Patch Set: Rebase. Created 3 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "device/gamepad/gamepad_provider.h" 5 #include "device/gamepad/gamepad_provider.h"
6 6
7 #include <stddef.h> 7 #include <stddef.h>
8 #include <string.h> 8 #include <string.h>
9 #include <cmath> 9 #include <cmath>
10 #include <utility> 10 #include <utility>
(...skipping 64 matching lines...) Expand 10 before | Expand all | Expand 10 after
75 FROM_HERE, base::Bind(&GamepadFetcherVector::clear, 75 FROM_HERE, base::Bind(&GamepadFetcherVector::clear,
76 base::Unretained(&data_fetchers_))); 76 base::Unretained(&data_fetchers_)));
77 77
78 // Use Stop() to join the polling thread, as there may be pending callbacks 78 // Use Stop() to join the polling thread, as there may be pending callbacks
79 // which dereference |polling_thread_|. 79 // which dereference |polling_thread_|.
80 polling_thread_->Stop(); 80 polling_thread_->Stop();
81 81
82 DCHECK(data_fetchers_.empty()); 82 DCHECK(data_fetchers_.empty());
83 } 83 }
84 84
85 base::SharedMemoryHandle GamepadProvider::GetSharedMemoryHandleForProcess( 85 base::SharedMemoryHandle GamepadProvider::GetSharedMemoryHandleForProcess(
Nico 2017/05/02 16:06:12 This whole function can probably go away now?
erikchen 2017/05/02 19:00:51 The function is still needed to access the private
86 base::ProcessHandle process) { 86 base::ProcessHandle process) {
87 base::SharedMemoryHandle renderer_handle; 87 return gamepad_shared_buffer_->shared_memory()->handle().Duplicate();
88 gamepad_shared_buffer_->shared_memory()->ShareToProcess(process,
89 &renderer_handle);
90 return renderer_handle;
91 } 88 }
92 89
93 mojo::ScopedSharedBufferHandle GamepadProvider::GetSharedBufferHandle() { 90 mojo::ScopedSharedBufferHandle GamepadProvider::GetSharedBufferHandle() {
94 // TODO(heke): Use mojo::SharedBuffer rather than base::SharedMemory in 91 // TODO(heke): Use mojo::SharedBuffer rather than base::SharedMemory in
95 // GamepadSharedBuffer. See crbug.com/670655 for details 92 // GamepadSharedBuffer. See crbug.com/670655 for details
96 base::SharedMemoryHandle handle = base::SharedMemory::DuplicateHandle( 93 base::SharedMemoryHandle handle = base::SharedMemory::DuplicateHandle(
97 gamepad_shared_buffer_->shared_memory()->handle()); 94 gamepad_shared_buffer_->shared_memory()->handle());
98 return mojo::WrapSharedMemoryHandle(handle, sizeof(GamepadHardwareBuffer), 95 return mojo::WrapSharedMemoryHandle(handle, sizeof(GamepadHardwareBuffer),
99 true /* read_only */); 96 true /* read_only */);
100 } 97 }
(...skipping 223 matching lines...) Expand 10 before | Expand all | Expand 10 after
324 ever_had_user_gesture_ = true; 321 ever_had_user_gesture_ = true;
325 for (size_t i = 0; i < user_gesture_observers_.size(); i++) { 322 for (size_t i = 0; i < user_gesture_observers_.size(); i++) {
326 user_gesture_observers_[i].task_runner->PostTask( 323 user_gesture_observers_[i].task_runner->PostTask(
327 FROM_HERE, user_gesture_observers_[i].closure); 324 FROM_HERE, user_gesture_observers_[i].closure);
328 } 325 }
329 user_gesture_observers_.clear(); 326 user_gesture_observers_.clear();
330 } 327 }
331 } 328 }
332 329
333 } // namespace device 330 } // namespace device
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698