Commit 54713093 authored by Carsten "Tomcat" Book's avatar Carsten "Tomcat" Book
Browse files

Backed out 14 changesets (bug 1165515) for linux x64 e10s m2 test failures 

Backed out changeset d68dcf2ef372 (bug 1165515)
Backed out changeset 7c3b45a47811 (bug 1165515)
Backed out changeset b668b617bef2 (bug 1165515)
Backed out changeset d0916e1283a2 (bug 1165515)
Backed out changeset ac4dc7489942 (bug 1165515)
Backed out changeset e9632ce8bc65 (bug 1165515)
Backed out changeset c16d215cc7e4 (bug 1165515)
Backed out changeset e4d474f3c51a (bug 1165515)
Backed out changeset d87680bf9f7c (bug 1165515)
Backed out changeset b3c0a45ba99e (bug 1165515)
Backed out changeset 9370fa197674 (bug 1165515)
Backed out changeset 50970d668ca1 (bug 1165515)
Backed out changeset ffa4eb6d24b9 (bug 1165515)
Backed out changeset 5fcf1203cc1d (bug 1165515)

--HG--
extra : rebase_source : 6fb850d063cbabe738f97f0380302153e3eae97a
parent 63671bb3

docshell/base/nsDocShell.cpp

+15 −15
Original line number Diff line number Diff line
@@ -926,7 +926,7 @@ nsDocShell::nsDocShell() 
    gDocShellLeakLog = PR_NewLogModule("nsDocShellLeak");

  }

  if (gDocShellLeakLog) {

    MOZ_LOG(gDocShellLeakLog, LogLevel::Debug, ("DOCSHELL %p created\n", this));

    MOZ_LOG(gDocShellLeakLog, PR_LOG_DEBUG, ("DOCSHELL %p created\n", this));

  }



#ifdef DEBUG
@@ -958,7 +958,7 @@ nsDocShell::~nsDocShell() 
  }



  if (gDocShellLeakLog) {

    MOZ_LOG(gDocShellLeakLog, LogLevel::Debug, ("DOCSHELL %p destroyed\n", this));

    MOZ_LOG(gDocShellLeakLog, PR_LOG_DEBUG, ("DOCSHELL %p destroyed\n", this));

  }



#ifdef DEBUG
@@ -1095,7 +1095,7 @@ nsDocShell::GetInterface(const nsIID& aIID, void** aSink) 
    }



