Skip to content

Commit a9afd68

Browse files
EricRahmEricRahm
committed
Bug 1165515 - Part 13-2: Replace usage of PRLogModuleLevel and PR_LOG_*. rs=froydnj
This is straightforward mapping of PR_LOG levels to their LogLevel counterparts: PR_LOG_ERROR -> LogLevel::Error PR_LOG_WARNING -> LogLevel::Warning PR_LOG_WARN -> LogLevel::Warning PR_LOG_INFO -> LogLevel::Info PR_LOG_DEBUG -> LogLevel::Debug PR_LOG_NOTICE -> LogLevel::Debug PR_LOG_VERBOSE -> LogLevel::Verbose Instances of PRLogModuleLevel were mapped to a fully qualified mozilla::LogLevel, instances of PR_LOG levels in #defines were mapped to a fully qualified mozilla::LogLevel::* level, and all other instances were mapped to us a shorter format of LogLevel::*. Bustage for usage of the non-fully qualified LogLevel were fixed by adding |using mozilla::LogLevel;| where appropriate.
1 parent 9bc7937 commit a9afd68

File tree

368 files changed

+2511
-2477
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

368 files changed

+2511
-2477
lines changed

‎docshell/base/nsDocShell.cpp

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -926,7 +926,7 @@ nsDocShell::nsDocShell()
926926
gDocShellLeakLog = PR_NewLogModule("nsDocShellLeak");
927927
}
928928
if (gDocShellLeakLog) {
929-
MOZ_LOG(gDocShellLeakLog, PR_LOG_DEBUG, ("DOCSHELL %p created\n", this));
929+
MOZ_LOG(gDocShellLeakLog, LogLevel::Debug, ("DOCSHELL %p created\n", this));
930930
}
931931

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

960960
if (gDocShellLeakLog) {
961-
MOZ_LOG(gDocShellLeakLog, PR_LOG_DEBUG, ("DOCSHELL %p destroyed\n", this));
961+
MOZ_LOG(gDocShellLeakLog, LogLevel::Debug, ("DOCSHELL %p destroyed\n", this));
962962
}
963963

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

