Add missing status codes to WebSocketError enum.

net/websockets/websocket_frame.h

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef NET_WEBSOCKETS_WEBSOCKET_FRAME_H_
 #define NET_WEBSOCKETS_WEBSOCKET_FRAME_H_
 
 #include <vector>
 
 #include "base/basictypes.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "net/base/net_export.h"
 
 namespace net {
 
 class IOBufferWithSize;
 
 // Represents a WebSocket frame header.
 //
 // Members of this class correspond to each element in WebSocket frame header
 // (see http://tools.ietf.org/html/rfc6455#section-5.2).
 struct NET_EXPORT WebSocketFrameHeader {
   typedef int OpCode;
   static const OpCode kOpCodeContinuation;
   static const OpCode kOpCodeText;
   static const OpCode kOpCodeBinary;
+  static const OpCode kOpCodeDataUnused;
   static const OpCode kOpCodeClose;
   static const OpCode kOpCodePing;
   static const OpCode kOpCodePong;
+  static const OpCode kOpCodeControlUnused;
+
+  // Efficiently determine whether a given opcode is one of the data opcodes
+  // known to this implementation.
+  static bool IsKnownDataOpCode(OpCode opCode) {
+    return (opCode & ~3) == 0 && opCode != 3;
+  }
+
+  // Efficiently determine whether a given opcode is one of the control opcodes
+  // known to this implementation.
+  static bool IsKnownControlOpCode(OpCode opCode) {
+    return (opCode & ~3) == 8 && opCode != 0x0B;
+  }
 
   // These values must be a compile-time constant. "enum hack" is used here
   // to make MSVC happy.
   enum {
     kBaseHeaderSize = 2,
     kMaximumExtendedLengthSize = 8,
     kMaskingKeyLength = 4
   };
 
+  // Constructor to avoid a lot of repetitive initialisation.
+  explicit WebSocketFrameHeader(OpCode opCode)
+    : final(false),
+      reserved1(false),
+      reserved2(false),
+      reserved3(false),
+      opcode(opCode),
+      masked(false),
+      payload_length(0) {}
+
+  // Backwards-compatible constructor to avoid breaking Chromedriver.
+  // The above constructor should be used in preference, as there is no good
+  // default value for "opcode".
+  // TODO(ricea): Remove this once Chromedriver have stopped using it.
+  WebSocketFrameHeader()
+    : final(false),
+      reserved1(false),
+      reserved2(false),
+      reserved3(false),
+      opcode(kOpCodeDataUnused),
+      masked(false),
+      payload_length(0) {}
+
+  // Create a clone of this object on the heap.
+  scoped_ptr<WebSocketFrameHeader> Clone();
+
   // Members below correspond to each item in WebSocket frame header.
   // See <http://tools.ietf.org/html/rfc6455#section-5.2> for details.
   bool final;
   bool reserved1;
   bool reserved2;
   bool reserved3;
   OpCode opcode;
   bool masked;
   uint64 payload_length;
+
+ private:
+  DISALLOW_COPY_AND_ASSIGN(WebSocketFrameHeader);
 };
 
 // Contains payload data of part of a WebSocket frame.
 //
 // Payload of a WebSocket frame may be divided into multiple chunks.
 // You need to look at |final_chunk| member variable to detect the end of a
 // series of chunk objects of a WebSocket frame.
 //
 // Frame dissection is necessary to handle WebSocket frame stream containing
 // abritrarily large frames in the browser process. Because the server may send
@@ skipping 72 matching lines @@
 // used for unmasking a WebSocket frame.
 NET_EXPORT void MaskWebSocketFramePayload(
     const WebSocketMaskingKey& masking_key,
     uint64 frame_offset,
     char* data,
     int data_size);
 
 }  // namespace net
 
 #endif  // NET_WEBSOCKETS_WEBSOCKET_FRAME_H_