Changing USB API buffer ownership.

chrome/browser/usb/usb_device.h

 // Copyright (c) 2012 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.
 
 #ifndef CHROME_BROWSER_USB_USB_DEVICE_H_
 #define CHROME_BROWSER_USB_USB_DEVICE_H_
 
 #include <map>
 
 #include "base/memory/ref_counted.h"
@@ skipping 19 matching lines @@
   USB_TRANSFER_COMPLETED = 0,
   USB_TRANSFER_ERROR,
   USB_TRANSFER_TIMEOUT,
   USB_TRANSFER_CANCELLED,
   USB_TRANSFER_STALLED,
   USB_TRANSFER_DISCONNECT,
   USB_TRANSFER_OVERFLOW,
   USB_TRANSFER_LENGTH_SHORT,
 };
 
-typedef base::Callback<void(UsbTransferStatus)> UsbTransferCallback;
+typedef base::Callback<void(UsbTransferStatus, scoped_refptr<net::IOBuffer>,
+    size_t)> UsbTransferCallback;
 
 // A UsbDevice wraps the platform's underlying representation of what a USB
 // device actually is, and provides accessors for performing many of the
 // standard USB operations.
 class UsbDevice : public base::RefCounted<UsbDevice> {
  public:
   enum TransferDirection { INBOUND, OUTBOUND };
   enum TransferRequestType { STANDARD, CLASS, VENDOR, RESERVED };
   enum TransferRecipient { DEVICE, INTERFACE, ENDPOINT, OTHER };
 
@@ skipping 52 matching lines @@
   UsbDevice();
 
   friend class base::RefCounted<UsbDevice>;
   virtual ~UsbDevice();
 
  private:
   struct Transfer {
     Transfer();
     ~Transfer();
 
+    bool control_transfer;
     scoped_refptr<net::IOBuffer> buffer;
+    size_t length;
     UsbTransferCallback callback;
   };
 
   // Checks that the device has not yet been closed.
   void CheckDevice();
 
   // Submits a transfer and starts tracking it. Retains the buffer and copies
   // the completion callback until the transfer finishes, whereupon it invokes
   // the callback then releases the buffer.
-  void SubmitTransfer(PlatformUsbTransferHandle handle, net::IOBuffer* buffer,
+  void SubmitTransfer(PlatformUsbTransferHandle handle,
+                      bool control_transfer,
+                      net::IOBuffer* buffer,
+                      const size_t length,
                       const UsbTransferCallback& callback);
 
   // The UsbService isn't referenced here to prevent a dependency cycle between
   // the service and the devices. Since a service owns every device, and is
   // responsible for its destruction, there is no case where a UsbDevice can
   // have outlived its originating UsbService.
   UsbService* const service_;
   PlatformUsbDeviceHandle handle_;
 
   // transfers_ tracks all in-flight transfers associated with this device,
   // allowing the device to retain the buffer and callback associated with a
   // transfer until such time that it completes. It is protected by lock_.
   base::Lock lock_;
   std::map<PlatformUsbTransferHandle, Transfer> transfers_;
 
   DISALLOW_EVIL_CONSTRUCTORS(UsbDevice);
 };
 
 #endif  // CHROME_BROWSER_USB_USB_DEVICE_H_