aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
-rw-r--r--bench/FontScalerBench.cpp7
-rw-r--r--gm/gmmain.cpp3
-rwxr-xr-xsrc/core/SkGlyphCache.cpp4
3 files changed, 1 insertions, 13 deletions
diff --git a/bench/FontScalerBench.cpp b/bench/FontScalerBench.cpp
index 6ef0703346..a14723c0ff 100644
--- a/bench/FontScalerBench.cpp
+++ b/bench/FontScalerBench.cpp
@@ -12,8 +12,6 @@
#include "SkRandom.h"
#include "SkString.h"
-extern bool gSkSuppressFontCachePurgeSpew;
-
class FontScalerBench : public SkBenchmark {
SkString fName;
SkString fText;
@@ -32,9 +30,6 @@ protected:
this->setupPaint(&paint);
paint.setLCDRenderText(fDoLCD);
- bool prev = gSkSuppressFontCachePurgeSpew;
- gSkSuppressFontCachePurgeSpew = true;
-
for (int i = 0; i < loops; i++) {
// this is critical - we want to time the creation process, so we
// explicitly flush our cache before each run
@@ -46,8 +41,6 @@ protected:
0, SkIntToScalar(20), paint);
}
}
-
- gSkSuppressFontCachePurgeSpew = prev;
}
private:
typedef SkBenchmark INHERITED;
diff --git a/gm/gmmain.cpp b/gm/gmmain.cpp
index 4f0fe86e3e..1540960d8f 100644
--- a/gm/gmmain.cpp
+++ b/gm/gmmain.cpp
@@ -69,7 +69,6 @@ typedef int GLContextType;
#define DEBUGFAIL_SEE_STDERR SkDEBUGFAIL("see stderr for message")
-extern bool gSkSuppressFontCachePurgeSpew;
DECLARE_bool(useDocumentInsteadOfDevice);
#ifdef SK_SUPPORT_PDF
@@ -2238,8 +2237,6 @@ int tool_main(int argc, char** argv) {
#endif
SkGraphics::Init();
- // we don't need to see this during a run
- gSkSuppressFontCachePurgeSpew = true;
setSystemPreferences();
GMMain gmmain;
diff --git a/src/core/SkGlyphCache.cpp b/src/core/SkGlyphCache.cpp
index cb7c1b0af0..699801d2db 100755
--- a/src/core/SkGlyphCache.cpp
+++ b/src/core/SkGlyphCache.cpp
@@ -21,8 +21,6 @@
//#define SPEW_PURGE_STATUS
//#define RECORD_HASH_EFFICIENCY
-bool gSkSuppressFontCachePurgeSpew;
-
static void create_globals(SkGlyphCache_Globals** globals) {
*globals = SkNEW_ARGS(SkGlyphCache_Globals, (SkGlyphCache_Globals::kYes_UseMutex));
}
@@ -645,7 +643,7 @@ size_t SkGlyphCache_Globals::internalPurge(size_t minBytesNeeded) {
this->validate();
#ifdef SPEW_PURGE_STATUS
- if (countFreed && !gSkSuppressFontCachePurgeSpew) {
+ if (countFreed) {
SkDebugf("purging %dK from font cache [%d entries]\n",
(int)(bytesFreed >> 10), countFreed);
}