From 261d0153e2ce1828355221f8dad0855eb6e6e243 Mon Sep 17 00:00:00 2001 From: "commit-bot@chromium.org" Date: Mon, 12 May 2014 15:48:38 +0000 Subject: [PATCH] Clean up global gSkSuppressFontCachePurgeSpew. No one is using it except to flick it to true to shut up the spew, but the spew is already guarded by #ifdef SPEW_PURGE_STATUS. Let's leave it to SPEW_PURGE_STATUS. Noticed this specificially when TSAN complained about FontScalerBench modifying it in a thread-unsafe way. BUG=skia:1792 R=reed@google.com, mtklein@google.com Author: mtklein@chromium.org Review URL: https://codereview.chromium.org/264333008 git-svn-id: http://skia.googlecode.com/svn/trunk@14697 2bbb7eff-a529-9590-31e7-b0007b416f81 --- bench/FontScalerBench.cpp | 7 ------- gm/gmmain.cpp | 3 --- src/core/SkGlyphCache.cpp | 4 +--- 3 files changed, 1 insertion(+), 13 deletions(-) diff --git a/bench/FontScalerBench.cpp b/bench/FontScalerBench.cpp index 6ef070334..a14723c0f 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 4f0fe86e3..1540960d8 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 cb7c1b0af..699801d2d 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); }