Bug 1163192 - Part 1: Remove instances of #ifdef PR_LOGGING in dom/xslt. r=froydnj

PR_LOGGING is now always defined, we can remove #ifdefs checking for it.
This commit is contained in:
Eric Rahm 2015-05-11 13:56:58 -07:00
parent 42c69a4135
commit 698f689e80
2 changed files with 2 additions and 11 deletions

View File

@ -8,7 +8,6 @@
#include "prlog.h"
#ifdef PR_LOGGING
class txLog
{
public:
@ -24,10 +23,4 @@ public:
txLog::xpath = PR_NewLogModule("xpath"); \
txLog::xslt = PR_NewLogModule("xslt")
#else
#define TX_LG_IMPL
#define TX_LG_CREATE
#endif
#endif

View File

@ -128,7 +128,7 @@ txStylesheet::findTemplate(const txXPathNode& aNode,
endFrame = aImportedBy->mFirstNotImported;
}
#if defined(PR_LOGGING) && defined(TX_TO_STRING)
#if defined(TX_TO_STRING)
txPattern* match = 0;
#endif
@ -149,7 +149,7 @@ txStylesheet::findTemplate(const txXPathNode& aNode,
if (templ.mMatch->matches(aNode, aContext)) {
matchTemplate = templ.mFirstInstruction;
*aImportFrame = frame;
#if defined(PR_LOGGING) && defined(TX_TO_STRING)
#if defined(TX_TO_STRING)
match = templ.mMatch;
#endif
}
@ -157,7 +157,6 @@ txStylesheet::findTemplate(const txXPathNode& aNode,
}
}
#ifdef PR_LOGGING
nsAutoString mode, nodeName;
if (aMode.mLocalName) {
aMode.mLocalName->ToString(mode);
@ -180,7 +179,6 @@ txStylesheet::findTemplate(const txXPathNode& aNode,
NS_LossyConvertUTF16toASCII(nodeName).get(),
NS_LossyConvertUTF16toASCII(mode).get()));
}
#endif
if (!matchTemplate) {
// Test for these first since a node can be both a text node