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

Side by Side Diff: remoting/protocol/message_serialization.cc

Issue 450463002: Update webrtc&libjingle 6774:6825. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Created 6 years, 4 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 | Annotate | Revision Log
« no previous file with comments | « remoting/protocol/message_reader_unittest.cc ('k') | remoting/signaling/DEPS » ('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 2014 The Chromium Authors. All rights reserved. 1 // Copyright 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 #include "remoting/protocol/message_serialization.h" 5 #include "remoting/protocol/message_serialization.h"
6 6
7 #include "base/basictypes.h" 7 #include "base/basictypes.h"
8 #include "base/containers/hash_tables.h" 8 #include "base/containers/hash_tables.h"
9 #include "base/logging.h" 9 #include "base/logging.h"
10 #include "net/base/io_buffer.h" 10 #include "net/base/io_buffer.h"
11 #include "third_party/libjingle/source/talk/base/byteorder.h" 11 #include "third_party/webrtc/base/byteorder.h"
12 12
13 namespace remoting { 13 namespace remoting {
14 namespace protocol { 14 namespace protocol {
15 15
16 scoped_refptr<net::IOBufferWithSize> SerializeAndFrameMessage( 16 scoped_refptr<net::IOBufferWithSize> SerializeAndFrameMessage(
17 const google::protobuf::MessageLite& msg) { 17 const google::protobuf::MessageLite& msg) {
18 // Create a buffer with 4 extra bytes. This is used as prefix to write an 18 // Create a buffer with 4 extra bytes. This is used as prefix to write an
19 // int32 of the serialized message size for framing. 19 // int32 of the serialized message size for framing.
20 const int kExtraBytes = sizeof(int32); 20 const int kExtraBytes = sizeof(int32);
21 int size = msg.ByteSize() + kExtraBytes; 21 int size = msg.ByteSize() + kExtraBytes;
22 scoped_refptr<net::IOBufferWithSize> buffer(new net::IOBufferWithSize(size)); 22 scoped_refptr<net::IOBufferWithSize> buffer(new net::IOBufferWithSize(size));
23 talk_base::SetBE32(buffer->data(), msg.GetCachedSize()); 23 rtc::SetBE32(buffer->data(), msg.GetCachedSize());
24 msg.SerializeWithCachedSizesToArray( 24 msg.SerializeWithCachedSizesToArray(
25 reinterpret_cast<uint8*>(buffer->data()) + kExtraBytes); 25 reinterpret_cast<uint8*>(buffer->data()) + kExtraBytes);
26 return buffer; 26 return buffer;
27 } 27 }
28 28
29 } // namespace protocol 29 } // namespace protocol
30 } // namespace remoting 30 } // namespace remoting
OLDNEW
« no previous file with comments | « remoting/protocol/message_reader_unittest.cc ('k') | remoting/signaling/DEPS » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698