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

Unified Diff: content/renderer/gamepad_shared_memory_reader.cc

Issue 2563483006: Move gamepad_service out of content/ and into device/ (Closed)
Patch Set: addressed Blundell's review comments Created 4 years 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « content/renderer/gamepad_shared_memory_reader.h ('k') | content/test/BUILD.gn » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/renderer/gamepad_shared_memory_reader.cc
diff --git a/content/renderer/gamepad_shared_memory_reader.cc b/content/renderer/gamepad_shared_memory_reader.cc
index f48a0fb2ff7925477d44e7848b397bc25eb44c01..f1eb93243083e6900a6c2a416e708b33b0cc4092 100644
--- a/content/renderer/gamepad_shared_memory_reader.cc
+++ b/content/renderer/gamepad_shared_memory_reader.cc
@@ -6,7 +6,6 @@
#include "base/metrics/histogram_macros.h"
#include "base/trace_event/trace_event.h"
-#include "content/common/gamepad_hardware_buffer.h"
#include "content/public/renderer/render_thread.h"
#include "content/renderer/renderer_blink_platform_impl.h"
#include "ipc/ipc_sync_message_filter.h"
@@ -92,12 +91,12 @@ void GamepadSharedMemoryReader::SampleGamepads(blink::WebGamepads& gamepads) {
int contention_count = -1;
base::subtle::Atomic32 version;
do {
- version = gamepad_hardware_buffer_->sequence.ReadBegin();
- memcpy(&read_into, &gamepad_hardware_buffer_->buffer, sizeof(read_into));
+ version = gamepad_hardware_buffer_->seqlock.ReadBegin();
+ memcpy(&read_into, &gamepad_hardware_buffer_->data, sizeof(read_into));
++contention_count;
if (contention_count == kMaximumContentionCount)
break;
- } while (gamepad_hardware_buffer_->sequence.ReadRetry(version));
+ } while (gamepad_hardware_buffer_->seqlock.ReadRetry(version));
UMA_HISTOGRAM_COUNTS("Gamepad.ReadContentionCount", contention_count);
if (contention_count >= kMaximumContentionCount) {
« no previous file with comments | « content/renderer/gamepad_shared_memory_reader.h ('k') | content/test/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698