10971097
#if defined(DEBUG)
1098-
MOZ_LOG(gDocShellLog, PR_LOG_DEBUG,
1098+
MOZ_LOG(gDocShellLog, LogLevel::Debug,
10991099
("nsDocShell[%p]: returning app cache container %p",
11001100
this, domDoc.get()));
11011101
#endif
@@ -1418,10 +1418,10 @@ nsDocShell::LoadURI(nsIURI* aURI,
14181418
}
14191419

14201420
#if defined(DEBUG)
1421-
if (MOZ_LOG_TEST(gDocShellLog, PR_LOG_DEBUG)) {
1421+
if (MOZ_LOG_TEST(gDocShellLog, LogLevel::Debug)) {
14221422
nsAutoCString uristr;
14231423
aURI->GetAsciiSpec(uristr);
1424-
MOZ_LOG(gDocShellLog, PR_LOG_DEBUG,
1424+
MOZ_LOG(gDocShellLog, LogLevel::Debug,
14251425
("nsDocShell[%p]: loading %s with flags 0x%08x",
14261426
this, uristr.get(), aLoadFlags));
14271427
}
@@ -1540,7 +1540,7 @@ nsDocShell::LoadURI(nsIURI* aURI,
15401540

15411541
if (shEntry) {
15421542
#ifdef DEBUG
1543-
MOZ_LOG(gDocShellLog, PR_LOG_DEBUG,
1543+
MOZ_LOG(gDocShellLog, LogLevel::Debug,
15441544
("nsDocShell[%p]: loading from session history", this));
15451545
#endif
15461546

@@ -1980,7 +1980,7 @@ bool
19801980
nsDocShell::SetCurrentURI(nsIURI* aURI, nsIRequest* aRequest,
19811981
bool aFireOnLocationChange, uint32_t aLocationFlags)
19821982
{
1983-
if (gDocShellLeakLog && MOZ_LOG_TEST(gDocShellLeakLog, PR_LOG_DEBUG)) {
1983+
if (gDocShellLeakLog && MOZ_LOG_TEST(gDocShellLeakLog, LogLevel::Debug)) {
19841984
nsAutoCString spec;
19851985
if (aURI) {
19861986
aURI->GetSpec(spec);
@@ -5302,7 +5302,7 @@ nsDocShell::LoadErrorPage(nsIURI* aURI, const char16_t* aURL,
53025302
nsIChannel* aFailedChannel)
53035303
{
53045304
#if defined(DEBUG)
5305-
if (MOZ_LOG_TEST(gDocShellLog, PR_LOG_DEBUG)) {
5305+
if (MOZ_LOG_TEST(gDocShellLog, LogLevel::Debug)) {
53065306
nsAutoCString spec;
53075307
aURI->GetSpec(spec);
53085308

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

5316-
MOZ_LOG(gDocShellLog, PR_LOG_DEBUG,
5316+
MOZ_LOG(gDocShellLog, LogLevel::Debug,
53175317
("nsDocShell[%p]::LoadErrorPage(\"%s\", \"%s\", {...}, [%s])\n", this,
53185318
spec.get(), NS_ConvertUTF16toUTF8(aURL).get(), chanName.get()));
53195319
}
@@ -9606,7 +9606,7 @@ nsDocShell::InternalLoad(nsIURI* aURI,
96069606
nsresult rv = NS_OK;
96079607
mOriginalUriString.Truncate();
96089608

9609-
if (gDocShellLeakLog && MOZ_LOG_TEST(gDocShellLeakLog, PR_LOG_DEBUG)) {
9609+
if (gDocShellLeakLog && MOZ_LOG_TEST(gDocShellLeakLog, LogLevel::Debug)) {
96109610
nsAutoCString spec;
96119611
if (aURI) {
96129612
aURI->GetSpec(spec);
@@ -11165,7 +11165,7 @@ nsDocShell::OnNewURI(nsIURI* aURI, nsIChannel* aChannel, nsISupports* aOwner,
1116511165
NS_PRECONDITION(!aChannel || !aOwner, "Shouldn't have both set");
1116611166

1116711167
#if defined(DEBUG)
11168-
if (MOZ_LOG_TEST(gDocShellLog, PR_LOG_DEBUG)) {
11168+
if (MOZ_LOG_TEST(gDocShellLog, LogLevel::Debug)) {
1116911169
nsAutoCString spec;
1117011170
aURI->GetSpec(spec);
1117111171

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

11179-
MOZ_LOG(gDocShellLog, PR_LOG_DEBUG,
11179+
MOZ_LOG(gDocShellLog, LogLevel::Debug,
1118011180
("nsDocShell[%p]::OnNewURI(\"%s\", [%s], 0x%x)\n", this, spec.get(),
1118111181
chanName.get(), aLoadType));
1118211182
}
@@ -11241,7 +11241,7 @@ nsDocShell::OnNewURI(nsIURI* aURI, nsIChannel* aChannel, nsISupports* aOwner,
1124111241
// XXX This log message is almost useless because |updateSHistory|
1124211242
// and |updateGHistory| are not correct at this point.
1124311243

11244-
MOZ_LOG(gDocShellLog, PR_LOG_DEBUG,
11244+
MOZ_LOG(gDocShellLog, LogLevel::Debug,
1124511245
(" shAvailable=%i updateSHistory=%i updateGHistory=%i"
1124611246
" equalURI=%i\n",
1124711247
shAvailable, updateSHistory, updateGHistory, equalUri));
@@ -11785,7 +11785,7 @@ nsDocShell::AddToSessionHistory(nsIURI* aURI, nsIChannel* aChannel,
1178511785
NS_PRECONDITION(!aChannel || !aOwner, "Shouldn't have both set");
1178611786

1178711787
#if defined(DEBUG)
11788-
if (MOZ_LOG_TEST(gDocShellLog, PR_LOG_DEBUG)) {
11788+
if (MOZ_LOG_TEST(gDocShellLog, LogLevel::Debug)) {
1178911789
nsAutoCString spec;
1179011790
aURI->GetSpec(spec);
1179111791

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

11799-
MOZ_LOG(gDocShellLog, PR_LOG_DEBUG,
11799+
MOZ_LOG(gDocShellLog, LogLevel::Debug,
1180011800
("nsDocShell[%p]::AddToSessionHistory(\"%s\", [%s])\n",
1180111801
this, spec.get(), chanName.get()));
1180211802
}

‎docshell/shistory/nsSHistory.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ GetSHistoryLog()
6868
}
6969
return sLog;
7070
}
71-
#define LOG(format) MOZ_LOG(GetSHistoryLog(), PR_LOG_DEBUG, format)
71+
#define LOG(format) MOZ_LOG(GetSHistoryLog(), mozilla::LogLevel::Debug, format)
7272

7373
// This macro makes it easier to print a log message which includes a URI's
7474
// spec. Example use:
@@ -78,7 +78,7 @@ GetSHistoryLog()
7878
//
7979
#define LOG_SPEC(format, uri) \
8080
PR_BEGIN_MACRO \
81-
if (MOZ_LOG_TEST(GetSHistoryLog(), PR_LOG_DEBUG)) { \
81+
if (MOZ_LOG_TEST(GetSHistoryLog(), LogLevel::Debug)) { \
8282
nsAutoCString _specStr(NS_LITERAL_CSTRING("(null)"));\
8383
if (uri) { \
8484
uri->GetSpec(_specStr); \
@@ -96,7 +96,7 @@ GetSHistoryLog()
9696
//
9797
#define LOG_SHENTRY_SPEC(format, shentry) \
9898
PR_BEGIN_MACRO \
99-
if (MOZ_LOG_TEST(GetSHistoryLog(), PR_LOG_DEBUG)) { \
99+
if (MOZ_LOG_TEST(GetSHistoryLog(), LogLevel::Debug)) { \
100100
nsCOMPtr<nsIURI> uri; \
101101
shentry->GetURI(getter_AddRefs(uri)); \
102102
LOG_SPEC(format, uri); \

‎dom/base/ThirdPartyUtil.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ NS_IMPL_ISUPPORTS(ThirdPartyUtil, mozIThirdPartyUtil)
2323
//
2424
static PRLogModuleInfo *gThirdPartyLog;
2525
#undef LOG
26-
#define LOG(args) MOZ_LOG(gThirdPartyLog, PR_LOG_DEBUG, args)
26+
#define LOG(args) MOZ_LOG(gThirdPartyLog, mozilla::LogLevel::Debug, args)
2727

2828
nsresult
2929
ThirdPartyUtil::Init()

‎dom/base/nsContentPolicy.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -188,7 +188,7 @@ nsContentPolicy::CheckPolicy(CPMethod policyMethod,
188188
#define LOG_CHECK(logType) \
189189
PR_BEGIN_MACRO \
190190
/* skip all this nonsense if the call failed or logging is disabled */ \
191-
if (NS_SUCCEEDED(rv) && MOZ_LOG_TEST(gConPolLog, PR_LOG_DEBUG)) { \
191+
if (NS_SUCCEEDED(rv) && MOZ_LOG_TEST(gConPolLog, LogLevel::Debug)) { \
192192
const char *resultName; \
193193
if (decision) { \
194194
resultName = NS_CP_ResponseName(*decision); \
@@ -203,7 +203,7 @@ nsContentPolicy::CheckPolicy(CPMethod policyMethod,
203203
if (requestingLocation) { \
204204
requestingLocation->GetSpec(refSpec); \
205205
} \
206-
MOZ_LOG(gConPolLog, PR_LOG_DEBUG, \
206+
MOZ_LOG(gConPolLog, LogLevel::Debug, \
207207
("Content Policy: " logType ": <%s> <Ref:%s> result=%s", \
208208
spec.get(), refSpec.get(), resultName) \
209209
); \

‎dom/base/nsDOMDataChannel.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111

1212
extern PRLogModuleInfo* GetDataChannelLog();
1313
#undef LOG
14-
#define LOG(args) MOZ_LOG(GetDataChannelLog(), PR_LOG_DEBUG, args)
14+
#define LOG(args) MOZ_LOG(GetDataChannelLog(), mozilla::LogLevel::Debug, args)
1515

1616

1717
#include "nsDOMDataChannelDeclarations.h"

‎dom/base/nsDocument.cpp

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1595,7 +1595,7 @@ nsDocument::nsDocument(const char* aContentType)
15951595
gDocumentLeakPRLog = PR_NewLogModule("DocumentLeak");
15961596

15971597
if (gDocumentLeakPRLog)
1598-
MOZ_LOG(gDocumentLeakPRLog, PR_LOG_DEBUG,
1598+
MOZ_LOG(gDocumentLeakPRLog, LogLevel::Debug,
15991599
("DOCUMENT %p created", this));
16001600

16011601
if (!gCspPRLog)
@@ -1639,7 +1639,7 @@ nsIDocument::~nsIDocument()
16391639
nsDocument::~nsDocument()
16401640
{
16411641
if (gDocumentLeakPRLog)
1642-
MOZ_LOG(gDocumentLeakPRLog, PR_LOG_DEBUG,
1642+
MOZ_LOG(gDocumentLeakPRLog, LogLevel::Debug,
16431643
("DOCUMENT %p destroyed", this));
16441644

16451645
NS_ASSERTION(!mIsShowing, "Destroying a currently-showing document");
@@ -2305,7 +2305,7 @@ nsDocument::ResetToURI(nsIURI *aURI, nsILoadGroup *aLoadGroup,
23052305
{
23062306
NS_PRECONDITION(aURI, "Null URI passed to ResetToURI");
23072307

2308-
if (gDocumentLeakPRLog && MOZ_LOG_TEST(gDocumentLeakPRLog, PR_LOG_DEBUG)) {
2308+
if (gDocumentLeakPRLog && MOZ_LOG_TEST(gDocumentLeakPRLog, LogLevel::Debug)) {
23092309
nsAutoCString spec;
23102310
aURI->GetSpec(spec);
23112311
PR_LogPrint("DOCUMENT %p ResetToURI %s", this, spec.get());
@@ -2638,7 +2638,7 @@ nsDocument::StartDocumentLoad(const char* aCommand, nsIChannel* aChannel,
26382638
nsIStreamListener **aDocListener,
26392639
bool aReset, nsIContentSink* aSink)
26402640
{
2641-
if (gDocumentLeakPRLog && MOZ_LOG_TEST(gDocumentLeakPRLog, PR_LOG_DEBUG)) {
2641+
if (gDocumentLeakPRLog && MOZ_LOG_TEST(gDocumentLeakPRLog, LogLevel::Debug)) {
26422642
nsCOMPtr<nsIURI> uri;
26432643
aChannel->GetURI(getter_AddRefs(uri));
26442644
nsAutoCString spec;
@@ -2773,7 +2773,7 @@ AppendCSPFromHeader(nsIContentSecurityPolicy* csp,
27732773
rv = csp->AppendPolicy(policy, aReportOnly);
27742774
NS_ENSURE_SUCCESS(rv, rv);
27752775
{
2776-
MOZ_LOG(gCspPRLog, PR_LOG_DEBUG,
2776+
MOZ_LOG(gCspPRLog, LogLevel::Debug,
27772777
("CSP refined with policy: \"%s\"",
27782778
NS_ConvertUTF16toUTF8(policy).get()));
27792779
}
@@ -2813,7 +2813,7 @@ nsDocument::InitCSP(nsIChannel* aChannel)
28132813
{
28142814
nsCOMPtr<nsIContentSecurityPolicy> csp;
28152815
if (!CSPService::sCSPEnabled) {
2816-
MOZ_LOG(gCspPRLog, PR_LOG_DEBUG,
2816+
MOZ_LOG(gCspPRLog, LogLevel::Debug,
28172817
("CSP is disabled, skipping CSP init for document %p", this));
28182818
return NS_OK;
28192819
}
@@ -2866,12 +2866,12 @@ nsDocument::InitCSP(nsIChannel* aChannel)
28662866
!applyLoopCSP &&
28672867
cspHeaderValue.IsEmpty() &&
28682868
cspROHeaderValue.IsEmpty()) {
2869-
if (MOZ_LOG_TEST(gCspPRLog, PR_LOG_DEBUG)) {
2869+
if (MOZ_LOG_TEST(gCspPRLog, LogLevel::Debug)) {
28702870
nsCOMPtr<nsIURI> chanURI;
28712871
aChannel->GetURI(getter_AddRefs(chanURI));
28722872
nsAutoCString aspec;
28732873
chanURI->GetAsciiSpec(aspec);
2874-
MOZ_LOG(gCspPRLog, PR_LOG_DEBUG,
2874+
MOZ_LOG(gCspPRLog, LogLevel::Debug,
28752875
("no CSP for document, %s, %s",
28762876
aspec.get(),
28772877
applyAppDefaultCSP ? "is app" : "not an app"));
@@ -2880,7 +2880,7 @@ nsDocument::InitCSP(nsIChannel* aChannel)
28802880
return NS_OK;
28812881
}
28822882

2883-
MOZ_LOG(gCspPRLog, PR_LOG_DEBUG, ("Document is an app or CSP header specified %p", this));
2883+
MOZ_LOG(gCspPRLog, LogLevel::Debug, ("Document is an app or CSP header specified %p", this));
28842884

28852885
nsresult rv;
28862886

@@ -2899,7 +2899,7 @@ nsDocument::InitCSP(nsIChannel* aChannel)
28992899
NS_ENSURE_SUCCESS(rv, rv);
29002900

29012901
if (csp) {
2902-
MOZ_LOG(gCspPRLog, PR_LOG_DEBUG, ("%s %s %s",
2902+
MOZ_LOG(gCspPRLog, LogLevel::Debug, ("%s %s %s",
29032903
"This document is sharing principal with another document.",
29042904
"Since the document is an app, CSP was already set.",
29052905
"Skipping attempt to set CSP."));
@@ -2910,7 +2910,7 @@ nsDocument::InitCSP(nsIChannel* aChannel)
29102910
csp = do_CreateInstance("@mozilla.org/cspcontext;1", &rv);
29112911

29122912
if (NS_FAILED(rv)) {
2913-
MOZ_LOG(gCspPRLog, PR_LOG_DEBUG, ("Failed to create CSP object: %x", rv));
2913+
MOZ_LOG(gCspPRLog, LogLevel::Debug, ("Failed to create CSP object: %x", rv));
29142914
return rv;
29152915
}
29162916

@@ -2963,7 +2963,7 @@ nsDocument::InitCSP(nsIChannel* aChannel)
29632963
rv = csp->PermitsAncestry(docShell, &safeAncestry);
29642964

29652965
if (NS_FAILED(rv) || !safeAncestry) {
2966-
MOZ_LOG(gCspPRLog, PR_LOG_DEBUG,
2966+
MOZ_LOG(gCspPRLog, LogLevel::Debug,
29672967
("CSP doesn't like frame's ancestry, not loading."));
29682968
// stop! ERROR page!
29692969
aChannel->Cancel(NS_ERROR_CSP_FRAME_ANCESTOR_VIOLATION);
@@ -2988,7 +2988,7 @@ nsDocument::InitCSP(nsIChannel* aChannel)
29882988

29892989
rv = principal->SetCsp(csp);
29902990
NS_ENSURE_SUCCESS(rv, rv);
2991-
MOZ_LOG(gCspPRLog, PR_LOG_DEBUG,
2991+
MOZ_LOG(gCspPRLog, LogLevel::Debug,
29922992
("Inserted CSP into principal %p", principal));
29932993

29942994
return NS_OK;

‎dom/base/nsFocusManager.cpp

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -77,16 +77,16 @@ using namespace mozilla::widget;
7777
PRLogModuleInfo* gFocusLog;
7878
PRLogModuleInfo* gFocusNavigationLog;
7979

80-
#define LOGFOCUS(args) MOZ_LOG(gFocusLog, PR_LOG_DEBUG, args)
81-
#define LOGFOCUSNAVIGATION(args) MOZ_LOG(gFocusNavigationLog, PR_LOG_DEBUG, args)
80+
#define LOGFOCUS(args) MOZ_LOG(gFocusLog, mozilla::LogLevel::Debug, args)
81+
#define LOGFOCUSNAVIGATION(args) MOZ_LOG(gFocusNavigationLog, mozilla::LogLevel::Debug, args)
8282

8383
#define LOGTAG(log, format, content) \
84-
if (MOZ_LOG_TEST(log, PR_LOG_DEBUG)) { \
84+
if (MOZ_LOG_TEST(log, LogLevel::Debug)) { \
8585
nsAutoCString tag(NS_LITERAL_CSTRING("(none)")); \
8686
if (content) { \
8787
content->NodeInfo()->NameAtom()->ToUTF8String(tag); \
8888
} \
89-
MOZ_LOG(log, PR_LOG_DEBUG, (format, tag.get())); \
89+
MOZ_LOG(log, LogLevel::Debug, (format, tag.get())); \
9090
}
9191

9292
#define LOGCONTENT(format, content) LOGTAG(gFocusLog, format, content)
@@ -482,7 +482,7 @@ nsFocusManager::MoveFocus(nsIDOMWindow* aWindow, nsIDOMElement* aStartElement,
482482

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

485-
if (MOZ_LOG_TEST(gFocusLog, PR_LOG_DEBUG) && mFocusedWindow) {
485+
if (MOZ_LOG_TEST(gFocusLog, LogLevel::Debug) && mFocusedWindow) {
486486
nsIDocument* doc = mFocusedWindow->GetExtantDoc();
487487
if (doc && doc->GetDocumentURI()) {
488488
nsAutoCString spec;
@@ -638,7 +638,7 @@ nsFocusManager::WindowRaised(nsIDOMWindow* aWindow)
638638
nsCOMPtr<nsPIDOMWindow> window = do_QueryInterface(aWindow);
639639
NS_ENSURE_TRUE(window && window->IsOuterWindow(), NS_ERROR_INVALID_ARG);
640640

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

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

853853
window = window->GetOuterWindow();
854854

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

908908
window = window->GetOuterWindow();
909909

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

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

1780-
if (MOZ_LOG_TEST(gFocusLog, PR_LOG_DEBUG)) {
1780+
if (MOZ_LOG_TEST(gFocusLog, LogLevel::Debug)) {
17811781
nsIDocument* docm = aWindow->GetExtantDoc();
17821782
if (docm) {
17831783
LOGCONTENT(" from %s", docm->GetRootElement());

0 commit comments

Comments
 (0)