From f248e6f1778dc26db91d3322de2ecca5d1aa9866 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bartek=20Iwa=C5=84czuk?= <biwanczuk@gmail.com>
Date: Thu, 27 Jan 2022 16:27:22 +0100
Subject: Revert "refactor: update runtime code for primordial checks for
 "instanceof" (#13497)" (#13511)

This reverts commit 884143218fad0e18f7553aaf079d52de703f7601.
---
 ext/websocket/02_websocketstream.js | 31 +++++++++++++------------------
 1 file changed, 13 insertions(+), 18 deletions(-)

(limited to 'ext/websocket/02_websocketstream.js')

diff --git a/ext/websocket/02_websocketstream.js b/ext/websocket/02_websocketstream.js
index 0f4cecaa5..0a14657e9 100644
--- a/ext/websocket/02_websocketstream.js
+++ b/ext/websocket/02_websocketstream.js
@@ -11,19 +11,18 @@
   const { add, remove } = window.__bootstrap.abortSignal;
 
   const {
-    ArrayPrototypeJoin,
-    ArrayPrototypeMap,
-    Error,
-    ObjectPrototypeIsPrototypeOf,
-    PromisePrototypeCatch,
-    PromisePrototypeThen,
-    Set,
     StringPrototypeEndsWith,
     StringPrototypeToLowerCase,
     Symbol,
     SymbolFor,
+    Set,
+    ArrayPrototypeMap,
+    ArrayPrototypeJoin,
+    PromisePrototypeThen,
+    PromisePrototypeCatch,
+    Uint8Array,
     TypeError,
-    Uint8ArrayPrototype,
+    Error,
   } = window.__bootstrap.primordials;
 
   webidl.converters.WebSocketStreamOptions = webidl.createDictionaryConverter(
@@ -71,7 +70,7 @@
 
     [_url];
     get url() {
-      webidl.assertBranded(this, WebSocketStreamPrototype);
+      webidl.assertBranded(this, WebSocketStream);
       return this[_url];
     }
 
@@ -196,9 +195,7 @@
                       kind: "text",
                       value: chunk,
                     });
-                  } else if (
-                    ObjectPrototypeIsPrototypeOf(Uint8ArrayPrototype, chunk)
-                  ) {
+                  } else if (chunk instanceof Uint8Array) {
                     await core.opAsync("op_ws_send", this[_rid], {
                       kind: "binary",
                       value: chunk,
@@ -299,7 +296,7 @@
             }
           },
           (err) => {
-            if (ObjectPrototypeIsPrototypeOf(core.InterruptedPrototype, err)) {
+            if (err instanceof core.Interrupted) {
               // The signal was aborted.
               err = options.signal.reason;
             } else {
@@ -314,19 +311,19 @@
 
     [_connection] = new Deferred();
     get connection() {
-      webidl.assertBranded(this, WebSocketStreamPrototype);
+      webidl.assertBranded(this, WebSocketStream);
       return this[_connection].promise;
     }
 
     [_earlyClose] = false;
     [_closed] = new Deferred();
     get closed() {
-      webidl.assertBranded(this, WebSocketStreamPrototype);
+      webidl.assertBranded(this, WebSocketStream);
       return this[_closed].promise;
     }
 
     close(closeInfo) {
-      webidl.assertBranded(this, WebSocketStreamPrototype);
+      webidl.assertBranded(this, WebSocketStream);
       closeInfo = webidl.converters.WebSocketCloseInfo(closeInfo, {
         prefix: "Failed to execute 'close' on 'WebSocketStream'",
         context: "Argument 1",
@@ -384,7 +381,5 @@
     }
   }
 
-  const WebSocketStreamPrototype = WebSocketStream.prototype;
-
   window.__bootstrap.webSocket.WebSocketStream = WebSocketStream;
 })(this);
-- 
cgit v1.2.3