Backed out changeset 4eb1a4c1fdb1 (bug 1404910) for failing dom/base/…

…test/test_window_cross_origin_props.html with e10s (runs on Windows 7 debug). r=backout a=backout on a CLOSED TREE MozReview-Commit-ID: 2FATIBGSlEg
dothq · Oct 8, 2017 · 1033bfa · 1033bfa
1 parent 57b1e21
commit 1033bfa
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 106 deletions.
diff --git a/dom/base/WebSocket.cpp b/dom/base/WebSocket.cpp
@@ -1666,17 +1666,18 @@ WebSocketImpl::Init(JSContext* aCx,
       nsCOMPtr<nsPIDOMWindowInner> innerWindow;
 
       while (true) {
-        if (principal && !principal->GetIsNullPrincipal()) {
-          break;
+        if (principal) {
+          bool isNullPrincipal = true;
+          isNullPrincipal = principal->GetIsNullPrincipal();
+          if (isNullPrincipal || nsContentUtils::IsSystemPrincipal(principal)) {
+            break;
+          }
         }
 
         if (!innerWindow) {
           innerWindow = do_QueryInterface(globalObject);
-          if (!innerWindow) {
-            // If we are in a XPConnect sandbox or in a JS component,
-            // innerWindow will be null. There is nothing on top of this to be
-            // considered.
-            break;
+          if (NS_WARN_IF(!innerWindow)) {
+            return NS_ERROR_DOM_SECURITY_ERR;
           }
         }
 

diff --git a/dom/base/test/iframe_webSocket_sandbox.html b/dom/base/test/iframe_webSocket_sandbox.html
diff --git a/dom/base/test/mochitest.ini b/dom/base/test/mochitest.ini
@@ -805,9 +805,6 @@ skip-if = toolkit == 'android'
 skip-if = toolkit == 'android'
 [test_websocket_permessage_deflate.html]
 skip-if = toolkit == 'android'
-[test_webSocket_sandbox.html]
-skip-if = toolkit == 'android'
-support-files = iframe_webSocket_sandbox.html
 [test_websocket1.html]
 skip-if = toolkit == 'android'
 [test_websocket2.html]

diff --git a/dom/base/test/test_webSocket_sandbox.html b/dom/base/test/test_webSocket_sandbox.html