Handle HID report ID correctly on Mac OS

device/hid/hid_connection_mac.cc

 // Copyright (c) 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "device/hid/hid_connection_mac.h"
 
 #include "base/bind.h"
 #include "base/mac/foundation_util.h"
 #include "base/message_loop/message_loop.h"
 #include "base/threading/thread_restrictions.h"
@@ skipping 87 matching lines @@
 }
 
 void HidConnectionMac::InputReportCallback(void* context,
                                            IOReturn result,
                                            void* sender,
                                            IOHIDReportType type,
                                            uint32_t report_id,
                                            uint8_t* report_bytes,
                                            CFIndex report_length) {
   HidConnectionMac* connection = static_cast<HidConnectionMac*>(context);
-  // If a report ID was received, inject it into a copy of the received
-  // report. This is consistent with how input reports are received on
-  // other platforms.
+  // report_id is already contained in report_bytes
   scoped_refptr<net::IOBufferWithSize> buffer;
-  if (report_id != 0) {
-    buffer = new net::IOBufferWithSize(report_length + 1);
-    buffer->data()[0] = static_cast<uint8_t>(report_id);
-    memcpy(buffer->data() + 1, report_bytes, report_length);
-  } else {
-    buffer = new net::IOBufferWithSize(report_length);
-    memcpy(buffer->data(), report_bytes, report_length);
-  }
+  buffer = new net::IOBufferWithSize(report_length);
+  memcpy(buffer->data(), report_bytes, report_length);
+
   connection->message_loop_->PostTask(
       FROM_HERE,
       base::Bind(
           &HidConnectionMac::ProcessInputReport, connection, type, buffer));
 }
 
 void HidConnectionMac::ProcessReadQueue() {
   DCHECK(thread_checker_.CalledOnValidThread());
   while (pending_reads_.size() && pending_reports_.size()) {
     PendingHidRead read = pending_reads_.front();
@@ skipping 21 matching lines @@
 
 void HidConnectionMac::WriteReport(IOHIDReportType type,
                                    uint8_t report_id,
                                    scoped_refptr<net::IOBufferWithSize> buffer,
                                    const IOCallback& callback) {
   DCHECK(thread_checker_.CalledOnValidThread());
   if (!device_) {
     callback.Run(false, 0);
     return;
   }
+  scoped_refptr<net::IOBufferWithSize> output_buffer;
+  if (report_id != 0) {
+    output_buffer = new net::IOBufferWithSize(buffer->size() + 1);
+    output_buffer->data()[0] = static_cast<uint8_t>(report_id);
+    memcpy(output_buffer->data() + 1, buffer->data(), buffer->size());
+  } else {
+    output_buffer = new net::IOBufferWithSize(buffer->size());
+    memcpy(output_buffer->data(), buffer->data(), buffer->size());
+  }
   IOReturn res =
       IOHIDDeviceSetReport(device_.get(),
                            type,
                            report_id,
-                           reinterpret_cast<uint8_t*>(buffer->data()),
-                           buffer->size());
+                           reinterpret_cast<uint8_t*>(output_buffer->data()),
+                           output_buffer->size());
   if (res != kIOReturnSuccess) {
     callback.Run(false, 0);
   } else {
-    callback.Run(true, buffer->size());
+    callback.Run(true, output_buffer->size());
   }
 }
 
 }  // namespace device