Backed out changeset d72ce5d90b7c (bug 1602565) for causing Android mochites failures CLOSED TREE

mobile/android/actors/LoadURIDelegateChild.jsm

@@ -15,12 +15,6 @@ var EXPORTED_SYMBOLS = ["LoadURIDelegateChild"];
 class LoadURIDelegateChild extends GeckoViewActorChild {
   // nsILoadURIDelegate.
   loadURI(aUri, aWhere, aFlags, aTriggeringPrincipal) {
-    if (!this.isGeckoViewWindow()) {
-      // Not a GeckoView-controlled window, nothing to do
-      debug`loadURI: not a GeckoView window`;
-      return false;
-    }
-
     debug`loadURI: uri=${aUri && aUri.spec}
                     where=${aWhere} flags=0x${aFlags.toString(16)}
                     tp=${aTriggeringPrincipal &&
@@ -39,12 +33,6 @@ class LoadURIDelegateChild extends GeckoViewActorChild {
 
   // nsILoadURIDelegate.
   handleLoadError(aUri, aError, aErrorModule) {
-    if (!this.isGeckoViewWindow()) {
-      // Not a GeckoView-controlled window, nothing to do
-      debug`loadURI: not a GeckoView window`;
-      return false;
-    }
-
     debug`handleLoadError: uri=${aUri && aUri.spec}
                              displaySpec=${aUri && aUri.displaySpec}
                              error=${aError}`;

mobile/android/modules/geckoview/GeckoViewActorChild.jsm

@@ -19,14 +19,6 @@ class GeckoViewActorChild extends JSWindowActorChild {
       this.docShell.domWindow
     );
   }
-
-  isGeckoViewWindow() {
-    const { chromeFlags } = this.docShell.treeOwner
-      .QueryInterface(Ci.nsIInterfaceRequestor)
-      .getInterface(Ci.nsIWebBrowserChrome);
-
-    return (chromeFlags & Ci.nsIWebBrowserChrome.CHROME_GECKOVIEW) !== 0;
-  }
 }
 
 const { debug, warn } = GeckoViewUtils.initLogging("Actor[C]"); // eslint-disable-line no-unused-vars

toolkit/components/browser/nsIWebBrowserChrome.idl

@@ -70,9 +70,6 @@ interface nsIWebBrowserChrome : nsISupports
     // Whether this window should use out-of-process cross-origin subframes.
     const unsigned long CHROME_FISSION_WINDOW         = 0x00200000;
 
-    // This is a GeckoView window
-    const unsigned long CHROME_GECKOVIEW              = 0x00400000;
-
     // Prevents new window animations on MacOS and Windows. Currently
     // ignored for Linux.
     const unsigned long CHROME_SUPPRESS_ANIMATION     = 0x01000000;

toolkit/components/windowwatcher/nsWindowWatcher.cpp

@@ -1891,9 +1891,6 @@ uint32_t nsWindowWatcher::CalculateChromeFlagsForParent(
   chromeFlags |= WinHasOption(aFeatures, "dependent", 0, nullptr)
                      ? nsIWebBrowserChrome::CHROME_DEPENDENT
                      : 0;
-  chromeFlags |= WinHasOption(aFeatures, "geckoview", 0, nullptr)
-                     ? nsIWebBrowserChrome::CHROME_GECKOVIEW
-                     : 0;
   chromeFlags |= WinHasOption(aFeatures, "modal", 0, nullptr)
                      ? (nsIWebBrowserChrome::CHROME_MODAL |
                         nsIWebBrowserChrome::CHROME_DEPENDENT)

widget/android/nsWindow.cpp

@@ -1293,7 +1293,7 @@ void nsWindow::GeckoViewSupport::Open(
       java::EventDispatcher::Ref::From(aDispatcher), nullptr);
   androidView->mInitData = java::GeckoBundle::Ref::From(aInitData);
 
-  nsAutoCString chromeFlags("chrome,dialog=0,resizable,scrollbars,geckoview");
+  nsAutoCString chromeFlags("chrome,dialog=0,resizable,scrollbars");
   if (aPrivateMode) {
     chromeFlags += ",private";
   }