Bug 1165515 - Part 3: Convert PR_LOG_TEST to MOZ_LOG_TEST. r=froydnj (f50b8139) · Commits · The Tor Project / Applications / Tor Browser

docshell/base/nsDocShell.cpp

+6 −6

Original line number	Original line	Diff line number	Diff line
	@@ -1418,7 +1418,7 @@ nsDocShell::LoadURI(nsIURI* aURI,
	}		}

	#if defined(DEBUG)		#if defined(DEBUG)
	if (PR_LOG_TEST(gDocShellLog, PR_LOG_DEBUG)) {		if (MOZ_LOG_TEST(gDocShellLog, PR_LOG_DEBUG)) {
	nsAutoCString uristr;		nsAutoCString uristr;
	aURI->GetAsciiSpec(uristr);		aURI->GetAsciiSpec(uristr);
	MOZ_LOG(gDocShellLog, PR_LOG_DEBUG,		MOZ_LOG(gDocShellLog, PR_LOG_DEBUG,
	@@ -1980,7 +1980,7 @@ bool
	nsDocShell::SetCurrentURI(nsIURI* aURI, nsIRequest* aRequest,		nsDocShell::SetCurrentURI(nsIURI* aURI, nsIRequest* aRequest,
	bool aFireOnLocationChange, uint32_t aLocationFlags)		bool aFireOnLocationChange, uint32_t aLocationFlags)
	{		{
	if (gDocShellLeakLog && PR_LOG_TEST(gDocShellLeakLog, PR_LOG_DEBUG)) {		if (gDocShellLeakLog && MOZ_LOG_TEST(gDocShellLeakLog, PR_LOG_DEBUG)) {
	nsAutoCString spec;		nsAutoCString spec;
	if (aURI) {		if (aURI) {
	aURI->GetSpec(spec);		aURI->GetSpec(spec);
	@@ -5303,7 +5303,7 @@ nsDocShell::LoadErrorPage(nsIURI* aURI, const char16_t* aURL,
	nsIChannel* aFailedChannel)		nsIChannel* aFailedChannel)
	{		{
	#if defined(DEBUG)		#if defined(DEBUG)
	if (PR_LOG_TEST(gDocShellLog, PR_LOG_DEBUG)) {		if (MOZ_LOG_TEST(gDocShellLog, PR_LOG_DEBUG)) {
	nsAutoCString spec;		nsAutoCString spec;
	aURI->GetSpec(spec);		aURI->GetSpec(spec);

	@@ -9605,7 +9605,7 @@ nsDocShell::InternalLoad(nsIURI* aURI,
	nsresult rv = NS_OK;		nsresult rv = NS_OK;
	mOriginalUriString.Truncate();		mOriginalUriString.Truncate();

	if (gDocShellLeakLog && PR_LOG_TEST(gDocShellLeakLog, PR_LOG_DEBUG)) {		if (gDocShellLeakLog && MOZ_LOG_TEST(gDocShellLeakLog, PR_LOG_DEBUG)) {
	nsAutoCString spec;		nsAutoCString spec;
	if (aURI) {		if (aURI) {
	aURI->GetSpec(spec);		aURI->GetSpec(spec);
	@@ -11157,7 +11157,7 @@ nsDocShell::OnNewURI(nsIURI* aURI, nsIChannel* aChannel, nsISupports* aOwner,
	NS_PRECONDITION(!aChannel \|\| !aOwner, "Shouldn't have both set");		NS_PRECONDITION(!aChannel \|\| !aOwner, "Shouldn't have both set");

	#if defined(DEBUG)		#if defined(DEBUG)
	if (PR_LOG_TEST(gDocShellLog, PR_LOG_DEBUG)) {		if (MOZ_LOG_TEST(gDocShellLog, PR_LOG_DEBUG)) {
	nsAutoCString spec;		nsAutoCString spec;
	aURI->GetSpec(spec);		aURI->GetSpec(spec);

	@@ -11777,7 +11777,7 @@ nsDocShell::AddToSessionHistory(nsIURI* aURI, nsIChannel* aChannel,
	NS_PRECONDITION(!aChannel \|\| !aOwner, "Shouldn't have both set");		NS_PRECONDITION(!aChannel \|\| !aOwner, "Shouldn't have both set");

	#if defined(DEBUG)		#if defined(DEBUG)
	if (PR_LOG_TEST(gDocShellLog, PR_LOG_DEBUG)) {		if (MOZ_LOG_TEST(gDocShellLog, PR_LOG_DEBUG)) {
	nsAutoCString spec;		nsAutoCString spec;
	aURI->GetSpec(spec);		aURI->GetSpec(spec);

docshell/shistory/nsSHistory.cpp

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -78,7 +78,7 @@ GetSHistoryLog()
	//		//
	#define LOG_SPEC(format, uri) \		#define LOG_SPEC(format, uri) \
	PR_BEGIN_MACRO \		PR_BEGIN_MACRO \
	if (PR_LOG_TEST(GetSHistoryLog(), PR_LOG_DEBUG)) { \		if (MOZ_LOG_TEST(GetSHistoryLog(), PR_LOG_DEBUG)) { \
	nsAutoCString _specStr(NS_LITERAL_CSTRING("(null)"));\		nsAutoCString _specStr(NS_LITERAL_CSTRING("(null)"));\
	if (uri) { \		if (uri) { \
	uri->GetSpec(_specStr); \		uri->GetSpec(_specStr); \
	@@ -96,7 +96,7 @@ GetSHistoryLog()
	//		//
	#define LOG_SHENTRY_SPEC(format, shentry) \		#define LOG_SHENTRY_SPEC(format, shentry) \
	PR_BEGIN_MACRO \		PR_BEGIN_MACRO \
	if (PR_LOG_TEST(GetSHistoryLog(), PR_LOG_DEBUG)) { \		if (MOZ_LOG_TEST(GetSHistoryLog(), PR_LOG_DEBUG)) { \
	nsCOMPtr<nsIURI> uri; \		nsCOMPtr<nsIURI> uri; \
	shentry->GetURI(getter_AddRefs(uri)); \		shentry->GetURI(getter_AddRefs(uri)); \
	LOG_SPEC(format, uri); \		LOG_SPEC(format, uri); \

dom/base/nsContentPolicy.cpp

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -188,7 +188,7 @@ nsContentPolicy::CheckPolicy(CPMethod policyMethod,
	#define LOG_CHECK(logType) \		#define LOG_CHECK(logType) \
	PR_BEGIN_MACRO \		PR_BEGIN_MACRO \
	/* skip all this nonsense if the call failed or logging is disabled */ \		/* skip all this nonsense if the call failed or logging is disabled */ \
	if (NS_SUCCEEDED(rv) && PR_LOG_TEST(gConPolLog, PR_LOG_DEBUG)) { \		if (NS_SUCCEEDED(rv) && MOZ_LOG_TEST(gConPolLog, PR_LOG_DEBUG)) { \
	const char *resultName; \		const char *resultName; \
	if (decision) { \		if (decision) { \
	resultName = NS_CP_ResponseName(*decision); \		resultName = NS_CP_ResponseName(*decision); \

dom/base/nsDocument.cpp

+3 −3

Original line number	Original line	Diff line number	Diff line
	@@ -2305,7 +2305,7 @@ nsDocument::ResetToURI(nsIURI aURI, nsILoadGroup aLoadGroup,
	{		{
	NS_PRECONDITION(aURI, "Null URI passed to ResetToURI");		NS_PRECONDITION(aURI, "Null URI passed to ResetToURI");

	if (gDocumentLeakPRLog && PR_LOG_TEST(gDocumentLeakPRLog, PR_LOG_DEBUG)) {		if (gDocumentLeakPRLog && MOZ_LOG_TEST(gDocumentLeakPRLog, PR_LOG_DEBUG)) {
	nsAutoCString spec;		nsAutoCString spec;
	aURI->GetSpec(spec);		aURI->GetSpec(spec);
	PR_LogPrint("DOCUMENT %p ResetToURI %s", this, spec.get());		PR_LogPrint("DOCUMENT %p ResetToURI %s", this, spec.get());
	@@ -2638,7 +2638,7 @@ nsDocument::StartDocumentLoad(const char* aCommand, nsIChannel* aChannel,
	nsIStreamListener **aDocListener,		nsIStreamListener **aDocListener,
	bool aReset, nsIContentSink* aSink)		bool aReset, nsIContentSink* aSink)
	{		{
	if (gDocumentLeakPRLog && PR_LOG_TEST(gDocumentLeakPRLog, PR_LOG_DEBUG)) {		if (gDocumentLeakPRLog && MOZ_LOG_TEST(gDocumentLeakPRLog, PR_LOG_DEBUG)) {
	nsCOMPtr<nsIURI> uri;		nsCOMPtr<nsIURI> uri;
	aChannel->GetURI(getter_AddRefs(uri));		aChannel->GetURI(getter_AddRefs(uri));
	nsAutoCString spec;		nsAutoCString spec;
	@@ -2866,7 +2866,7 @@ nsDocument::InitCSP(nsIChannel* aChannel)
	!applyLoopCSP &&		!applyLoopCSP &&
	cspHeaderValue.IsEmpty() &&		cspHeaderValue.IsEmpty() &&
	cspROHeaderValue.IsEmpty()) {		cspROHeaderValue.IsEmpty()) {
	if (PR_LOG_TEST(gCspPRLog, PR_LOG_DEBUG)) {		if (MOZ_LOG_TEST(gCspPRLog, PR_LOG_DEBUG)) {
	nsCOMPtr<nsIURI> chanURI;		nsCOMPtr<nsIURI> chanURI;
	aChannel->GetURI(getter_AddRefs(chanURI));		aChannel->GetURI(getter_AddRefs(chanURI));
	nsAutoCString aspec;		nsAutoCString aspec;

dom/base/nsFocusManager.cpp

+7 −7

Original line number	Original line	Diff line number	Diff line
	@@ -81,7 +81,7 @@ PRLogModuleInfo* gFocusNavigationLog;
	#define LOGFOCUSNAVIGATION(args) MOZ_LOG(gFocusNavigationLog, PR_LOG_DEBUG, args)		#define LOGFOCUSNAVIGATION(args) MOZ_LOG(gFocusNavigationLog, PR_LOG_DEBUG, args)

	#define LOGTAG(log, format, content) \		#define LOGTAG(log, format, content) \
	if (PR_LOG_TEST(log, PR_LOG_DEBUG)) { \		if (MOZ_LOG_TEST(log, PR_LOG_DEBUG)) { \
	nsAutoCString tag(NS_LITERAL_CSTRING("(none)")); \		nsAutoCString tag(NS_LITERAL_CSTRING("(none)")); \
	if (content) { \		if (content) { \
	content->NodeInfo()->NameAtom()->ToUTF8String(tag); \		content->NodeInfo()->NameAtom()->ToUTF8String(tag); \
	@@ -482,7 +482,7 @@ nsFocusManager::MoveFocus(nsIDOMWindow* aWindow, nsIDOMElement* aStartElement,

	LOGFOCUS(("<<MoveFocus begin Type: %d Flags: %x>>", aType, aFlags));		LOGFOCUS(("<<MoveFocus begin Type: %d Flags: %x>>", aType, aFlags));

	if (PR_LOG_TEST(gFocusLog, PR_LOG_DEBUG) && mFocusedWindow) {		if (MOZ_LOG_TEST(gFocusLog, PR_LOG_DEBUG) && mFocusedWindow) {
	nsIDocument* doc = mFocusedWindow->GetExtantDoc();		nsIDocument* doc = mFocusedWindow->GetExtantDoc();
	if (doc && doc->GetDocumentURI()) {		if (doc && doc->GetDocumentURI()) {
	nsAutoCString spec;		nsAutoCString spec;
	@@ -638,7 +638,7 @@ nsFocusManager::WindowRaised(nsIDOMWindow* aWindow)
	nsCOMPtr<nsPIDOMWindow> window = do_QueryInterface(aWindow);		nsCOMPtr<nsPIDOMWindow> window = do_QueryInterface(aWindow);
	NS_ENSURE_TRUE(window && window->IsOuterWindow(), NS_ERROR_INVALID_ARG);		NS_ENSURE_TRUE(window && window->IsOuterWindow(), NS_ERROR_INVALID_ARG);

	if (PR_LOG_TEST(gFocusLog, PR_LOG_DEBUG)) {		if (MOZ_LOG_TEST(gFocusLog, PR_LOG_DEBUG)) {
	LOGFOCUS(("Window %p Raised [Currently: %p %p]", aWindow, mActiveWindow.get(), mFocusedWindow.get()));		LOGFOCUS(("Window %p Raised [Currently: %p %p]", aWindow, mActiveWindow.get(), mFocusedWindow.get()));
	nsAutoCString spec;		nsAutoCString spec;
	nsIDocument* doc = window->GetExtantDoc();		nsIDocument* doc = window->GetExtantDoc();
	@@ -734,7 +734,7 @@ nsFocusManager::WindowLowered(nsIDOMWindow* aWindow)
	nsCOMPtr<nsPIDOMWindow> window = do_QueryInterface(aWindow);		nsCOMPtr<nsPIDOMWindow> window = do_QueryInterface(aWindow);
	NS_ENSURE_TRUE(window && window->IsOuterWindow(), NS_ERROR_INVALID_ARG);		NS_ENSURE_TRUE(window && window->IsOuterWindow(), NS_ERROR_INVALID_ARG);

	if (PR_LOG_TEST(gFocusLog, PR_LOG_DEBUG)) {		if (MOZ_LOG_TEST(gFocusLog, PR_LOG_DEBUG)) {
	LOGFOCUS(("Window %p Lowered [Currently: %p %p]", aWindow, mActiveWindow.get(), mFocusedWindow.get()));		LOGFOCUS(("Window %p Lowered [Currently: %p %p]", aWindow, mActiveWindow.get(), mFocusedWindow.get()));
	nsAutoCString spec;		nsAutoCString spec;
	nsIDocument* doc = window->GetExtantDoc();		nsIDocument* doc = window->GetExtantDoc();
	@@ -852,7 +852,7 @@ nsFocusManager::WindowShown(nsIDOMWindow* aWindow, bool aNeedsFocus)

	window = window->GetOuterWindow();		window = window->GetOuterWindow();

	if (PR_LOG_TEST(gFocusLog, PR_LOG_DEBUG)) {		if (MOZ_LOG_TEST(gFocusLog, PR_LOG_DEBUG)) {
	LOGFOCUS(("Window %p Shown [Currently: %p %p]", window.get(), mActiveWindow.get(), mFocusedWindow.get()));		LOGFOCUS(("Window %p Shown [Currently: %p %p]", window.get(), mActiveWindow.get(), mFocusedWindow.get()));
	nsAutoCString spec;		nsAutoCString spec;
	nsIDocument* doc = window->GetExtantDoc();		nsIDocument* doc = window->GetExtantDoc();
	@@ -907,7 +907,7 @@ nsFocusManager::WindowHidden(nsIDOMWindow* aWindow)

	window = window->GetOuterWindow();		window = window->GetOuterWindow();

	if (PR_LOG_TEST(gFocusLog, PR_LOG_DEBUG)) {		if (MOZ_LOG_TEST(gFocusLog, PR_LOG_DEBUG)) {
	LOGFOCUS(("Window %p Hidden [Currently: %p %p]", window.get(), mActiveWindow.get(), mFocusedWindow.get()));		LOGFOCUS(("Window %p Hidden [Currently: %p %p]", window.get(), mActiveWindow.get(), mFocusedWindow.get()));
	nsAutoCString spec;		nsAutoCString spec;
	nsIDocument* doc = window->GetExtantDoc();		nsIDocument* doc = window->GetExtantDoc();
	@@ -1777,7 +1777,7 @@ nsFocusManager::Focus(nsPIDOMWindow* aWindow,

	LOGCONTENT("Element %s has been focused", aContent);		LOGCONTENT("Element %s has been focused", aContent);

	if (PR_LOG_TEST(gFocusLog, PR_LOG_DEBUG)) {		if (MOZ_LOG_TEST(gFocusLog, PR_LOG_DEBUG)) {
	nsIDocument* docm = aWindow->GetExtantDoc();		nsIDocument* docm = aWindow->GetExtantDoc();
	if (docm) {		if (docm) {
	LOGCONTENT(" from %s", docm->GetRootElement());		LOGCONTENT(" from %s", docm->GetRootElement());