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

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

Issue 145873006: ui/base/resource: Roll our own version of ReadBigEndian() function. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase Created 6 years, 10 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 | « net/websockets/websocket_channel.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 <algorithm> 7 #include <algorithm>
8 8
9 #include "base/basictypes.h" 9 #include "base/basictypes.h"
10 #include "base/big_endian.h"
10 #include "base/logging.h" 11 #include "base/logging.h"
11 #include "base/rand_util.h" 12 #include "base/rand_util.h"
12 #include "net/base/big_endian.h"
13 #include "net/base/io_buffer.h" 13 #include "net/base/io_buffer.h"
14 #include "net/base/net_errors.h" 14 #include "net/base/net_errors.h"
15 15
16 namespace { 16 namespace {
17 17
18 const uint8 kFinalBit = 0x80; 18 const uint8 kFinalBit = 0x80;
19 const uint8 kReserved1Bit = 0x40; 19 const uint8 kReserved1Bit = 0x40;
20 const uint8 kReserved2Bit = 0x20; 20 const uint8 kReserved2Bit = 0x20;
21 const uint8 kReserved3Bit = 0x10; 21 const uint8 kReserved3Bit = 0x10;
22 const uint8 kOpCodeMask = 0xF; 22 const uint8 kOpCodeMask = 0xF;
(...skipping 101 matching lines...) Expand 10 before | Expand all | Expand 10 after
124 extended_length_size = 2; 124 extended_length_size = 2;
125 } else { 125 } else {
126 second_byte |= kPayloadLengthWithEightByteExtendedLengthField; 126 second_byte |= kPayloadLengthWithEightByteExtendedLengthField;
127 extended_length_size = 8; 127 extended_length_size = 8;
128 } 128 }
129 buffer[buffer_index++] = second_byte; 129 buffer[buffer_index++] = second_byte;
130 130
131 // Writes "extended payload length" field. 131 // Writes "extended payload length" field.
132 if (extended_length_size == 2) { 132 if (extended_length_size == 2) {
133 uint16 payload_length_16 = static_cast<uint16>(header.payload_length); 133 uint16 payload_length_16 = static_cast<uint16>(header.payload_length);
134 WriteBigEndian(buffer + buffer_index, payload_length_16); 134 base::WriteBigEndian(buffer + buffer_index, payload_length_16);
135 buffer_index += sizeof(payload_length_16); 135 buffer_index += sizeof(payload_length_16);
136 } else if (extended_length_size == 8) { 136 } else if (extended_length_size == 8) {
137 WriteBigEndian(buffer + buffer_index, header.payload_length); 137 base::WriteBigEndian(buffer + buffer_index, header.payload_length);
138 buffer_index += sizeof(header.payload_length); 138 buffer_index += sizeof(header.payload_length);
139 } 139 }
140 140
141 // Writes "masking key" field, if needed. 141 // Writes "masking key" field, if needed.
142 if (header.masked) { 142 if (header.masked) {
143 DCHECK(masking_key); 143 DCHECK(masking_key);
144 std::copy(masking_key->key, 144 std::copy(masking_key->key,
145 masking_key->key + WebSocketFrameHeader::kMaskingKeyLength, 145 masking_key->key + WebSocketFrameHeader::kMaskingKeyLength,
146 buffer + buffer_index); 146 buffer + buffer_index);
147 buffer_index += WebSocketFrameHeader::kMaskingKeyLength; 147 buffer_index += WebSocketFrameHeader::kMaskingKeyLength;
(...skipping 82 matching lines...) Expand 10 before | Expand all | Expand 10 after
230 } 230 }
231 231
232 MaskWebSocketFramePayloadByBytes( 232 MaskWebSocketFramePayloadByBytes(
233 masking_key, 233 masking_key,
234 (frame_offset + (aligned_end - data)) % kMaskingKeyLength, 234 (frame_offset + (aligned_end - data)) % kMaskingKeyLength,
235 aligned_end, 235 aligned_end,
236 end); 236 end);
237 } 237 }
238 238
239 } // namespace net 239 } // namespace net
OLDNEW
« no previous file with comments | « net/websockets/websocket_channel.cc ('k') | net/websockets/websocket_frame_parser.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698