commit daa19f35f81133aca3e6a7966f595d1e33bddcae
author Herb Derby <herb@google.com> Mon Feb 10 15:04:29 2020 -0500
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Mon Feb 10 21:05:05 2020 +0000
tree 7d151f0380248ff7467ae0ce24b44a5351811554
parent c2a0d0e9dc66f5293a285ca9cf9eec6bfe9826b1

Remove unused fields from SkScalerContextProxy

Change-Id: Ie6740ccb3302895dc9560e9a9278ab68dd64012b
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/269903
Auto-Submit: Herb Derby <herb@google.com>
Commit-Queue: Mike Klein <mtklein@google.com>
Reviewed-by: Mike Klein <mtklein@google.com>

src/core/SkRemoteGlyphCache.cpp

diff --git a/src/core/SkRemoteGlyphCache.cpp b/src/core/SkRemoteGlyphCache.cpp
index 0f251da..2d2b6d1 100644
--- a/src/core/SkRemoteGlyphCache.cpp
+++ b/src/core/SkRemoteGlyphCache.cpp
@@ -955,10 +955,8 @@
             auto scaler = SkStrikeCache::CreateScalerContext(*client_desc, effects, *tf);
             strike = fStrikeCache->createStrikeExclusive(
                     *client_desc, std::move(scaler), &fontMetrics,
-                    std::make_unique<DiscardableStrikePinner>(spec.discardableHandleId,
-                                                                fDiscardableHandleManager));
-            auto proxyContext = static_cast<SkScalerContextProxy*>(strike->getScalerContext());
-            proxyContext->initCache(strike.get(), fStrikeCache);
+                    std::make_unique<DiscardableStrikePinner>(
+                            spec.discardableHandleId, fDiscardableHandleManager));
         }
 
         if (!deserializer.read<uint64_t>(&glyphImagesCount)) READ_FAILURE

src/core/SkTypeface_remote.cpp

diff --git a/src/core/SkTypeface_remote.cpp b/src/core/SkTypeface_remote.cpp
index c08c2e9..7ae809a 100644
--- a/src/core/SkTypeface_remote.cpp
+++ b/src/core/SkTypeface_remote.cpp
@@ -19,14 +19,6 @@
         : SkScalerContext{std::move(tf), effects, desc}
         , fDiscardableManager{std::move(manager)} {}
 
-void SkScalerContextProxy::initCache(SkStrike* cache, SkStrikeCache* strikeCache) {
-    SkASSERT(fCache == nullptr);
-    SkASSERT(cache != nullptr);
-
-    fCache = cache;
-    fStrikeCache = strikeCache;
-}
-
 unsigned SkScalerContextProxy::generateGlyphCount()  {
     SK_ABORT("Should never be called.");
 }

src/core/SkTypeface_remote.h

diff --git a/src/core/SkTypeface_remote.h b/src/core/SkTypeface_remote.h
index 3d454cf..24d5059 100644
--- a/src/core/SkTypeface_remote.h
+++ b/src/core/SkTypeface_remote.h
@@ -27,8 +27,6 @@
                          const SkDescriptor* desc,
                          sk_sp<SkStrikeClient::DiscardableHandleManager> manager);
 
-    void initCache(SkStrike*, SkStrikeCache*);
-
 protected:
     unsigned generateGlyphCount() override;
     bool generateAdvance(SkGlyph* glyph) override;
@@ -40,8 +38,6 @@
 
 private:
     sk_sp<SkStrikeClient::DiscardableHandleManager> fDiscardableManager;
-    SkStrike* fCache = nullptr;
-    SkStrikeCache* fStrikeCache = nullptr;
     typedef SkScalerContext INHERITED;
 };