diff options
-rw-r--r-- | src/core/SkDescriptor.h | 2 | ||||
-rw-r--r-- | src/core/SkGlyphCache.cpp | 2 | ||||
-rw-r--r-- | src/gpu/GrPathRendering.cpp | 4 | ||||
-rw-r--r-- | src/gpu/text/GrAtlasTextBlob.cpp | 6 | ||||
-rw-r--r-- | src/gpu/text/GrAtlasTextBlob_regenInBatch.cpp | 2 | ||||
-rw-r--r-- | src/gpu/text/GrFontScaler.h | 2 |
6 files changed, 8 insertions, 10 deletions
diff --git a/src/core/SkDescriptor.h b/src/core/SkDescriptor.h index 0f13acde97..736021953b 100644 --- a/src/core/SkDescriptor.h +++ b/src/core/SkDescriptor.h @@ -85,7 +85,7 @@ public: return desc; } - bool equals(const SkDescriptor& other) const { + bool operator==(const SkDescriptor& other) const { // probe to see if we have a good checksum algo // SkASSERT(a.fChecksum != b.fChecksum || memcmp(&a, &b, a.fLength) == 0); diff --git a/src/core/SkGlyphCache.cpp b/src/core/SkGlyphCache.cpp index 7256de6cdc..9725c0179a 100644 --- a/src/core/SkGlyphCache.cpp +++ b/src/core/SkGlyphCache.cpp @@ -529,7 +529,7 @@ SkGlyphCache* SkGlyphCache::VisitCache(SkTypeface* typeface, globals.validate(); for (cache = globals.internalGetHead(); cache != nullptr; cache = cache->fNext) { - if (cache->fDesc->equals(*desc)) { + if (*cache->fDesc == *desc) { globals.internalDetachCache(cache); if (!proc(cache, context)) { globals.internalAttachCacheToHead(cache); diff --git a/src/gpu/GrPathRendering.cpp b/src/gpu/GrPathRendering.cpp index 652f2ce195..fe912e23a2 100644 --- a/src/gpu/GrPathRendering.cpp +++ b/src/gpu/GrPathRendering.cpp @@ -71,9 +71,7 @@ public: fScalerContext->getPath(skGlyph, out); } #ifdef SK_DEBUG - bool isEqualTo(const SkDescriptor& desc) const override { - return fDesc->equals(desc); - } + bool isEqualTo(const SkDescriptor& desc) const override { return *fDesc == desc; } #endif private: const SkAutoTDelete<SkScalerContext> fScalerContext; diff --git a/src/gpu/text/GrAtlasTextBlob.cpp b/src/gpu/text/GrAtlasTextBlob.cpp index ed44ed5386..03260a6e52 100644 --- a/src/gpu/text/GrAtlasTextBlob.cpp +++ b/src/gpu/text/GrAtlasTextBlob.cpp @@ -511,13 +511,13 @@ void GrAtlasTextBlob::AssertEqual(const GrAtlasTextBlob& l, const GrAtlasTextBlo SkASSERT_RELEASE(lRun.fDescriptor.getDesc()); SkASSERT_RELEASE(rRun.fDescriptor.getDesc()); - SkASSERT_RELEASE(lRun.fDescriptor.getDesc()->equals(*rRun.fDescriptor.getDesc())); + SkASSERT_RELEASE(*lRun.fDescriptor.getDesc() == *rRun.fDescriptor.getDesc()); if (lRun.fOverrideDescriptor.get()) { SkASSERT_RELEASE(lRun.fOverrideDescriptor->getDesc()); SkASSERT_RELEASE(rRun.fOverrideDescriptor.get() && rRun.fOverrideDescriptor->getDesc()); - SkASSERT_RELEASE(lRun.fOverrideDescriptor->getDesc()->equals( - *rRun.fOverrideDescriptor->getDesc())); + SkASSERT_RELEASE(*lRun.fOverrideDescriptor->getDesc() == + *rRun.fOverrideDescriptor->getDesc()); } else { SkASSERT_RELEASE(!rRun.fOverrideDescriptor.get()); } diff --git a/src/gpu/text/GrAtlasTextBlob_regenInBatch.cpp b/src/gpu/text/GrAtlasTextBlob_regenInBatch.cpp index 7c3cf68524..94bfb1b953 100644 --- a/src/gpu/text/GrAtlasTextBlob_regenInBatch.cpp +++ b/src/gpu/text/GrAtlasTextBlob_regenInBatch.cpp @@ -160,7 +160,7 @@ void GrAtlasTextBlob::regenInBatch(GrDrawBatch::Target* target, run->fOverrideDescriptor->getDesc() : run->fDescriptor.getDesc(); if (!*cache || !SkTypeface::Equal(*typeface, run->fTypeface) || - !((*desc)->equals(*newDesc))) { + !(**desc == *newDesc)) { if (*cache) { SkGlyphCache::AttachCache(*cache); } diff --git a/src/gpu/text/GrFontScaler.h b/src/gpu/text/GrFontScaler.h index a2be7464a8..313d485d39 100644 --- a/src/gpu/text/GrFontScaler.h +++ b/src/gpu/text/GrFontScaler.h @@ -27,7 +27,7 @@ public: uint32_t getHash() const { return fHash; } bool operator==(const GrFontDescKey& rh) const { - return fHash == rh.fHash && fDesc.getDesc()->equals(*rh.fDesc.getDesc()); + return fHash == rh.fHash && *fDesc.getDesc() == *rh.fDesc.getDesc(); } private: |