Backed out changeset 37c89ad82a13 (bug 1207090) for hazards bustage ON A CLOSED TREE

dom/network/TCPServerSocket.cpp

@@ -123,7 +123,7 @@ void
 TCPServerSocket::FireEvent(const nsAString& aType, TCPSocket* aSocket)
 {
   AutoJSAPI api;
-  api.Init(GetOwnerGlobal());
+  api.Init(GetOwner());
 
   TCPServerSocketEventInit init;
   init.mBubbles = false;
@@ -144,7 +144,7 @@ TCPServerSocket::FireEvent(const nsAString& aType, TCPSocket* aSocket)
 NS_IMETHODIMP
 TCPServerSocket::OnSocketAccepted(nsIServerSocket* aServer, nsISocketTransport* aTransport)
 {
-  nsCOMPtr<nsIGlobalObject> global = GetOwnerGlobal();
+  nsCOMPtr<nsIGlobalObject> global = do_QueryInterface(GetOwner());
   nsRefPtr<TCPSocket> socket = TCPSocket::CreateAcceptedSocket(global, aTransport, mUseArrayBuffers);
   if (mServerBridgeParent) {
     socket->SetAppIdAndBrowser(mServerBridgeParent->GetAppId(),
@@ -175,7 +175,7 @@ TCPServerSocket::OnStopListening(nsIServerSocket* aServer, nsresult aStatus)
 nsresult
 TCPServerSocket::AcceptChildSocket(TCPSocketChild* aSocketChild)
 {
-  nsCOMPtr<nsIGlobalObject> global = GetOwnerGlobal();
+  nsCOMPtr<nsIGlobalObject> global = do_QueryInterface(GetOwner());
   NS_ENSURE_TRUE(global, NS_ERROR_FAILURE);
   nsRefPtr<TCPSocket> socket = TCPSocket::CreateAcceptedSocket(global, aSocketChild, mUseArrayBuffers);
   NS_ENSURE_TRUE(socket, NS_ERROR_FAILURE);

dom/network/TCPSocket.cpp

@@ -493,7 +493,7 @@ TCPSocket::FireEvent(const nsAString& aType)
   }
 
   AutoJSAPI api;
-  if (NS_WARN_IF(!api.Init(GetOwnerGlobal()))) {
+  if (NS_WARN_IF(!api.Init(GetOwner()))) {
     return NS_ERROR_FAILURE;
   }
   JS::Rooted<JS::Value> val(api.cx());
@@ -505,7 +505,7 @@ TCPSocket::FireDataArrayEvent(const nsAString& aType,
                               const InfallibleTArray<uint8_t>& buffer)
 {
   AutoJSAPI api;
-  if (NS_WARN_IF(!api.Init(GetOwnerGlobal()))) {
+  if (NS_WARN_IF(!api.Init(GetOwner()))) {
     return NS_ERROR_FAILURE;
   }
   JSContext* cx = api.cx();
@@ -523,7 +523,7 @@ TCPSocket::FireDataStringEvent(const nsAString& aType,
                                const nsACString& aString)
 {
   AutoJSAPI api;
-  if (NS_WARN_IF(!api.Init(GetOwnerGlobal()))) {
+  if (NS_WARN_IF(!api.Init(GetOwner()))) {
     return NS_ERROR_FAILURE;
   }
   JSContext* cx = api.cx();
@@ -1034,7 +1034,7 @@ TCPSocket::OnDataAvailable(nsIRequest* aRequest, nsISupports* aContext, nsIInput
     }
 
     AutoJSAPI api;
-    if (!api.Init(GetOwnerGlobal())) {
+    if (!api.Init(GetOwner())) {
       return NS_ERROR_FAILURE;
     }
     JSContext* cx = api.cx();
@@ -1057,7 +1057,7 @@ TCPSocket::OnDataAvailable(nsIRequest* aRequest, nsISupports* aContext, nsIInput
   }
 
   AutoJSAPI api;
-  if (!api.Init(GetOwnerGlobal())) {
+  if (!api.Init(GetOwner())) {
     return NS_ERROR_FAILURE;
   }
   JSContext* cx = api.cx();
@@ -1189,16 +1189,3 @@ TCPSocket::Observe(nsISupports* aSubject, const char* aTopic, const char16_t* aD
 
   return NS_OK;
 }
-
-/* static */
-bool
-TCPSocket::ShouldTCPSocketExist(JSContext* aCx, JSObject* aGlobal)
-{
-  if (nsContentUtils::IsSystemPrincipal(nsContentUtils::ObjectPrincipal(aGlobal))) {
-    return true;
-  }
-
-  const char* const perms[] = { "tcp-socket", nullptr };
-  return Preferences::GetBool("dom.mozTCPSocket.enabled") &&
-      CheckAnyPermissions(aCx, aGlobal, perms);
-}

dom/network/TCPSocket.h

@@ -88,9 +88,12 @@ public:
   NS_DECL_NSIOBSERVER
   NS_DECL_NSITCPSOCKETCALLBACK
 
-  virtual JSObject* WrapObject(JSContext* aCx, JS::Handle<JSObject*> aGivenProto) override;
+  nsPIDOMWindow* GetParentObject() const
+  {
+    return GetOwner();
+  }
 
-  static bool ShouldTCPSocketExist(JSContext* aCx, JSObject* aGlobal);
+  virtual JSObject* WrapObject(JSContext* aCx, JS::Handle<JSObject*> aGivenProto) override;
 
   void GetHost(nsAString& aHost);
   uint32_t Port();

dom/network/moz.build

@@ -9,7 +9,6 @@ DIRS += ['interfaces']
 if CONFIG['MOZ_B2G_RIL']:
     XPCSHELL_TESTS_MANIFESTS += ['tests/unit_stats/xpcshell.ini']
 
-MOCHITEST_CHROME_MANIFESTS += ['tests/chrome.ini']
 MOCHITEST_MANIFESTS += ['tests/mochitest.ini']
 
 EXPORTS.mozilla.dom += [

dom/network/tests/chrome.ini

@@ -1,7 +0,0 @@
-[DEFAULT]
-support-files =
-  tcpsocket_test.jsm
-  test_tcpsocket_client_and_server_basics.js
-  add_task.js
-
-[test_tcpsocket_jsm.html]

dom/network/tests/tcpsocket_test.jsm

@@ -1,13 +0,0 @@
-this.EXPORTED_SYMBOLS = ['createSocket', 'createServer', 'enablePrefsAndPermissions'];
-
-this.createSocket = function(host, port, options) {
-  return new TCPSocket(host, port, options);
-}
-
-this.createServer = function(port, options, backlog) {
-  return new TCPServerSocket(port, options, backlog);
-}
-
-this.enablePrefsAndPermissions = function() {
-  return false;
-}

dom/network/tests/test_tcpsocket_client_and_server_basics.html

@@ -13,19 +13,6 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=1084245
   <script type="application/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
   <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css"/>
   <script type="application/javascript" src="add_task.js"></script>
-  <script type="application/javascript">
-    function createServer(port, options, backlog) {
-      return new TCPServerSocket(port, options, backlog);
-    }
-
-    function createSocket(host, port, options) {
-      return new TCPSocket(host, port, options);
-    }
-
-    function enablePrefsAndPermissions() {
-      return true;
-    }
-  </script>
   <script type="application/javascript;version=1.7" src="test_tcpsocket_client_and_server_basics.js"></script>
 </head>
 <body>

dom/network/tests/test_tcpsocket_client_and_server_basics.js

@@ -153,20 +153,18 @@ function defer() {
 
 
 function* test_basics() {
-  if (enablePrefsAndPermissions()) {
-    // Enable our use of TCPSocket
-    let prefDeferred = defer();
-    SpecialPowers.pushPrefEnv(
-      { set: [ ['dom.mozTCPSocket.enabled', true] ] },
-      prefDeferred.resolve);
-    yield prefDeferred.promise;
+  // Enable our use of TCPSocket
+  let prefDeferred = defer();
+  SpecialPowers.pushPrefEnv(
+    { set: [ ['dom.mozTCPSocket.enabled', true] ] },
+    prefDeferred.resolve);
+  yield prefDeferred.promise;
 
-    let permDeferred = defer();
-    SpecialPowers.pushPermissions(
-      [ { type: 'tcp-socket', allow: true, context: document } ],
-      permDeferred.resolve);
-    yield permDeferred.promise;
-  }
+  let permDeferred = defer();
+  SpecialPowers.pushPermissions(
+    [ { type: 'tcp-socket', allow: true, context: document } ],
+    permDeferred.resolve);
+  yield permDeferred.promise;
 
   // See bug 903830; in e10s mode we never get to find out the localPort if we
   // let it pick a free port by choosing 0.  This is the same port the xpcshell
@@ -174,15 +172,15 @@ function* test_basics() {
   let serverPort = 8085;
 
   // - Start up a listening socket.
-  let listeningServer = createServer(serverPort,
-                                     { binaryType: 'arraybuffer' },
-                                     SERVER_BACKLOG);
+  let listeningServer = new TCPServerSocket(serverPort,
+                                            { binaryType: 'arraybuffer' },
+                                            SERVER_BACKLOG);
 
   let connectedPromise = waitForConnection(listeningServer);
 
   // -- Open a connection to the server
-  let clientSocket = createSocket('127.0.0.1', serverPort,
-                                  { binaryType: 'arraybuffer' });
+  let clientSocket = new TCPSocket('127.0.0.1', serverPort,
+                                   { binaryType: 'arraybuffer' });
   let clientQueue = listenForEventsOnSocket(clientSocket, 'client');
 
   // (the client connects)
@@ -288,8 +286,8 @@ function* test_basics() {
 
   // -- Re-establish connection
   connectedPromise = waitForConnection(listeningServer);
-  clientSocket = createSocket('127.0.0.1', serverPort,
-                              { binaryType: 'arraybuffer' });
+  clientSocket = new TCPSocket('127.0.0.1', serverPort,
+                               { binaryType: 'arraybuffer' });
   clientQueue = listenForEventsOnSocket(clientSocket, 'client');
   is((yield clientQueue.waitForEvent()).type, 'open', 'got open event');
 
@@ -315,8 +313,8 @@ function* test_basics() {
 
   // -- Re-establish connection
   connectedPromise = waitForConnection(listeningServer);
-  clientSocket = createSocket('127.0.0.1', serverPort,
-                              { binaryType: 'arraybuffer' });
+  clientSocket = new TCPSocket('127.0.0.1', serverPort,
+                               { binaryType: 'arraybuffer' });
   clientQueue = listenForEventsOnSocket(clientSocket, 'client');
   is((yield clientQueue.waitForEvent()).type, 'open', 'got open event');
 
@@ -349,8 +347,8 @@ function* test_basics() {
 
   // -- Re-establish connection
   connectedPromise = waitForConnection(listeningServer);
-  clientSocket = createSocket('127.0.0.1', serverPort,
-                              { binaryType: 'string' });
+  clientSocket = new TCPSocket('127.0.0.1', serverPort,
+                               { binaryType: 'string' });
   clientQueue = listenForEventsOnSocket(clientSocket, 'client');
   is((yield clientQueue.waitForEvent()).type, 'open', 'got open event');
 
@@ -377,8 +375,8 @@ function* test_basics() {
   listeningServer.close();
 
   // - try and connect, get an error
-  clientSocket = createSocket('127.0.0.1', serverPort,
-                              { binaryType: 'arraybuffer' });
+  clientSocket = new TCPSocket('127.0.0.1', serverPort,
+                               { binaryType: 'arraybuffer' });
   clientQueue = listenForEventsOnSocket(clientSocket, 'client');
   is((yield clientQueue.waitForEvent()).type, 'error', 'fail to connect');
   is(clientSocket.readyState, 'closed',

dom/network/tests/test_tcpsocket_jsm.html

@@ -1,25 +0,0 @@
-<!DOCTYPE HTML>
-<html>
-<!--
--->
-<head>
-  <meta charset="utf-8">
-  <title>Test for 1207090</title>
-  <script type="application/javascript" src="chrome://mochikit/content/tests/SimpleTest/SimpleTest.js"></script>
-  <link rel="stylesheet" type="text/css" href="chrome://mochikit/content/tests/SimpleTest/test.css"/>
-  <script type="application/javascript">
-    Components.utils.import("chrome://mochitests/content/chrome/dom/network/tests/tcpsocket_test.jsm");
-  </script>
-  <script type="application/javascript" src="add_task.js"></script>
-  <script type="application/javascript;version=1.7" src="test_tcpsocket_client_and_server_basics.js"></script>
-</head>
-<body>
-<a target="_blank" href="https://bugzilla.mozilla.org/show_bug.cgi?id=1207090">Mozilla Bug 1207090</a>
-<p id="display"></p>
-<div id="content" style="display: none">
-</div>
-<pre id="test">
-</pre>
-<div id="container"></div>
-</body>
-</html>

dom/webidl/TCPServerSocket.webidl

@@ -14,8 +14,9 @@ dictionary ServerSocketOptions {
 };
 
 [Constructor(unsigned short port, optional ServerSocketOptions options, optional unsigned short backlog = 0),
- Func="mozilla::dom::TCPSocket::ShouldTCPSocketExist",
- Exposed=(Window,System)]
+ Pref="dom.mozTCPSocket.enabled",
+ CheckAnyPermissions="tcp-socket",
+ Exposed=Window]
 interface TCPServerSocket : EventTarget {
   /**
    * The port of this server socket object.

dom/webidl/TCPServerSocketEvent.webidl

@@ -4,8 +4,9 @@
  * You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 [Constructor(DOMString type, optional TCPServerSocketEventInit eventInitDict),
- Func="mozilla::dom::TCPSocket::ShouldTCPSocketExist",
- Exposed=(Window,System)]
+ Pref="dom.mozTCPSocket.enabled",
+ CheckAnyPermissions="tcp-socket",
+ Exposed=Window]
 interface TCPServerSocketEvent : Event {
   readonly attribute TCPSocket socket;
 };

dom/webidl/TCPSocket.webidl

@@ -40,8 +40,9 @@ interface LegacyMozTCPSocket {
 };
 
 [Constructor(DOMString host, unsigned short port, optional SocketOptions options),
- Func="mozilla::dom::TCPSocket::ShouldTCPSocketExist",
- Exposed=(Window,System)]
+ Pref="dom.mozTCPSocket.enabled",
+ CheckAnyPermissions="tcp-socket",
+ Exposed=Window]
 interface TCPSocket : EventTarget {
   /**
    * Upgrade an insecure connection to use TLS. Throws if the ready state is not OPEN.

dom/webidl/TCPSocketErrorEvent.webidl

@@ -9,9 +9,9 @@
 * - if there's an error connecting to the host
 */
 
-[Func="mozilla::dom::TCPSocket::ShouldTCPSocketExist",
- Constructor(DOMString type, optional TCPSocketErrorEventInit eventInitDict),
- Exposed=(Window,System)]
+[Pref="dom.mozTCPSocket.enabled",
+ CheckAnyPermissions="tcp-socket",
+ Constructor(DOMString type, optional TCPSocketErrorEventInit eventInitDict)]
 interface TCPSocketErrorEvent : Event {
   readonly attribute DOMString name;
   readonly attribute DOMString message;

dom/webidl/TCPSocketEvent.webidl

@@ -10,8 +10,9 @@
  */
 
 [Constructor(DOMString type, optional TCPSocketEventInit eventInitDict),
- Func="mozilla::dom::TCPSocket::ShouldTCPSocketExist",
- Exposed=(Window,System)]
+ Pref="dom.mozTCPSocket.enabled",
+ CheckAnyPermissions="tcp-socket",
+ Exposed=Window]
 interface TCPSocketEvent : Event {
   /**
    * If the event is a "data" event, data will be the bytes read from the network;