Backed out 7 changesets (bug 1432856) for build bustages failures in nsWindow.h on a CLOSED TREE

Backed out changeset 3d08c3cce533 (bug 1432856)
Backed out changeset 49d03dd89b17 (bug 1432856)
Backed out changeset 62fc84c8ce99 (bug 1432856)
Backed out changeset a8a4fa63f5b2 (bug 1432856)
Backed out changeset c81f3d5b9bf3 (bug 1432856)
Backed out changeset 8351a8b1d96a (bug 1432856)
Backed out changeset a303b775a51b (bug 1432856)

Author: Oana Pop Rus

browser/base/content/test/fullscreen/browser.ini

@@ -1,14 +1,9 @@
 [DEFAULT]
 support-files =
   head.js
-  open_and_focus_helper.html
 [browser_bug1557041.js]
 skip-if = os == 'linux' # Bug 1561973
 [browser_fullscreen_permissions_prompt.js]
 skip-if = debug && os == 'mac' # Bug 1568570
 [browser_fullscreen_cross_origin.js]
 support-files = fullscreen.html fullscreen_frame.html
-[browser_fullscreen_window_open.js]
-skip-if = debug && os == 'mac' # Bug 1568570
-[browser_fullscreen_window_focus.js]
-skip-if = debug && os == 'mac' # Bug 1568570

browser/base/content/test/fullscreen/browser_fullscreen_window_focus.js

