Backed out changeset 7fa7d6e6dedc (bug 1442778) for devtools failures…

… on browser_webconsole_check_stubs_console_api.js CLOSED TREE
Brli · Mar 26, 2019 · 7e69423 · 7e69423
1 parent 34df3fc
commit 7e69423
Show file tree

Hide file tree

Showing 37 changed files with 68 additions and 149 deletions.
diff --git a/caps/nsScriptSecurityManager.cpp b/caps/nsScriptSecurityManager.cpp
@@ -447,6 +447,7 @@ nsScriptSecurityManager::GetChannelURIPrincipal(nsIChannel* aChannel,
   return *aPrincipal ? NS_OK : NS_ERROR_FAILURE;
 }
 
+
 /////////////////////////////
 // nsScriptSecurityManager //
 /////////////////////////////
@@ -1148,8 +1149,7 @@ nsresult nsScriptSecurityManager::ReportError(const char* aMessageTag,
 
   // using category of "SOP" so we can link to MDN
   rv = error->Init(message, EmptyString(), EmptyString(), 0, 0,
-                   nsIScriptError::errorFlag, "SOP", aFromPrivateWindow,
-                   true /* From chrome context */);
+                   nsIScriptError::errorFlag, "SOP", aFromPrivateWindow);
   NS_ENSURE_SUCCESS(rv, rv);
   console->LogMessage(error);
   return NS_OK;

diff --git a/chrome/nsChromeRegistry.cpp b/chrome/nsChromeRegistry.cpp
@@ -79,10 +79,10 @@ void nsChromeRegistry::LogMessageWithContext(nsIURI* aURL, uint32_t aLineNumber,
   nsCString spec;
   if (aURL) aURL->GetSpec(spec);
 
-  rv = error->Init(
-      NS_ConvertUTF8toUTF16(formatted.get()), NS_ConvertUTF8toUTF16(spec),
-      EmptyString(), aLineNumber, 0, flags, "chrome registration",
-      false /* from private window */, true /* from chrome context */);
+  rv = error->Init(NS_ConvertUTF8toUTF16(formatted.get()),
+                   NS_ConvertUTF8toUTF16(spec), EmptyString(), aLineNumber, 0,
+                   flags, "chrome registration",
+                   false /* from private window */);
 
   if (NS_FAILED(rv)) return;
 

diff --git a/dom/base/PostMessageEvent.cpp b/dom/base/PostMessageEvent.cpp
@@ -18,6 +18,7 @@
 #include "mozilla/dom/StructuredCloneTags.h"
 #include "mozilla/dom/UnionConversions.h"
 #include "mozilla/EventDispatcher.h"
+#include "nsContentUtils.h"
 #include "nsDocShell.h"
 #include "nsGlobalWindow.h"
 #include "nsIConsoleService.h"
@@ -135,10 +136,9 @@ PostMessageEvent::Run() {
         rv = NS_GetSanitizedURIStringFromURI(callerDocumentURI, uriSpec);
         NS_ENSURE_SUCCESS(rv, rv);
 
-        rv = errorObject->Init(
-            errorText, uriSpec, EmptyString(), 0, 0, nsIScriptError::errorFlag,
-            "DOM Window", mIsFromPrivateWindow,
-            nsContentUtils::IsSystemPrincipal(mProvidedPrincipal));
+        rv = errorObject->Init(errorText, uriSpec, EmptyString(), 0, 0,
+                               nsIScriptError::errorFlag, "DOM Window",
+                               mIsFromPrivateWindow);
       }
       NS_ENSURE_SUCCESS(rv, rv);
 

diff --git a/dom/base/PostMessageEvent.h b/dom/base/PostMessageEvent.h
@@ -13,7 +13,6 @@
 #include "nsCOMPtr.h"
 #include "mozilla/MaybeOneOf.h"
 #include "mozilla/RefPtr.h"
-#include "nsContentUtils.h"
 #include "nsTArray.h"
 #include "nsThreadUtils.h"
 

diff --git a/dom/base/nsContentUtils.cpp b/dom/base/nsContentUtils.cpp
@@ -3736,17 +3736,16 @@ nsresult nsContentUtils::FormatLocalizedString(
 /* static */
 void nsContentUtils::LogSimpleConsoleError(const nsAString& aErrorText,
                                            const char* classification,
-                                           bool aFromPrivateWindow,
-                                           bool aFromChromeContext) {
+                                           bool aFromPrivateWindow) {
   nsCOMPtr<nsIScriptError> scriptError =
       do_CreateInstance(NS_SCRIPTERROR_CONTRACTID);
   if (scriptError) {
     nsCOMPtr<nsIConsoleService> console =
         do_GetService(NS_CONSOLESERVICE_CONTRACTID);
-    if (console && NS_SUCCEEDED(scriptError->Init(
-                       aErrorText, EmptyString(), EmptyString(), 0, 0,
-                       nsIScriptError::errorFlag, classification,
-                       aFromPrivateWindow, aFromChromeContext))) {
+    if (console &&
+        NS_SUCCEEDED(scriptError->Init(aErrorText, EmptyString(), EmptyString(),
+                                       0, 0, nsIScriptError::errorFlag,
+                                       classification, aFromPrivateWindow))) {
       console->LogMessage(scriptError);
     }
   }
@@ -5300,7 +5299,6 @@ nsContentUtils::GetMostRecentNonPBWindow() {
 void nsContentUtils::WarnScriptWasIgnored(Document* aDocument) {
   nsAutoString msg;
   bool privateBrowsing = false;
-  bool chromeContext = false;
 
   if (aDocument) {
     nsCOMPtr<nsIURI> uri = aDocument->GetDocumentURI();
@@ -5310,12 +5308,11 @@ void nsContentUtils::WarnScriptWasIgnored(Document* aDocument) {
     }
     privateBrowsing =
         !!aDocument->NodePrincipal()->OriginAttributesRef().mPrivateBrowsingId;
-    chromeContext = IsSystemPrincipal(aDocument->NodePrincipal());
   }
 
   msg.AppendLiteral(
       "Unable to run script because scripts are blocked internally.");
-  LogSimpleConsoleError(msg, "DOM", privateBrowsing, chromeContext);
+  LogSimpleConsoleError(msg, "DOM", privateBrowsing);
 }
 
 /* static */

diff --git a/dom/base/nsContentUtils.h b/dom/base/nsContentUtils.h
@@ -1024,8 +1024,7 @@ class nsContentUtils {
    */
   static void LogSimpleConsoleError(const nsAString& aErrorText,
                                     const char* classification,
-                                    bool aFromPrivateWindow,
-                                    bool aFromChromeContext);
+                                    bool aFromPrivateWindow);
 
   /**
    * Report a non-localized error message to the error console.

diff --git a/dom/base/nsFrameMessageManager.cpp b/dom/base/nsFrameMessageManager.cpp
@@ -409,8 +409,7 @@ bool nsFrameMessageManager::GetParamsForMessage(JSContext* aCx,
                                   "you trying to send an XPCOM object?"),
                 filename, EmptyString(), lineno, column,
                 nsIScriptError::warningFlag, "chrome javascript",
-                false /* from private window */,
-                true /* from chrome context */);
+                false /* from private window */);
     console->LogMessage(error);
   }
 
@@ -825,8 +824,7 @@ void nsFrameMessageManager::ReceiveMessage(
                 do_CreateInstance(NS_SCRIPTERROR_CONTRACTID));
             error->Init(msg, EmptyString(), EmptyString(), 0, 0,
                         nsIScriptError::warningFlag, "chrome javascript",
-                        false /* from private window */,
-                        true /* from chrome context */);
+                        false /* from private window */);
             console->LogMessage(error);
           }
 

