corysanin/tubestation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug 1162673 - Part 1: Remove instances of #ifdef PR_LOGGING in layout. r=froydnj

Browse Source 
PR_LOGGING is now always defined, we can remove #ifdefs checking for it.
This commit is contained in:
Eric Rahm
2015-05-11 13:53:18 -07:00
parent 0caaa76476
commit 5ccd7b80b4
15 changed files with 0 additions and 99 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
layout/base/nsPresShell.cpp
View File

@@ -535,9 +535,7 @@ private:
bool PresShell::sDisableNonTestMouseEvents = false;
#ifdef PR_LOGGING
PRLogModuleInfo* PresShell::gLog;
#endif
#ifdef DEBUG
static void
@@ -752,12 +750,10 @@ PresShell::PresShell()
mReflowCountMgr->SetPresContext(mPresContext);
mReflowCountMgr->SetPresShell(this);
#endif
#ifdef PR_LOGGING
mLoadBegin = TimeStamp::Now();
if (!gLog) {
gLog = PR_NewLogModule("PresShell");
}
#endif
mSelectionFlags = nsISelectionDisplay::DISPLAY_TEXT | nsISelectionDisplay::DISPLAY_IMAGES;
mIsThemeSupportDisabled = false;
mIsActive = true;
@@ -970,7 +966,6 @@ PresShell::Init(nsIDocument* aDocument,
mTouchManager.Init(this, mDocument);
}
#ifdef PR_LOGGING
enum TextPerfLogType {
eLog_reflow,
eLog_loaddone,
@@ -1051,7 +1046,6 @@ LogTextPerfStats(gfxTextPerfMetrics* aTextPerf,
aTextPerf->cumulative.textrunDestr));
}
}
#endif
void
PresShell::Destroy()
@@ -1060,7 +1054,6 @@ PresShell::Destroy()
"destroy called on presshell while scripts not blocked");
// dump out cumulative text perf metrics
#ifdef PR_LOGGING
gfxTextPerfMetrics* tp;
if (mPresContext && (tp = mPresContext->GetTextPerfMetrics())) {
tp->Accumulate();
@@ -1068,7 +1061,6 @@ PresShell::Destroy()
LogTextPerfStats(tp, this, tp->cumulative, 0.0, eLog_totals, nullptr);
}
}
#endif
#ifdef MOZ_REFLOW_PERF
DumpReflows();
@@ -2652,7 +2644,6 @@ PresShell::BeginLoad(nsIDocument *aDocument)
{
mDocumentLoading = true;
#ifdef PR_LOGGING
gfxTextPerfMetrics *tp = nullptr;
if (mPresContext) {
tp = mPresContext->GetTextPerfMetrics();
@@ -2673,7 +2664,6 @@ PresShell::BeginLoad(nsIDocument *aDocument)
("(presshell) %p load begin [%s]\n",
this, spec.get()));
}
#endif
}
void
@@ -2689,7 +2679,6 @@ PresShell::EndLoad(nsIDocument *aDocument)
void
PresShell::LoadComplete()
{
#ifdef PR_LOGGING
gfxTextPerfMetrics *tp = nullptr;
if (mPresContext) {
tp = mPresContext->GetTextPerfMetrics();
@@ -2717,7 +2706,6 @@ PresShell::LoadComplete()
}
}
}
#endif
}
#ifdef DEBUG
@@ -9284,7 +9272,6 @@ PresShell::DoReflow(nsIFrame* target, bool aInterruptible)
MaybeScheduleReflow();
}
#ifdef PR_LOGGING
// dump text perf metrics for reflows with significant text processing
if (tp) {
if (tp->current.numChars > 100) {
@@ -9294,7 +9281,6 @@ PresShell::DoReflow(nsIFrame* target, bool aInterruptible)
}
tp->Accumulate();
}
#endif
if (docShell) {
docShell->AddProfileTimelineMarker("Reflow", TRACING_INTERVAL_END);