diff options
| author | erg@google.com <erg@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-10-18 20:21:31 +0000 |
|---|---|---|
| committer | erg@google.com <erg@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-10-18 20:21:31 +0000 |
| commit | b104b50ddb1d70d95ff9ace7a6fb30ec3b1aeb17 (patch) | |
| tree | 0d35c3f624aec7c6de8824fab2b9521bfff1dbff /remoting/protocol | |
| parent | d13509f32546e26332733ac6153d359fbd566eaa (diff) | |
| download | chromium_src-b104b50ddb1d70d95ff9ace7a6fb30ec3b1aeb17.zip chromium_src-b104b50ddb1d70d95ff9ace7a6fb30ec3b1aeb17.tar.gz chromium_src-b104b50ddb1d70d95ff9ace7a6fb30ec3b1aeb17.tar.bz2 | |
FBTF: Monster ctor patch after changing heuristics in clang plugin.
(Only 916k this time off Debug Linux .a files)
BUG=none
TEST=compiles
Review URL: http://codereview.chromium.org/3814013
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@62967 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'remoting/protocol')
| -rw-r--r-- | remoting/protocol/messages_decoder.cc | 8 | ||||
| -rw-r--r-- | remoting/protocol/messages_decoder.h | 11 | ||||
| -rw-r--r-- | remoting/protocol/stream_reader.cc | 1 |
3 files changed, 15 insertions, 5 deletions
diff --git a/remoting/protocol/messages_decoder.cc b/remoting/protocol/messages_decoder.cc index f7c7439..73e9ea4 100644 --- a/remoting/protocol/messages_decoder.cc +++ b/remoting/protocol/messages_decoder.cc @@ -5,6 +5,7 @@ #include "remoting/protocol/messages_decoder.h" #include "base/logging.h" +#include "net/base/io_buffer.h" #include "remoting/base/multiple_array_input_stream.h" #include "talk/base/byteorder.h" @@ -31,6 +32,13 @@ void MessagesDecoder::ParseHostMessages(scoped_refptr<net::IOBuffer> data, ParseMessages<ChromotingHostMessage>(data, data_size, messages); } +MessagesDecoder::DataChunk::DataChunk(net::IOBuffer* data, size_t data_size) + : data(data), + data_size(data_size) { +} + +MessagesDecoder::DataChunk::~DataChunk() {} + template <typename T> void MessagesDecoder::ParseMessages(scoped_refptr<net::IOBuffer> data, int data_size, diff --git a/remoting/protocol/messages_decoder.h b/remoting/protocol/messages_decoder.h index ea1b2c5..b22f6ba 100644 --- a/remoting/protocol/messages_decoder.h +++ b/remoting/protocol/messages_decoder.h @@ -10,9 +10,12 @@ #include "base/ref_counted.h" #include "google/protobuf/message_lite.h" -#include "net/base/io_buffer.h" #include "remoting/proto/internal.pb.h" +namespace net { +class IOBuffer; +} + namespace remoting { typedef std::list<ChromotingHostMessage*> HostMessageList; @@ -42,10 +45,8 @@ class MessagesDecoder { // DataChunk stores reference to a net::IOBuffer and size of the data // stored in that buffer. struct DataChunk { - DataChunk(net::IOBuffer* data, size_t data_size) - : data(data), - data_size(data_size) { - } + DataChunk(net::IOBuffer* data, size_t data_size); + ~DataChunk(); scoped_refptr<net::IOBuffer> data; size_t data_size; diff --git a/remoting/protocol/stream_reader.cc b/remoting/protocol/stream_reader.cc index bfceb3e..63786e4 100644 --- a/remoting/protocol/stream_reader.cc +++ b/remoting/protocol/stream_reader.cc @@ -5,6 +5,7 @@ #include "remoting/protocol/stream_reader.h" #include "base/message_loop.h" +#include "net/base/io_buffer.h" #include "net/base/net_errors.h" #include "net/socket/socket.h" #include "remoting/protocol/chromoting_connection.h" |