author | Mats Palmgren <mats@mozilla.com> |
Sun, 29 Mar 2015 22:38:40 +0000 | |
changeset 236442 | cfd12c2cb5cb045ce69407c4ebd51757675cfc69 |
parent 236441 | 54a080c7d385b34ee320e4035275b44a0702ff1d |
child 236443 | 41c005e9398e95871789aa21bb0f26559320b3d9 |
push id | 57674 |
push user | mpalmgren@mozilla.com |
push date | Sun, 29 Mar 2015 22:39:09 +0000 |
treeherder | mozilla-inbound@d7b8787283ce [default view] [failures only] |
perfherder | [talos] [build metrics] [platform microbench] (compared to previous push) |
reviewers | roc |
bugs | 1148833 |
milestone | 39.0a1 |
first release with | nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
|
last release without | nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
|
--- a/layout/generic/nsFrame.cpp +++ b/layout/generic/nsFrame.cpp @@ -8956,40 +8956,40 @@ GetTagName(nsFrame* aFrame, nsIContent* else { PR_snprintf(aResult, aResultSize, "@%p", aFrame); } } void nsFrame::Trace(const char* aMethod, bool aEnter) { - if (NS_FRAME_LOG_TEST(gLogModule, NS_FRAME_TRACE_CALLS)) { + if (NS_FRAME_LOG_TEST(GetLogModuleInfo(), NS_FRAME_TRACE_CALLS)) { char tagbuf[40]; GetTagName(this, mContent, sizeof(tagbuf), tagbuf); PR_LogPrint("%s: %s %s", tagbuf, aEnter ? "enter" : "exit", aMethod); } } void nsFrame::Trace(const char* aMethod, bool aEnter, nsReflowStatus aStatus) { - if (NS_FRAME_LOG_TEST(gLogModule, NS_FRAME_TRACE_CALLS)) { + if (NS_FRAME_LOG_TEST(GetLogModuleInfo(), NS_FRAME_TRACE_CALLS)) { char tagbuf[40]; GetTagName(this, mContent, sizeof(tagbuf), tagbuf); PR_LogPrint("%s: %s %s, status=%scomplete%s", tagbuf, aEnter ? "enter" : "exit", aMethod, NS_FRAME_IS_NOT_COMPLETE(aStatus) ? "not" : "", (NS_FRAME_REFLOW_NEXTINFLOW & aStatus) ? "+reflow" : ""); } } void nsFrame::TraceMsg(const char* aFormatString, ...) { - if (NS_FRAME_LOG_TEST(gLogModule, NS_FRAME_TRACE_CALLS)) { + if (NS_FRAME_LOG_TEST(GetLogModuleInfo(), NS_FRAME_TRACE_CALLS)) { // Format arguments into a buffer char argbuf[200]; va_list ap; va_start(ap, aFormatString); PR_vsnprintf(argbuf, sizeof(argbuf), aFormatString, ap); va_end(ap); char tagbuf[40];