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

Side by Side Diff: net/websockets/websocket_frame.cc

Issue 1545233002: Convert Pass()→std::move() in //net (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 12 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 | « net/websockets/websocket_deflate_stream.cc ('k') | net/websockets/websocket_frame_parser.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) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 "net/websockets/websocket_frame.h" 5 #include "net/websockets/websocket_frame.h"
6 6
7 #include <stddef.h> 7 #include <stddef.h>
8 #include <algorithm> 8 #include <algorithm>
9 9
10 #include "base/big_endian.h" 10 #include "base/big_endian.h"
(...skipping 41 matching lines...) Expand 10 before | Expand all | Expand 10 after
52 if (masking_key_offset == WebSocketFrameHeader::kMaskingKeyLength) 52 if (masking_key_offset == WebSocketFrameHeader::kMaskingKeyLength)
53 masking_key_offset = 0; 53 masking_key_offset = 0;
54 } 54 }
55 } 55 }
56 56
57 } // namespace 57 } // namespace
58 58
59 scoped_ptr<WebSocketFrameHeader> WebSocketFrameHeader::Clone() const { 59 scoped_ptr<WebSocketFrameHeader> WebSocketFrameHeader::Clone() const {
60 scoped_ptr<WebSocketFrameHeader> ret(new WebSocketFrameHeader(opcode)); 60 scoped_ptr<WebSocketFrameHeader> ret(new WebSocketFrameHeader(opcode));
61 ret->CopyFrom(*this); 61 ret->CopyFrom(*this);
62 return ret.Pass(); 62 return ret;
63 } 63 }
64 64
65 void WebSocketFrameHeader::CopyFrom(const WebSocketFrameHeader& source) { 65 void WebSocketFrameHeader::CopyFrom(const WebSocketFrameHeader& source) {
66 final = source.final; 66 final = source.final;
67 reserved1 = source.reserved1; 67 reserved1 = source.reserved1;
68 reserved2 = source.reserved2; 68 reserved2 = source.reserved2;
69 reserved3 = source.reserved3; 69 reserved3 = source.reserved3;
70 opcode = source.opcode; 70 opcode = source.opcode;
71 masked = source.masked; 71 masked = source.masked;
72 payload_length = source.payload_length; 72 payload_length = source.payload_length;
(...skipping 170 matching lines...) Expand 10 before | Expand all | Expand 10 after
243 } 243 }
244 244
245 MaskWebSocketFramePayloadByBytes( 245 MaskWebSocketFramePayloadByBytes(
246 masking_key, 246 masking_key,
247 (frame_offset + (aligned_end - data)) % kMaskingKeyLength, 247 (frame_offset + (aligned_end - data)) % kMaskingKeyLength,
248 aligned_end, 248 aligned_end,
249 end); 249 end);
250 } 250 }
251 251
252 } // namespace net 252 } // namespace net
OLDNEW
« no previous file with comments | « net/websockets/websocket_deflate_stream.cc ('k') | net/websockets/websocket_frame_parser.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698