Rename GrMeshDrawOp::Target::glyphCache to strikeCache
This renaming, obviously, propagates to the GrOpFlushState derived class.
This CL also removes GrStrikeCache access from:
SkInternalAtlasTextContext - accessor not used
GrAtlasManager - strike cache not used internally
Change-Id: I7b82dc14be7ba7eabe604218f29f875f08a259a5
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/282602
Reviewed-by: Greg Daniel <egdaniel@google.com>
Commit-Queue: Robert Phillips <robertphillips@google.com>
diff --git a/src/atlastext/SkInternalAtlasTextContext.cpp b/src/atlastext/SkInternalAtlasTextContext.cpp
index fc3036e..afab657 100644
--- a/src/atlastext/SkInternalAtlasTextContext.cpp
+++ b/src/atlastext/SkInternalAtlasTextContext.cpp
@@ -50,10 +50,6 @@
}
}
-GrStrikeCache* SkInternalAtlasTextContext::glyphCache() {
- return fGrContext->priv().getGrStrikeCache();
-}
-
GrTextBlobCache* SkInternalAtlasTextContext::textBlobCache() {
return fGrContext->priv().getTextBlobCache();
}
diff --git a/src/atlastext/SkInternalAtlasTextContext.h b/src/atlastext/SkInternalAtlasTextContext.h
index d0f7f23..81b6df0 100644
--- a/src/atlastext/SkInternalAtlasTextContext.h
+++ b/src/atlastext/SkInternalAtlasTextContext.h
@@ -33,7 +33,6 @@
SkAtlasTextRenderer* renderer() const { return fRenderer.get(); }
GrContext* grContext() const { return fGrContext.get(); }
- GrStrikeCache* glyphCache();
GrTextBlobCache* textBlobCache();
const GrTokenTracker* tokenTracker() final { return &fTokenTracker; }
diff --git a/src/gpu/GrLegacyDirectContext.cpp b/src/gpu/GrLegacyDirectContext.cpp
index 8fbc133..f7cae12 100644
--- a/src/gpu/GrLegacyDirectContext.cpp
+++ b/src/gpu/GrLegacyDirectContext.cpp
@@ -106,10 +106,9 @@
allowMultitexturing = GrDrawOpAtlas::AllowMultitexturing::kYes;
}
- GrStrikeCache* glyphCache = this->priv().getGrStrikeCache();
GrProxyProvider* proxyProvider = this->priv().proxyProvider();
- fAtlasManager = new GrAtlasManager(proxyProvider, glyphCache,
+ fAtlasManager = new GrAtlasManager(proxyProvider,
this->options().fGlyphCacheTextureMaximumBytes,
allowMultitexturing);
this->priv().addOnFlushCallbackObject(fAtlasManager);
diff --git a/src/gpu/GrOpFlushState.cpp b/src/gpu/GrOpFlushState.cpp
index dad1485..dfaa9d6 100644
--- a/src/gpu/GrOpFlushState.cpp
+++ b/src/gpu/GrOpFlushState.cpp
@@ -197,7 +197,7 @@
return fOpArgs->appliedClip() ? std::move(*fOpArgs->appliedClip()) : GrAppliedClip();
}
-GrStrikeCache* GrOpFlushState::glyphCache() const {
+GrStrikeCache* GrOpFlushState::strikeCache() const {
return fGpu->getContext()->priv().getGrStrikeCache();
}
diff --git a/src/gpu/GrOpFlushState.h b/src/gpu/GrOpFlushState.h
index 617aebe..702ef74 100644
--- a/src/gpu/GrOpFlushState.h
+++ b/src/gpu/GrOpFlushState.h
@@ -155,7 +155,7 @@
const GrCaps& caps() const final;
GrResourceProvider* resourceProvider() const final { return fResourceProvider; }
- GrStrikeCache* glyphCache() const final;
+ GrStrikeCache* strikeCache() const final;
// At this point we know we're flushing so full access to the GrAtlasManager is required (and
// permissible).
diff --git a/src/gpu/ops/GrAtlasTextOp.cpp b/src/gpu/ops/GrAtlasTextOp.cpp
index 0de7319..a3062dd 100644
--- a/src/gpu/ops/GrAtlasTextOp.cpp
+++ b/src/gpu/ops/GrAtlasTextOp.cpp
@@ -357,7 +357,7 @@
auto subRun = args.fSubRunPtr;
SkASSERT((int)subRun->vertexStride() == vertexStride);
- subRun->prepareGrGlyphs(target->glyphCache());
+ subRun->prepareGrGlyphs(target->strikeCache());
subRun->updateVerticesColorIfNeeded(args.fColor.toBytes_RGBA());
subRun->translateVerticesIfNeeded(args.fDrawMatrix, args.fDrawOrigin);
diff --git a/src/gpu/ops/GrMeshDrawOp.h b/src/gpu/ops/GrMeshDrawOp.h
index d0acdfb..ce92988 100644
--- a/src/gpu/ops/GrMeshDrawOp.h
+++ b/src/gpu/ops/GrMeshDrawOp.h
@@ -205,8 +205,7 @@
virtual GrResourceProvider* resourceProvider() const = 0;
uint32_t contextUniqueID() const { return this->resourceProvider()->contextUniqueID(); }
- // TODO: rename to strikeCache
- virtual GrStrikeCache* glyphCache() const = 0;
+ virtual GrStrikeCache* strikeCache() const = 0;
virtual GrAtlasManager* atlasManager() const = 0;
// This should be called during onPrepare of a GrOp. The caller should add any proxies to the
diff --git a/src/gpu/text/GrAtlasManager.cpp b/src/gpu/text/GrAtlasManager.cpp
index af31c0a..47dae97 100644
--- a/src/gpu/text/GrAtlasManager.cpp
+++ b/src/gpu/text/GrAtlasManager.cpp
@@ -11,13 +11,12 @@
#include "src/gpu/GrImageInfo.h"
#include "src/gpu/text/GrStrikeCache.h"
-GrAtlasManager::GrAtlasManager(GrProxyProvider* proxyProvider, GrStrikeCache* glyphCache,
+GrAtlasManager::GrAtlasManager(GrProxyProvider* proxyProvider,
size_t maxTextureBytes,
GrDrawOpAtlas::AllowMultitexturing allowMultitexturing)
: fAllowMultitexturing{allowMultitexturing}
, fProxyProvider{proxyProvider}
, fCaps{fProxyProvider->refCaps()}
- , fGlyphCache{glyphCache}
, fAtlasConfig{fCaps->maxTextureSize(), maxTextureBytes} { }
GrAtlasManager::~GrAtlasManager() = default;
diff --git a/src/gpu/text/GrAtlasManager.h b/src/gpu/text/GrAtlasManager.h
index 781cd53..036495f 100644
--- a/src/gpu/text/GrAtlasManager.h
+++ b/src/gpu/text/GrAtlasManager.h
@@ -25,8 +25,7 @@
*/
class GrAtlasManager : public GrOnFlushCallbackObject, public GrDrawOpAtlas::GenerationCounter {
public:
- GrAtlasManager(GrProxyProvider*, GrStrikeCache*,
- size_t maxTextureBytes, GrDrawOpAtlas::AllowMultitexturing);
+ GrAtlasManager(GrProxyProvider*, size_t maxTextureBytes, GrDrawOpAtlas::AllowMultitexturing);
~GrAtlasManager() override;
// Change an expected 565 mask format to 8888 if 565 is not supported (will happen when using
@@ -136,7 +135,6 @@
static_assert(kMaskFormatCount == 3);
GrProxyProvider* fProxyProvider;
sk_sp<const GrCaps> fCaps;
- GrStrikeCache* fGlyphCache;
GrDrawOpAtlasConfig fAtlasConfig;
typedef GrOnFlushCallbackObject INHERITED;