#if defined(DEBUG)

    MOZ_LOG(gDocShellLog, LogLevel::Debug,

    MOZ_LOG(gDocShellLog, PR_LOG_DEBUG,

           ("nsDocShell[%p]: returning app cache container %p",

            this, domDoc.get()));

#endif
@@ -1418,10 +1418,10 @@ nsDocShell::LoadURI(nsIURI* aURI, 
  }



#if defined(DEBUG)

  if (MOZ_LOG_TEST(gDocShellLog, LogLevel::Debug)) {

  if (PR_LOG_TEST(gDocShellLog, PR_LOG_DEBUG)) {

    nsAutoCString uristr;

    aURI->GetAsciiSpec(uristr);

    MOZ_LOG(gDocShellLog, LogLevel::Debug,

    MOZ_LOG(gDocShellLog, PR_LOG_DEBUG,

           ("nsDocShell[%p]: loading %s with flags 0x%08x",

            this, uristr.get(), aLoadFlags));

  }
@@ -1540,7 +1540,7 @@ nsDocShell::LoadURI(nsIURI* aURI, 


  if (shEntry) {

#ifdef DEBUG

    MOZ_LOG(gDocShellLog, LogLevel::Debug,

    MOZ_LOG(gDocShellLog, PR_LOG_DEBUG,

           ("nsDocShell[%p]: loading from session history", this));

#endif
@@ -1980,7 +1980,7 @@ bool 
nsDocShell::SetCurrentURI(nsIURI* aURI, nsIRequest* aRequest,

                          bool aFireOnLocationChange, uint32_t aLocationFlags)

{

  if (gDocShellLeakLog && MOZ_LOG_TEST(gDocShellLeakLog, LogLevel::Debug)) {

  if (gDocShellLeakLog && PR_LOG_TEST(gDocShellLeakLog, PR_LOG_DEBUG)) {

    nsAutoCString spec;

    if (aURI) {

      aURI->GetSpec(spec);
@@ -5302,7 +5302,7 @@ nsDocShell::LoadErrorPage(nsIURI* aURI, const char16_t* aURL, 
                          nsIChannel* aFailedChannel)

{

#if defined(DEBUG)

  if (MOZ_LOG_TEST(gDocShellLog, LogLevel::Debug)) {

  if (PR_LOG_TEST(gDocShellLog, PR_LOG_DEBUG)) {

    nsAutoCString spec;

    aURI->GetSpec(spec);
@@ -5313,7 +5313,7 @@ nsDocShell::LoadErrorPage(nsIURI* aURI, const char16_t* aURL, 
      chanName.AssignLiteral("<no channel>");

    }



    MOZ_LOG(gDocShellLog, LogLevel::Debug,

    MOZ_LOG(gDocShellLog, PR_LOG_DEBUG,

           ("nsDocShell[%p]::LoadErrorPage(\"%s\", \"%s\", {...}, [%s])\n", this,

            spec.get(), NS_ConvertUTF16toUTF8(aURL).get(), chanName.get()));

  }
@@ -9606,7 +9606,7 @@ nsDocShell::InternalLoad(nsIURI* aURI, 
  nsresult rv = NS_OK;

  mOriginalUriString.Truncate();



  if (gDocShellLeakLog && MOZ_LOG_TEST(gDocShellLeakLog, LogLevel::Debug)) {

  if (gDocShellLeakLog && PR_LOG_TEST(gDocShellLeakLog, PR_LOG_DEBUG)) {

    nsAutoCString spec;

    if (aURI) {

      aURI->GetSpec(spec);
@@ -11165,7 +11165,7 @@ nsDocShell::OnNewURI(nsIURI* aURI, nsIChannel* aChannel, nsISupports* aOwner, 
  NS_PRECONDITION(!aChannel || !aOwner, "Shouldn't have both set");



#if defined(DEBUG)

  if (MOZ_LOG_TEST(gDocShellLog, LogLevel::Debug)) {

  if (PR_LOG_TEST(gDocShellLog, PR_LOG_DEBUG)) {

    nsAutoCString spec;

    aURI->GetSpec(spec);
@@ -11176,7 +11176,7 @@ nsDocShell::OnNewURI(nsIURI* aURI, nsIChannel* aChannel, nsISupports* aOwner, 
      chanName.AssignLiteral("<no channel>");

    }



    MOZ_LOG(gDocShellLog, LogLevel::Debug,

    MOZ_LOG(gDocShellLog, PR_LOG_DEBUG,

           ("nsDocShell[%p]::OnNewURI(\"%s\", [%s], 0x%x)\n", this, spec.get(),

            chanName.get(), aLoadType));

  }
@@ -11241,7 +11241,7 @@ nsDocShell::OnNewURI(nsIURI* aURI, nsIChannel* aChannel, nsISupports* aOwner, 
  // XXX This log message is almost useless because |updateSHistory|

  //     and |updateGHistory| are not correct at this point.



  MOZ_LOG(gDocShellLog, LogLevel::Debug,

  MOZ_LOG(gDocShellLog, PR_LOG_DEBUG,

         ("  shAvailable=%i updateSHistory=%i updateGHistory=%i"

          " equalURI=%i\n",

          shAvailable, updateSHistory, updateGHistory, equalUri));
@@ -11785,7 +11785,7 @@ nsDocShell::AddToSessionHistory(nsIURI* aURI, nsIChannel* aChannel, 
  NS_PRECONDITION(!aChannel || !aOwner, "Shouldn't have both set");



#if defined(DEBUG)

  if (MOZ_LOG_TEST(gDocShellLog, LogLevel::Debug)) {

  if (PR_LOG_TEST(gDocShellLog, PR_LOG_DEBUG)) {

    nsAutoCString spec;

    aURI->GetSpec(spec);
@@ -11796,7 +11796,7 @@ nsDocShell::AddToSessionHistory(nsIURI* aURI, nsIChannel* aChannel, 
      chanName.AssignLiteral("<no channel>");

    }



    MOZ_LOG(gDocShellLog, LogLevel::Debug,

    MOZ_LOG(gDocShellLog, PR_LOG_DEBUG,

           ("nsDocShell[%p]::AddToSessionHistory(\"%s\", [%s])\n",

            this, spec.get(), chanName.get()));

  }

docshell/shistory/nsSHistory.cpp

+3 −3
Original line number Diff line number Diff line
@@ -68,7 +68,7 @@ GetSHistoryLog() 
  }

  return sLog;

}

#define LOG(format) MOZ_LOG(GetSHistoryLog(), mozilla::LogLevel::Debug, format)

#define LOG(format) MOZ_LOG(GetSHistoryLog(), PR_LOG_DEBUG, format)



// This macro makes it easier to print a log message which includes a URI's

// spec.  Example use:
@@ -78,7 +78,7 @@ GetSHistoryLog() 
//

#define LOG_SPEC(format, uri)                              \

  PR_BEGIN_MACRO                                           \

    if (MOZ_LOG_TEST(GetSHistoryLog(), LogLevel::Debug)) {     \

    if (PR_LOG_TEST(GetSHistoryLog(), PR_LOG_DEBUG)) {     \

      nsAutoCString _specStr(NS_LITERAL_CSTRING("(null)"));\

      if (uri) {                                           \

        uri->GetSpec(_specStr);                            \
@@ -96,7 +96,7 @@ GetSHistoryLog() 
//

#define LOG_SHENTRY_SPEC(format, shentry)                  \

  PR_BEGIN_MACRO                                           \

    if (MOZ_LOG_TEST(GetSHistoryLog(), LogLevel::Debug)) {     \

    if (PR_LOG_TEST(GetSHistoryLog(), PR_LOG_DEBUG)) {     \

      nsCOMPtr<nsIURI> uri;                                \

      shentry->GetURI(getter_AddRefs(uri));                \

      LOG_SPEC(format, uri);                               \

dom/base/ThirdPartyUtil.cpp

+1 −1
Original line number Diff line number Diff line
@@ -23,7 +23,7 @@ NS_IMPL_ISUPPORTS(ThirdPartyUtil, mozIThirdPartyUtil) 
//

static PRLogModuleInfo *gThirdPartyLog;

#undef LOG

#define LOG(args)     MOZ_LOG(gThirdPartyLog, mozilla::LogLevel::Debug, args)

#define LOG(args)     MOZ_LOG(gThirdPartyLog, PR_LOG_DEBUG, args)



nsresult

ThirdPartyUtil::Init()

dom/base/nsContentPolicy.cpp

+2 −2
Original line number Diff line number Diff line
@@ -188,7 +188,7 @@ nsContentPolicy::CheckPolicy(CPMethod policyMethod, 
#define LOG_CHECK(logType)                                                    \

  PR_BEGIN_MACRO                                                              \

    /* skip all this nonsense if the call failed or logging is disabled */    \

    if (NS_SUCCEEDED(rv) && MOZ_LOG_TEST(gConPolLog, LogLevel::Debug)) {          \

    if (NS_SUCCEEDED(rv) && PR_LOG_TEST(gConPolLog, PR_LOG_DEBUG)) {          \

      const char *resultName;                                                 \

      if (decision) {                                                         \

        resultName = NS_CP_ResponseName(*decision);                           \
@@ -203,7 +203,7 @@ nsContentPolicy::CheckPolicy(CPMethod policyMethod, 
      if (requestingLocation) {                                               \

          requestingLocation->GetSpec(refSpec);                               \

      }                                                                       \

      MOZ_LOG(gConPolLog, LogLevel::Debug,                                        \

      MOZ_LOG(gConPolLog, PR_LOG_DEBUG,                                        \

             ("Content Policy: " logType ": <%s> <Ref:%s> result=%s",         \

              spec.get(), refSpec.get(), resultName)                          \

             );                                                               \

dom/base/nsDOMDataChannel.cpp

+1 −1
Original line number Diff line number Diff line
@@ -11,7 +11,7 @@ 


extern PRLogModuleInfo* GetDataChannelLog();

#undef LOG

#define LOG(args) MOZ_LOG(GetDataChannelLog(), mozilla::LogLevel::Debug, args)

#define LOG(args) MOZ_LOG(GetDataChannelLog(), PR_LOG_DEBUG, args)





#include "nsDOMDataChannelDeclarations.h"