@@ -2,6 +2,7 @@ const { ContentTaskUtils } = ChromeUtils.import(
   "resource://testing-common/ContentTaskUtils.jsm"
 );
 function waitForFullScreenState(browser, state) {
+  info("inside waitforfullscreenstate");
   return new Promise(resolve => {
     let eventReceived = false;
 
@@ -14,7 +15,7 @@ function waitForFullScreenState(browser, state) {
     };
     Services.obs.addObserver(observe, "fullscreen-painted");
 
-    browser.ownerGlobal.addEventListener(
+    window.addEventListener(
       `MozDOMFullscreen:${state ? "Entered" : "Exited"}`,
       () => {
         eventReceived = true;
@@ -49,78 +50,3 @@ async function changeFullscreen(browser, fullScreenState) {
   });
   return fullScreenChange;
 }
-
-async function testExpectFullScreenExit(browser, leaveFS, action) {
-  let fsPromise = waitForFullScreenState(browser, !leaveFS);
-  if (leaveFS) {
-    if (action) {
-      await action();
-    }
-    await fsPromise;
-    ok(true, "Should leave full-screen");
-  } else {
-    if (action) {
-      await action();
-    }
-    let result = await Promise.race([
-      fsPromise,
-      new Promise(resolve => {
-        SimpleTest.requestFlakyTimeout("Wait for failure condition");
-        // eslint-disable-next-line mozilla/no-arbitrary-setTimeout
-        setTimeout(() => resolve(true), 2500);
-      }),
-    ]);
-    ok(result, "Should not leave full-screen");
-  }
-}
-
-function jsWindowFocus(browser, iframeId) {
-  return ContentTask.spawn(browser, { iframeId }, async args => {
-    let destWin = content;
-    if (args.iframeId) {
-      let iframe = content.document.getElementById(args.iframeId);
-      if (!iframe) {
-        throw new Error("iframe not set");
-      }
-      destWin = iframe.contentWindow;
-    }
-    await content.wrappedJSObject.sendMessage(destWin, "focus");
-  });
-}
-
-async function jsWindowOpen(browser, iframeId) {
-  let windowOpened = BrowserTestUtils.waitForNewWindow();
-  ContentTask.spawn(browser, { iframeId }, async args => {
-    let destWin = content;
-    if (args.iframeId) {
-      // Create a cross origin iframe
-      destWin = (await content.wrappedJSObject.createIframe(
-        args.iframeId,
-        true
-      )).contentWindow;
-    }
-    // Send message to either the iframe or the current page to open a popup
-    await content.wrappedJSObject.sendMessage(destWin, "open");
-  });
-  return windowOpened;
-}
-
-function waitForFocus(...args) {
-  return new Promise(resolve => SimpleTest.waitForFocus(resolve, ...args));
-}
-
-function waitForBrowserWindowActive(win) {
-  return new Promise(resolve => {
-    if (Services.focus.activeWindow == win) {
-      resolve();
-    } else {
-      win.addEventListener(
-        "activate",
-        () => {
-          resolve();
-        },
-        { once: true }
-      );
-    }
-  });
-}

browser/base/content/test/fullscreen/browser_fullscreen_window_open.js

@@ -948,7 +948,7 @@ nsresult BrowsingContext::InternalLoad(BrowsingContext* aAccessor,
     // the same as how the tab first opened.
     nsCOMPtr<nsPIDOMWindowOuter> domWin = GetDOMWindow();
     if (isActive && domWin) {
-      nsFocusManager::FocusWindow(domWin, CallerType::System);
+      nsFocusManager::FocusWindow(domWin);
     }
 
     // Else we ran out of memory, or were a popup and got blocked,
@@ -1022,11 +1022,11 @@ void BrowsingContext::Close(CallerType aCallerType, ErrorResult& aError) {
   }
 }
 
-void BrowsingContext::Focus(CallerType aCallerType, ErrorResult& aError) {
+void BrowsingContext::Focus(ErrorResult& aError) {
   if (ContentChild* cc = ContentChild::GetSingleton()) {
-    cc->SendWindowFocus(this, aCallerType);
+    cc->SendWindowFocus(this);
   } else if (ContentParent* cp = Canonical()->GetContentParent()) {
-    Unused << cp->SendWindowFocus(this, aCallerType);
+    Unused << cp->SendWindowFocus(this);
   }
 }
 

browser/base/content/test/fullscreen/head.js

@@ -388,7 +388,7 @@ class BrowsingContext : public nsISupports,
                 ErrorResult& aError);
   void Close(CallerType aCallerType, ErrorResult& aError);
   bool GetClosed(ErrorResult&) { return mClosed; }
-  void Focus(CallerType aCallerType, ErrorResult& aError);
+  void Focus(ErrorResult& aError);
   void Blur(ErrorResult& aError);
   WindowProxyHolder GetFrames(ErrorResult& aError);
   int32_t Length() const { return mChildren.Length(); }

browser/base/content/test/fullscreen/open_and_focus_helper.html

@@ -196,7 +196,7 @@ nsDSURIContentListener::DoContent(const nsACString& aContentType,
     nsCOMPtr<nsPIDOMWindowOuter> domWindow =
         mDocShell ? mDocShell->GetWindow() : nullptr;
     NS_ENSURE_TRUE(domWindow, NS_ERROR_FAILURE);
-    domWindow->Focus(mozilla::dom::CallerType::System);
+    domWindow->Focus();
   }
 
   return NS_OK;

docshell/base/BrowsingContext.cpp

@@ -11563,7 +11563,7 @@ class nsAutoFocusEvent : public Runnable {
 
     FocusOptions options;
     ErrorResult rv;
-    mElement->Focus(options, CallerType::System, rv);
+    mElement->Focus(options, rv);
     return rv.StealNSResult();
   }
 

docshell/base/BrowsingContext.h

@@ -336,8 +336,7 @@ int32_t Element::TabIndex() {
   return TabIndexDefault();
 }
 
-void Element::Focus(const FocusOptions& aOptions, CallerType aCallerType,
-                    ErrorResult& aError) {
+void Element::Focus(const FocusOptions& aOptions, ErrorResult& aError) {
   nsFocusManager* fm = nsFocusManager::GetFocusManager();
   // Also other browsers seem to have the hack to not re-focus (and flush) when
   // the element is already focused.
@@ -349,13 +348,9 @@ void Element::Focus(const FocusOptions& aOptions, CallerType aCallerType,
     if (fm->CanSkipFocus(this)) {
       fm->NeedsFlushBeforeEventHandling(this);
     } else {
-      uint32_t fmFlags =
-          nsIFocusManager::FLAG_BYELEMENTFOCUS |
-          nsFocusManager::FocusOptionsToFocusManagerFlags(aOptions);
-      if (aCallerType == CallerType::NonSystem) {
-        fmFlags = nsIFocusManager::FLAG_NONSYSTEMCALLER | fmFlags;
-      }
-      aError = fm->SetFocus(this, fmFlags);
+      aError = fm->SetFocus(
+          this, nsIFocusManager::FLAG_BYELEMENTFOCUS |
+                    nsFocusManager::FocusOptionsToFocusManagerFlags(aOptions));
     }
   }
 }