Backed out changeset 056265a8a2ff (bug 1431105) for devtools failures on browser_webconsole_check_stubs_console_api.js. on a CLOSED TREE

dom/console/Console.cpp

@@ -1537,7 +1537,6 @@ Console::PopulateConsoleNotificationInTheTargetScope(JSContext* aCx,
   event.mConsoleID = mConsoleID;
   event.mLevel = aData->mMethodString;
   event.mFilename = frame.mFilename;
-  event.mPrefix = mPrefix;
 
   nsCOMPtr<nsIURI> filenameURI;
   nsAutoCString pass;
@@ -2603,8 +2602,8 @@ Console::MaybeExecuteDumpFunction(JSContext* aCx,
   message.Append(aMethodName);
   message.AppendLiteral(": ");
 
-  if (!mPrefix.IsEmpty()) {
-    message.Append(mPrefix);
+  if (!mDumpPrefix.IsEmpty()) {
+    message.Append(mDumpPrefix);
     message.AppendLiteral(": ");
   }
 
@@ -2641,8 +2640,8 @@ Console::MaybeExecuteDumpFunctionForTrace(JSContext* aCx, nsIStackFrame* aStack)
   nsAutoString message;
   message.AssignLiteral("console.trace:\n");
 
-  if (!mPrefix.IsEmpty()) {
-    message.Append(mPrefix);
+  if (!mDumpPrefix.IsEmpty()) {
+    message.Append(mDumpPrefix);
     message.AppendLiteral(": ");
   }
 

dom/console/Console.h

@@ -444,7 +444,7 @@ private:
   nsString mPassedInnerID;
   RefPtr<ConsoleInstanceDumpCallback> mDumpFunction;
   bool mDumpToStdout;
-  nsString mPrefix;
+  nsString mDumpPrefix;
   bool mChromeInstance;
   ConsoleLogLevel mMaxLogLevel;
 

dom/console/ConsoleInstance.cpp

@@ -79,7 +79,7 @@ ConsoleInstance::ConsoleInstance(const ConsoleInstanceOptions& aOptions)
     mConsole->mDumpToStdout = true;
   }
 
-  mConsole->mPrefix = aOptions.mPrefix;
+  mConsole->mDumpPrefix = aOptions.mPrefix;
 
   // Let's inform that this is a custom instance.
   mConsole->mChromeInstance = true;

dom/console/tests/test_jsm.xul

@@ -38,7 +38,6 @@ consoleListener.prototype  = {
         is(obj.ID, "jsm", "ID and InnerID are correctly set.");
         is(obj.arguments[0], "Hello world!", "Message matches");
         is(obj.consoleID, "", "No consoleID for console API");
-        is(obj.prefix, "", "prefix is empty by default");
 
         // We want to see 2 messages from this innerID, the first is generated
         // by console.log, the second one from createInstance().log();
@@ -47,13 +46,11 @@ consoleListener.prototype  = {
         is(obj.ID, "jsm", "ID and InnerID are correctly set.");
         is(obj.arguments[0], "Hello world!", "Message matches");
         is(obj.consoleID, "wow", "consoleID is set by consoleInstance");
-        is(obj.prefix, "_PREFIX_", "prefix is set by consoleInstance");
         ++this.count;
       } else if (obj.innerID == "LEVEL") {
         // Nothing special... just we don't want to see 'invisible' messages.
         is(obj.ID, "jsm", "ID and InnerID are correctly set.");
         is(obj.arguments[0], "Hello world!", "Message matches");
-        is(obj.prefix, "", "prefix is empty by default");
         ++this.count;
       }
 

dom/webidl/Console.webidl

@@ -78,7 +78,6 @@ dictionary ConsoleEvent {
   DOMString groupName = "";
   any timer = null;
   any counter = null;
-  DOMString prefix = "";
 };
 
 // Event for profile operations