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

Side by Side Diff: device/hid/hid_connection_linux.h

Issue 499713002: Don't pass buffers to HidConnection::Read because it knows the size. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Addressed rockot@'s nits. Created 6 years, 3 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
« no previous file with comments | « device/hid/hid_connection.cc ('k') | device/hid/hid_connection_linux.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2014 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2014 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 #ifndef DEVICE_HID_HID_CONNECTION_LINUX_H_ 5 #ifndef DEVICE_HID_HID_CONNECTION_LINUX_H_
6 #define DEVICE_HID_HID_CONNECTION_LINUX_H_ 6 #define DEVICE_HID_HID_CONNECTION_LINUX_H_
7 7
8 #include <queue> 8 #include <queue>
9 9
10 #include "base/files/file.h" 10 #include "base/files/file.h"
11 #include "base/message_loop/message_pump_libevent.h" 11 #include "base/message_loop/message_pump_libevent.h"
12 #include "device/hid/hid_connection.h" 12 #include "device/hid/hid_connection.h"
13 13
14 namespace device { 14 namespace device {
15 15
16 class HidConnectionLinux : public HidConnection, 16 class HidConnectionLinux : public HidConnection,
17 public base::MessagePumpLibevent::Watcher { 17 public base::MessagePumpLibevent::Watcher {
18 public: 18 public:
19 HidConnectionLinux(HidDeviceInfo device_info, std::string dev_node); 19 HidConnectionLinux(HidDeviceInfo device_info, std::string dev_node);
20 20
21 private:
22 friend class base::RefCountedThreadSafe<HidConnectionLinux>;
23 virtual ~HidConnectionLinux();
24
21 // HidConnection implementation. 25 // HidConnection implementation.
22 virtual void PlatformRead(scoped_refptr<net::IOBufferWithSize> buffer, 26 virtual void PlatformRead(const ReadCallback& callback) OVERRIDE;
23 const IOCallback& callback) OVERRIDE; 27 virtual void PlatformWrite(scoped_refptr<net::IOBuffer> buffer,
24 virtual void PlatformWrite(uint8_t report_id, 28 size_t size,
25 scoped_refptr<net::IOBufferWithSize> buffer, 29 const WriteCallback& callback) OVERRIDE;
26 const IOCallback& callback) OVERRIDE; 30 virtual void PlatformGetFeatureReport(uint8_t report_id,
27 virtual void PlatformGetFeatureReport( 31 const ReadCallback& callback) OVERRIDE;
28 uint8_t report_id,
29 scoped_refptr<net::IOBufferWithSize> buffer,
30 const IOCallback& callback) OVERRIDE;
31 virtual void PlatformSendFeatureReport( 32 virtual void PlatformSendFeatureReport(
32 uint8_t report_id, 33 scoped_refptr<net::IOBuffer> buffer,
33 scoped_refptr<net::IOBufferWithSize> buffer, 34 size_t size,
34 const IOCallback& callback) OVERRIDE; 35 const WriteCallback& callback) OVERRIDE;
35 36
36 // base::MessagePumpLibevent::Watcher implementation. 37 // base::MessagePumpLibevent::Watcher implementation.
37 virtual void OnFileCanReadWithoutBlocking(int fd) OVERRIDE; 38 virtual void OnFileCanReadWithoutBlocking(int fd) OVERRIDE;
38 virtual void OnFileCanWriteWithoutBlocking(int fd) OVERRIDE; 39 virtual void OnFileCanWriteWithoutBlocking(int fd) OVERRIDE;
39 40
40 private:
41 friend class base::RefCountedThreadSafe<HidConnectionLinux>;
42 virtual ~HidConnectionLinux();
43
44 void Disconnect(); 41 void Disconnect();
45 42
46 void Flush(); 43 void Flush();
47 void ProcessInputReport(scoped_refptr<net::IOBufferWithSize> buffer); 44 void ProcessInputReport(scoped_refptr<net::IOBuffer> buffer, size_t size);
48 void ProcessReadQueue(); 45 void ProcessReadQueue();
49 46
50 base::File device_file_; 47 base::File device_file_;
51 base::MessagePumpLibevent::FileDescriptorWatcher device_file_watcher_; 48 base::MessagePumpLibevent::FileDescriptorWatcher device_file_watcher_;
52 49
53 std::queue<PendingHidReport> pending_reports_; 50 std::queue<PendingHidReport> pending_reports_;
54 std::queue<PendingHidRead> pending_reads_; 51 std::queue<PendingHidRead> pending_reads_;
55 52
56 DISALLOW_COPY_AND_ASSIGN(HidConnectionLinux); 53 DISALLOW_COPY_AND_ASSIGN(HidConnectionLinux);
57 }; 54 };
58 55
59 } // namespace device 56 } // namespace device
60 57
61 #endif // DEVICE_HID_HID_CONNECTION_LINUX_H_ 58 #endif // DEVICE_HID_HID_CONNECTION_LINUX_H_
OLDNEW
« no previous file with comments | « device/hid/hid_connection.cc ('k') | device/hid/hid_connection_linux.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698