Fixed merge conflicts for #1014.

html/dom/interfaces.html

@@ -2531,49 +2531,6 @@ <h1>HTML IDL tests</h1>
   MessagePort[]? ports;
 };
 
-enum BinaryType { "blob", "arraybuffer" };
-[Constructor(DOMString url, optional (DOMString or DOMString[]) protocols)]
-interface WebSocket : EventTarget {
-  readonly attribute DOMString url;
-
-  // ready state
-  const unsigned short CONNECTING = 0;
-  const unsigned short OPEN = 1;
-  const unsigned short CLOSING = 2;
-  const unsigned short CLOSED = 3;
-  readonly attribute unsigned short readyState;
-  readonly attribute unsigned long bufferedAmount;
-
-  // networking
-           attribute EventHandler onopen;
-           attribute EventHandler onerror;
-           attribute EventHandler onclose;
-  readonly attribute DOMString extensions;
-  readonly attribute DOMString protocol;
-  void close([Clamp] optional unsigned short code, optional DOMString reason);
-
-  // messaging
-           attribute EventHandler onmessage;
-           attribute BinaryType binaryType;
-  void send(DOMString data);
-  void send(Blob data);
-  void send(ArrayBuffer data);
-  void send(ArrayBufferView data);
-};
-
-[Constructor(DOMString type, optional CloseEventInit eventInitDict)]
-interface CloseEvent : Event {
-  readonly attribute boolean wasClean;
-  readonly attribute unsigned short code;
-  readonly attribute DOMString reason;
-};
-
-dictionary CloseEventInit : EventInit {
-  boolean wasClean;
-  unsigned short code;
-  DOMString reason;
-};
-
 [Constructor]
 interface MessageChannel {
   readonly attribute MessagePort port1;
@@ -3101,8 +3058,6 @@ <h1>HTML IDL tests</h1>
 		Worker: [],
 		SharedWorker: [],
 		MessageEvent: [],
-		WebSocket: [],
-		CloseEvent: [],
 		MessageChannel: [],
 		MessagePort: [],
 		HTMLAppletElement: ['document.createElement("applet")'],