diff --git a/dom/base/nsGlobalWindowOuter.cpp b/dom/base/nsGlobalWindowOuter.cpp
@@ -5951,8 +5951,7 @@ bool nsGlobalWindowOuter::GetPrincipalForPostMessage(
                 R"(origin "%s" from a system principal scope with mismatched )"
                 R"(origin "%s".)",
                 targetURL.get(), targetOrigin.get(), sourceOrigin.get())),
-            "DOM", !!principal->PrivateBrowsingId(),
-            nsContentUtils::IsSystemPrincipal(principal));
+            "DOM", !!principal->PrivateBrowsingId());
 
         attrs = principal->OriginAttributesRef();
       }

diff --git a/dom/bindings/nsIScriptError.idl b/dom/bindings/nsIScriptError.idl
@@ -93,8 +93,6 @@ interface nsIScriptError : nsIConsoleMessage
 
     readonly attribute boolean isFromPrivateWindow;
 
-    readonly attribute boolean isFromChromeContext;
-
     attribute jsval stack;
 
     /**
@@ -127,8 +125,7 @@ interface nsIScriptError : nsIConsoleMessage
               in uint32_t columnNumber,
               in uint32_t flags,
               in string category,
-              [optional] in bool fromPrivateWindow,
-              [optional] in bool fromChromeContext);
+              [optional] in bool fromPrivateWindow);
 
     /* This should be called instead of nsIScriptError.init to
      * initialize with a window id.  The window id should be for the

diff --git a/dom/bindings/nsScriptError.cpp b/dom/bindings/nsScriptError.cpp
@@ -44,8 +44,7 @@ nsScriptErrorBase::nsScriptErrorBase()
       mTimeStamp(0),
       mTimeWarpTarget(0),
       mInitializedOnMainThread(false),
-      mIsFromPrivateWindow(false),
-      mIsFromChromeContext(false) {}
+      mIsFromPrivateWindow(false) {}
 
 nsScriptErrorBase::~nsScriptErrorBase() {}
 
@@ -63,7 +62,7 @@ void nsScriptErrorBase::InitializeOnMainThread() {
     if (window) {
       nsPIDOMWindowOuter* outer = window->GetOuterWindow();
       if (outer) mOuterWindowID = outer->WindowID();
-      mIsFromChromeContext = ComputeIsFromChromeContext(window);
+
       mIsFromPrivateWindow = ComputeIsFromPrivateWindow(window);
     }
   }
@@ -205,15 +204,13 @@ NS_IMETHODIMP
 nsScriptErrorBase::Init(const nsAString& message, const nsAString& sourceName,
                         const nsAString& sourceLine, uint32_t lineNumber,
                         uint32_t columnNumber, uint32_t flags,
-                        const char* category, bool fromPrivateWindow,
-                        bool fromChromeContext) {
+                        const char* category, bool fromPrivateWindow) {
   InitializationHelper(message, sourceLine, lineNumber, columnNumber, flags,
                        category ? nsDependentCString(category) : EmptyCString(),
                        0 /* inner Window ID */);
   AssignSourceNameHelper(mSourceName, sourceName);
 
   mIsFromPrivateWindow = fromPrivateWindow;
