Rietveld Code Review Tool
Help | Bug tracker | Discussion group | Source code

Unified Diff: include.preload.js

Issue 29349737: Issue 1727 - Fix WebSocket constructor without second argument in Chrome 47 (Closed)
Patch Set: Don't use Array.push Created Aug. 11, 2016, 2:29 p.m.
Use n/p to move between diff chunks; N/P to move between comments.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: include.preload.js
===================================================================
--- a/include.preload.js
+++ b/include.preload.js
@@ -379,6 +379,7 @@
// As far as possible we must track everything we use that could be
// sabotaged by the website later in order to circumvent us.
var RealWebSocket = WebSocket;
+ var bindWebSocket = Function.prototype.bind.apply.bind(Function.prototype.bind, RealWebSocket);
var closeWebSocket = Function.prototype.call.bind(RealWebSocket.prototype.close);
var addEventListener = document.addEventListener.bind(document);
var removeEventListener = document.removeEventListener.bind(document);
@@ -400,13 +401,14 @@
}));
}
- WebSocket = function WrappedWebSocket(url, protocols)
+ WebSocket = function WrappedWebSocket()
{
- // Throw correct exceptions if the constructor is used improperly.
- if (!(this instanceof WrappedWebSocket)) return RealWebSocket();
- if (arguments.length < 1) return new RealWebSocket();
+ var args = [this];
+ for (var i = 0; i < arguments.length; i++)
+ args[i + 1] = arguments[i];
- var websocket = new RealWebSocket(url, protocols);
+ var ctor = bindWebSocket(args);
+ var websocket = this instanceof WrappedWebSocket ? new ctor : ctor();
checkRequest(websocket.url, function(blocked)
{
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld