Backed out 2 changesets (bug 1639165) for dt failures on browser_webconsole_stubs_css_message.js . CLOSED TREE

Backed out changeset 6c7cd0394f8d (bug 1639165)
Backed out changeset c5cd10328f91 (bug 1639165)

devtools/client/webconsole/webconsole-ui.js

@@ -65,10 +65,6 @@ class WebConsoleUI {
       this.hud.currentTarget &&
       this.hud.currentTarget.isParentProcess &&
       !this.hud.currentTarget.isAddon;
-    this.fissionSupport = Services.prefs.getBoolPref(
-      constants.PREFS.FEATURES.BROWSER_TOOLBOX_FISSION
-    );
-
     this.window = this.hud.iframeWindow;
 
     this._onPanelSelected = this._onPanelSelected.bind(this);
@@ -347,15 +343,6 @@ class WebConsoleUI {
   }
 
   _onResourceAvailable({ resourceType, targetFront, resource }) {
-    // Ignore messages forwarded from content processes if we're in fission browser toolbox.
-    if (
-      resourceType === this.hud.resourceWatcher.TYPES.ERROR_MESSAGE &&
-      resource.pageError.isForwardedFromContentProcess &&
-      (this.isBrowserToolboxConsole || this.isBrowserConsole) &&
-      this.fissionSupport
-    ) {
-      return;
-    }
     this.wrapper.dispatchMessageAdd(resource);
   }
 
@@ -383,10 +370,11 @@ class WebConsoleUI {
     // This is a top level target. It may update on process switches
     // when navigating to another domain.
     if (targetFront.isTopLevel) {
+      const fissionSupport = Services.prefs.getBoolPref(
+        constants.PREFS.FEATURES.BROWSER_TOOLBOX_FISSION
+      );
       const needContentProcessMessagesListener =
-        targetFront.isParentProcess &&
-        !targetFront.isAddon &&
-        !this.fissionSupport;
+        targetFront.isParentProcess && !targetFront.isAddon && !fissionSupport;
       this.proxy = new WebConsoleConnectionProxy(
         this,
         targetFront,

devtools/server/actors/webconsole.js

@@ -1721,7 +1721,6 @@ const WebConsoleActor = ActorClassWithSpec(webconsoleSpec, {
       chromeContext: pageError.isFromChromeContext,
       cssSelectors: pageError.cssSelectors,
       isPromiseRejection: pageError.isPromiseRejection,
-      isForwardedFromContentProcess: pageError.isForwardedFromContentProcess,
     };
 
     // If the pageError does have an exception object, we want to return the grip for it,

dom/bindings/nsIScriptError.idl

@@ -88,8 +88,6 @@ interface nsIScriptError : nsIConsoleMessage
 
     readonly attribute boolean isFromChromeContext;
 
-    attribute boolean isForwardedFromContentProcess;
-
     // Error created from a Promise rejection.
     readonly attribute boolean isPromiseRejection;
 

dom/bindings/nsScriptError.cpp

@@ -37,8 +37,7 @@ nsScriptErrorBase::nsScriptErrorBase()
       mInitializedOnMainThread(false),
       mIsFromPrivateWindow(false),
       mIsFromChromeContext(false),
-      mIsPromiseRejection(false),
-      mIsForwardedFromContentProcess(false) {}
+      mIsPromiseRejection(false) {}
 
 nsScriptErrorBase::~nsScriptErrorBase() = default;
 
@@ -422,20 +421,6 @@ nsScriptErrorBase::InitIsPromiseRejection(bool aIsPromiseRejection) {
   return NS_OK;
 }
 
-NS_IMETHODIMP
-nsScriptErrorBase::GetIsForwardedFromContentProcess(
-    bool* aIsForwardedFromContentProcess) {
-  *aIsForwardedFromContentProcess = mIsForwardedFromContentProcess;
-  return NS_OK;
-}
-
-NS_IMETHODIMP
-nsScriptErrorBase::SetIsForwardedFromContentProcess(
-    bool aIsForwardedFromContentProcess) {
-  mIsForwardedFromContentProcess = aIsForwardedFromContentProcess;
-  return NS_OK;
-}
-
 NS_IMETHODIMP
 nsScriptErrorBase::GetNotes(nsIArray** aNotes) {
   nsresult rv = NS_OK;

dom/bindings/nsScriptError.h

@@ -89,7 +89,6 @@ class nsScriptErrorBase : public nsIScriptError {
   bool mIsFromPrivateWindow;
   bool mIsFromChromeContext;
   bool mIsPromiseRejection;
-  bool mIsForwardedFromContentProcess;
 };
 
 class nsScriptError final : public nsScriptErrorBase {

dom/ipc/ContentParent.cpp

@@ -4302,8 +4302,6 @@ mozilla::ipc::IPCResult ContentParent::RecvScriptErrorInternal(
                           aFromPrivateWindow, aFromChromeContext);
   if (NS_FAILED(rv)) return IPC_OK();
 
-  msg->SetIsForwardedFromContentProcess(true);
-
   consoleService->LogMessageWithMode(msg, nsConsoleService::SuppressLog);
   return IPC_OK();
 }