-  mIsFromChromeContext = fromChromeContext;
   return NS_OK;
 }
 
@@ -383,18 +380,6 @@ nsScriptErrorBase::GetTimeWarpTarget(uint64_t* aTarget) {
   return NS_OK;
 }
 
-NS_IMETHODIMP
-nsScriptErrorBase::GetIsFromChromeContext(bool* aIsFromChromeContext) {
-  NS_WARNING_ASSERTION(NS_IsMainThread() || mInitializedOnMainThread,
-                       "This can't be safely determined off the main thread, "
-                       "returning an inaccurate value!");
-  if (!mInitializedOnMainThread && NS_IsMainThread()) {
-    InitializeOnMainThread();
-  }
-  *aIsFromChromeContext = mIsFromChromeContext;
-  return NS_OK;
-}
-
 NS_IMETHODIMP
 nsScriptErrorBase::GetNotes(nsIArray** aNotes) {
   nsresult rv = NS_OK;
@@ -418,13 +403,6 @@ bool nsScriptErrorBase::ComputeIsFromPrivateWindow(
          !nsContentUtils::IsSystemPrincipal(winPrincipal);
 }
 
-/* static */
-bool nsScriptErrorBase::ComputeIsFromChromeContext(
-    nsGlobalWindowInner* aWindow) {
-  nsIPrincipal* winPrincipal = aWindow->GetPrincipal();
-  return nsContentUtils::IsSystemPrincipal(winPrincipal);
-}
-
 NS_IMPL_ISUPPORTS(nsScriptError, nsIConsoleMessage, nsIScriptError)
 
 nsScriptErrorNote::nsScriptErrorNote()

diff --git a/dom/bindings/nsScriptError.h b/dom/bindings/nsScriptError.h
@@ -54,8 +54,6 @@ class nsScriptErrorBase : public nsIScriptError {
 
   static bool ComputeIsFromPrivateWindow(nsGlobalWindowInner* aWindow);
 
-  static bool ComputeIsFromChromeContext(nsGlobalWindowInner* aWindow);
-
  protected:
   virtual ~nsScriptErrorBase();
 
@@ -82,11 +80,10 @@ class nsScriptErrorBase : public nsIScriptError {
   uint64_t mInnerWindowID;
   int64_t mTimeStamp;
   uint64_t mTimeWarpTarget;
-  // mInitializedOnMainThread, mIsFromPrivateWindow and mIsFromChromeContext are
-  // set on the main thread from InitializeOnMainThread().
+  // mInitializedOnMainThread and mIsFromPrivateWindow are set on the main
+  // thread from InitializeOnMainThread().
   mozilla::Atomic<bool> mInitializedOnMainThread;
   bool mIsFromPrivateWindow;
-  bool mIsFromChromeContext;
 };
 
 class nsScriptError final : public nsScriptErrorBase {

diff --git a/dom/console/Console.cpp b/dom/console/Console.cpp
@@ -1276,7 +1276,6 @@ void Console::ProfileMethodMainthread(JSContext* aCx, const nsAString& aAction,
 
   RootedDictionary<ConsoleProfileEvent> event(aCx);
   event.mAction = aAction;
-  event.mChromeContext = nsContentUtils::ThreadsafeIsSystemCaller(aCx);
 
   event.mArguments.Construct();
   Sequence<JS::Value>& sequence = event.mArguments.Value();
@@ -1684,8 +1683,6 @@ bool Console::PopulateConsoleNotificationInTheTargetScope(
   event.mID.Construct();
   event.mInnerID.Construct();
 
-  event.mChromeContext = nsContentUtils::ThreadsafeIsSystemCaller(aCx);
-
   if (aData->mIDType == ConsoleCallData::eString) {
     event.mID.Value().SetAsString() = aData->mOuterIDString;
     event.mInnerID.Value().SetAsString() = aData->mInnerIDString;

diff --git a/dom/console/ConsoleInstance.cpp b/dom/console/ConsoleInstance.cpp
@@ -39,8 +39,7 @@ ConsoleLogLevel PrefToValue(const nsAString& aPref) {
         "Console.maxLogLevelPref used with a non-existing pref: ");
     message.Append(aPref);
 
-    nsContentUtils::LogSimpleConsoleError(message, "chrome", false,
-                                          true /* from chrome context*/);
+    nsContentUtils::LogSimpleConsoleError(message, "chrome", false);
     return ConsoleLogLevel::All;
   }
 
@@ -51,8 +50,7 @@ ConsoleLogLevel PrefToValue(const nsAString& aPref) {
     message.AssignLiteral("Invalid Console.maxLogLevelPref value: ");
     message.Append(NS_ConvertUTF8toUTF16(value));
 
-    nsContentUtils::LogSimpleConsoleError(message, "chrome", false,
-                                          true /* from chrome context*/);
+    nsContentUtils::LogSimpleConsoleError(message, "chrome", false);
     return ConsoleLogLevel::All;
   }
 

diff --git a/dom/console/tests/test_console_binding.html b/dom/console/tests/test_console_binding.html
@@ -18,7 +18,6 @@
   observe(aSubject, aTopic, aData) {
     if (aTopic == "console-api-log-event") {
       var obj = aSubject.wrappedJSObject;
-      ok(!obj.chromeContext, "Thils is not a chrome context");
       if (order + 1 == parseInt(obj.arguments[0])) {
         ok(true, "Message received: " + obj.arguments[0]);
         order++;

diff --git a/dom/console/tests/test_devtools_pref.html b/dom/console/tests/test_devtools_pref.html
@@ -15,7 +15,6 @@
     let observer = {
       observe: function listener(aSubject, aTopic, aData) {
         var obj = aSubject.wrappedJSObject;
-        ok(!obj.chromeContext, "This is not a chrome context");
         messages.push(parseInt(obj.arguments[0]));
         if (messages.length == expected) {
           SpecialPowers.removeObserver(observer, "console-api-log-event");

diff --git a/dom/console/tests/test_jsm.xul b/dom/console/tests/test_jsm.xul
@@ -34,8 +34,6 @@ consoleListener.prototype  = {
   observe: function(aSubject, aTopic, aData) {
     if (aTopic == "console-api-log-event") {
       var obj = aSubject.wrappedJSObject;
-      ok(obj.chromeContext, "JSM is always a chrome context");
-
       if (obj.innerID == JSM) {
         is(obj.ID, "jsm", "ID and InnerID are correctly set.");
         is(obj.arguments[0], "Hello world!", "Message matches");

diff --git a/dom/indexedDB/ReportInternalError.cpp b/dom/indexedDB/ReportInternalError.cpp
@@ -26,8 +26,7 @@ void ReportInternalError(const char* aFile, uint32_t aLine, const char* aStr) {
   nsContentUtils::LogSimpleConsoleError(
       NS_ConvertUTF8toUTF16(
           nsPrintfCString("IndexedDB %s: %s:%" PRIu32, aStr, aFile, aLine)),
-      "indexedDB", false /* no IDB in private window */,
-      true /* Internal errors are chrome context only */);
+      "indexedDB", false /* no IDB in private window */);
 }
 
 }  // namespace indexedDB

diff --git a/dom/indexedDB/ScriptErrorHelper.cpp b/dom/indexedDB/ScriptErrorHelper.cpp
@@ -111,8 +111,7 @@ class ScriptErrorRunnable final : public mozilla::Runnable {
           aMessage, aFilename,
           /* aSourceLine */ EmptyString(), aLineNumber, aColumnNumber,
           aSeverityFlag, category.get(),
-          /* IDB doesn't run on Private browsing mode */ false,
-          /* from chrome context */ aIsChrome));
+          /* IDB doesn't run on Private browsing mode */ false));
     }
 
     MOZ_ALWAYS_SUCCEEDS(consoleService->LogMessage(scriptError));