Commit 3925a960 authored by Eric Rahm's avatar Eric Rahm
Browse files

Bug 1165515 - Part 1: Convert PR_LOG to MOZ_LOG. r=froydnj

parent 4b7110fb

docshell/base/nsDocShell.cpp

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

  }

  if (gDocShellLeakLog) {

    PR_LOG(gDocShellLeakLog, PR_LOG_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) {

    PR_LOG(gDocShellLeakLog, PR_LOG_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)

    PR_LOG(gDocShellLog, PR_LOG_DEBUG,

    MOZ_LOG(gDocShellLog, PR_LOG_DEBUG,

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

            this, domDoc.get()));

#endif
@@ -1421,7 +1421,7 @@ nsDocShell::LoadURI(nsIURI* aURI, 
  if (PR_LOG_TEST(gDocShellLog, PR_LOG_DEBUG)) {

    nsAutoCString uristr;

    aURI->GetAsciiSpec(uristr);

    PR_LOG(gDocShellLog, PR_LOG_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

    PR_LOG(gDocShellLog, PR_LOG_DEBUG,

    MOZ_LOG(gDocShellLog, PR_LOG_DEBUG,

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

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

    }



    PR_LOG(gDocShellLog, PR_LOG_DEBUG,

    MOZ_LOG(gDocShellLog, PR_LOG_DEBUG,

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

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

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

    }



    PR_LOG(gDocShellLog, PR_LOG_DEBUG,

    MOZ_LOG(gDocShellLog, PR_LOG_DEBUG,

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

            chanName.get(), aLoadType));

  }
@@ -11229,7 +11229,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.



  PR_LOG(gDocShellLog, PR_LOG_DEBUG,

  MOZ_LOG(gDocShellLog, PR_LOG_DEBUG,

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

          " equalURI=%i\n",

          shAvailable, updateSHistory, updateGHistory, equalUri));
@@ -11784,7 +11784,7 @@ nsDocShell::AddToSessionHistory(nsIURI* aURI, nsIChannel* aChannel, 
      chanName.AssignLiteral("<no channel>");

    }



    PR_LOG(gDocShellLog, PR_LOG_DEBUG,

    MOZ_LOG(gDocShellLog, PR_LOG_DEBUG,

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

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

  }

docshell/shistory/nsSHistory.cpp

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

  return sLog;

}

#define LOG(format) PR_LOG(GetSHistoryLog(), PR_LOG_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:

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)     PR_LOG(gThirdPartyLog, PR_LOG_DEBUG, args)

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



nsresult

ThirdPartyUtil::Init()

dom/base/nsContentPolicy.cpp

+1 −1
Original line number Diff line number Diff line
@@ -203,7 +203,7 @@ nsContentPolicy::CheckPolicy(CPMethod policyMethod, 
      if (requestingLocation) {                                               \

          requestingLocation->GetSpec(refSpec);                               \

      }                                                                       \

      PR_LOG(gConPolLog, PR_LOG_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) PR_LOG(GetDataChannelLog(), PR_LOG_DEBUG, args)

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





#include "nsDOMDataChannelDeclarations.h"