commit 6357116d96f1462852e2c8253f1649c2c762f3e3
author Herb Derby <herb@google.com> Tue Mar 20 11:19:30 2018 -0400
committer Herb Derby <herb@google.com> Tue Mar 20 19:21:11 2018 +0000
tree 65a556fc992b5b0d06e50858b7331dbea5bea2bd
parent 578a8f15d046af63973133c9957c77a0a26c609f

Allow only Android to use SkAutoGlyphCacheNoGamma

Change-Id: Id7b67bc1e4e994f96037266adf7dc159980e4169
Reviewed-on: https://skia-review.googlesource.com/115244
Reviewed-by: Jim Van Verth <jvanverth@google.com>
Commit-Queue: Herb Derby <herb@google.com>

bench/SkGlyphCacheBench.cpp

diff --git a/bench/SkGlyphCacheBench.cpp b/bench/SkGlyphCacheBench.cpp
index c760eb5..0cd3ab4 100644
--- a/bench/SkGlyphCacheBench.cpp
+++ b/bench/SkGlyphCacheBench.cpp
@@ -20,8 +20,8 @@
 static void do_font_stuff(SkPaint* paint) {
     for (SkScalar i = 8; i < 64; i++) {
         paint->setTextSize(i);
-        SkAutoGlyphCacheNoGamma autoCache(*paint, nullptr, nullptr);
-        SkGlyphCache* cache = autoCache.get();
+        auto cache = SkGlyphCache::FindOrCreateStrikeExclusive(
+                *paint, nullptr, SkScalerContextFlags::kNone, nullptr);
         uint16_t glyphs['z'];
         for (int c = ' '; c < 'z'; c++) {
             glyphs[c] = cache->unicharToGlyph(c);

src/core/SkGlyphCache.h

diff --git a/src/core/SkGlyphCache.h b/src/core/SkGlyphCache.h
index 3db63fe..097d41a 100644
--- a/src/core/SkGlyphCache.h
+++ b/src/core/SkGlyphCache.h
@@ -282,6 +282,7 @@
     using INHERITED = SkExclusiveStrikePtr;
 };
 
+#ifdef SK_BUILD_FOR_ANDROID_FRAMEWORK
 class SkAutoGlyphCacheNoGamma : public SkExclusiveStrikePtr {
 public:
     SkAutoGlyphCacheNoGamma(const SkPaint& paint,
@@ -293,7 +294,9 @@
 private:
     using INHERITED = SkExclusiveStrikePtr;
 };
-#define SkAutoGlyphCache(...) SK_REQUIRE_LOCAL_VAR(SkAutoGlyphCache)
 #define SkAutoGlyphCacheNoGamma(...) SK_REQUIRE_LOCAL_VAR(SkAutoGlyphCacheNoGamma)
+#endif
+
+#define SkAutoGlyphCache(...) SK_REQUIRE_LOCAL_VAR(SkAutoGlyphCache)
 
 #endif