aboutsummaryrefslogtreecommitdiffhomepage
path: root/src
diff options
context:
space:
mode:
authorGravatar mtklein <mtklein@chromium.org>2015-09-08 15:18:21 -0700
committerGravatar Commit bot <commit-bot@chromium.org>2015-09-08 15:18:21 -0700
commit925979f733fe8e70d84627147dee04d030423349 (patch)
tree03c2147d139a3214b4293aedc6c8115d42e21bf5 /src
parent87a5c9fa0ff6fdf5225df53666798a2d513ade6d (diff)
Make SkGraphics::Term a no-op, stop calling it.
I'd remove it entirely but Android is calling it explicitly. BUG=skia:4259 Review URL: https://codereview.chromium.org/1329853005
Diffstat (limited to 'src')
-rw-r--r--src/core/SkGraphics.cpp6
-rw-r--r--src/core/SkPaint.cpp12
2 files changed, 0 insertions, 18 deletions
diff --git a/src/core/SkGraphics.cpp b/src/core/SkGraphics.cpp
index e9dcadc180..5290ea1d07 100644
--- a/src/core/SkGraphics.cpp
+++ b/src/core/SkGraphics.cpp
@@ -58,12 +58,6 @@ void SkGraphics::Init() {
#endif
}
-void SkGraphics::Term() {
- PurgeFontCache();
- PurgeResourceCache();
- SkPaint::Term();
-}
-
///////////////////////////////////////////////////////////////////////////////
void SkGraphics::DumpMemoryStatistics(SkTraceMemoryDump* dump) {
diff --git a/src/core/SkPaint.cpp b/src/core/SkPaint.cpp
index c1097204c4..e15c1a74db 100644
--- a/src/core/SkPaint.cpp
+++ b/src/core/SkPaint.cpp
@@ -1525,18 +1525,6 @@ static const SkMaskGamma& cachedMaskGamma(SkScalar contrast, SkScalar paintGamma
return *gMaskGamma;
}
-/*static*/ void SkPaint::Term() {
- SkAutoMutexAcquire ama(gMaskGammaCacheMutex);
-
- SkSafeUnref(gLinearMaskGamma);
- gLinearMaskGamma = nullptr;
- SkSafeUnref(gMaskGamma);
- gMaskGamma = nullptr;
- SkDEBUGCODE(gContrast = SK_ScalarMin;)
- SkDEBUGCODE(gPaintGamma = SK_ScalarMin;)
- SkDEBUGCODE(gDeviceGamma = SK_ScalarMin;)
-}
-
/**
* We ensure that the rec is self-consistent and efficient (where possible)
*/