diff options
author | csharp@chromium.org <csharp@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-07-03 18:20:04 +0000 |
---|---|---|
committer | csharp@chromium.org <csharp@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-07-03 18:20:04 +0000 |
commit | 104de62a1315caeae550b83c5f9163277bdd5f9b (patch) | |
tree | b1aea142555240fbb2bf98aad52144ae39e1d2c6 /device/hid/hid_connection_mac.h | |
parent | b2ba2d4ddc3f87e328c7e074fd1f82d22e19f0dc (diff) | |
download | chromium_src-104de62a1315caeae550b83c5f9163277bdd5f9b.zip chromium_src-104de62a1315caeae550b83c5f9163277bdd5f9b.tar.gz chromium_src-104de62a1315caeae550b83c5f9163277bdd5f9b.tar.bz2 |
Revert 281282 "Revert 281133 "chrome.hid: enrich model with repo..."
Tests still failed, undoing revert.
> Revert 281133 "chrome.hid: enrich model with report IDs"
>
> Speculative revert to try and fix Win browser tests.
>
> > chrome.hid: enrich model with report IDs
> >
> > - add report IDs and max report size
> > - don't expose sensitive usages
> >
> > BUG=364423
> > R=rockot@chromium.org
> > TESTS=run device_unittests (HidReportDescriptorTest)
> >
> > Review URL: https://codereview.chromium.org/317783010
>
> TBR=jracle@logitech.com
>
> Review URL: https://codereview.chromium.org/369923002
TBR=csharp@chromium.org
Review URL: https://codereview.chromium.org/364213005
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@281300 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'device/hid/hid_connection_mac.h')
-rw-r--r-- | device/hid/hid_connection_mac.h | 39 |
1 files changed, 18 insertions, 21 deletions
diff --git a/device/hid/hid_connection_mac.h b/device/hid/hid_connection_mac.h index c307fb6..02dde04 100644 --- a/device/hid/hid_connection_mac.h +++ b/device/hid/hid_connection_mac.h @@ -11,11 +11,8 @@ #include <queue> #include "base/mac/foundation_util.h" -#include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" -#include "base/threading/thread_checker.h" #include "device/hid/hid_connection.h" -#include "device/hid/hid_device_info.h" namespace base { class MessageLoopProxy; @@ -31,17 +28,20 @@ class HidConnectionMac : public HidConnection { public: explicit HidConnectionMac(HidDeviceInfo device_info); - virtual void Read(scoped_refptr<net::IOBufferWithSize> buffer, - const IOCallback& callback) OVERRIDE; - virtual void Write(uint8_t report_id, - scoped_refptr<net::IOBufferWithSize> buffer, - const IOCallback& callback) OVERRIDE; - virtual void GetFeatureReport(uint8_t report_id, - scoped_refptr<net::IOBufferWithSize> buffer, - const IOCallback& callback) OVERRIDE; - virtual void SendFeatureReport(uint8_t report_id, - scoped_refptr<net::IOBufferWithSize> buffer, - const IOCallback& callback) OVERRIDE; + // HidConnection implementation. + virtual void PlatformRead(scoped_refptr<net::IOBufferWithSize> buffer, + const IOCallback& callback) OVERRIDE; + virtual void PlatformWrite(uint8_t report_id, + scoped_refptr<net::IOBufferWithSize> buffer, + const IOCallback& callback) OVERRIDE; + virtual void PlatformGetFeatureReport( + uint8_t report_id, + scoped_refptr<net::IOBufferWithSize> buffer, + const IOCallback& callback) OVERRIDE; + virtual void PlatformSendFeatureReport( + uint8_t report_id, + scoped_refptr<net::IOBufferWithSize> buffer, + const IOCallback& callback) OVERRIDE; private: virtual ~HidConnectionMac(); @@ -53,29 +53,26 @@ class HidConnectionMac : public HidConnection { uint32_t report_id, uint8_t* report_bytes, CFIndex report_length); - void ProcessReadQueue(); - void ProcessInputReport(IOHIDReportType type, - scoped_refptr<net::IOBufferWithSize> buffer); void WriteReport(IOHIDReportType type, uint8_t report_id, scoped_refptr<net::IOBufferWithSize> buffer, const IOCallback& callback); - scoped_refptr<base::MessageLoopProxy> message_loop_; + void Flush(); + void ProcessInputReport(scoped_refptr<net::IOBufferWithSize> buffer); + void ProcessReadQueue(); base::ScopedCFTypeRef<IOHIDDeviceRef> device_; + scoped_refptr<base::MessageLoopProxy> message_loop_; scoped_ptr<uint8_t, base::FreeDeleter> inbound_buffer_; std::queue<PendingHidReport> pending_reports_; std::queue<PendingHidRead> pending_reads_; - base::ThreadChecker thread_checker_; - DISALLOW_COPY_AND_ASSIGN(HidConnectionMac); }; - } // namespace device #endif // DEVICE_HID_HID_CONNECTION_MAC_H_ |