Skip to content
This repository was archived by the owner on Feb 25, 2025. It is now read-only.

Commit daa19f3

Browse files
herbderbySkia Commit-Bot
authored andcommitted
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>
1 parent c2a0d0e commit daa19f3

File tree

3 files changed

+2
-16
lines changed

3 files changed

+2
-16
lines changed

src/core/SkRemoteGlyphCache.cpp

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -955,10 +955,8 @@ bool SkStrikeClient::readStrikeData(const volatile void* memory, size_t memorySi
955955
auto scaler = SkStrikeCache::CreateScalerContext(*client_desc, effects, *tf);
956956
strike = fStrikeCache->createStrikeExclusive(
957957
*client_desc, std::move(scaler), &fontMetrics,
958-
std::make_unique<DiscardableStrikePinner>(spec.discardableHandleId,
959-
fDiscardableHandleManager));
960-
auto proxyContext = static_cast<SkScalerContextProxy*>(strike->getScalerContext());
961-
proxyContext->initCache(strike.get(), fStrikeCache);
958+
std::make_unique<DiscardableStrikePinner>(
959+
spec.discardableHandleId, fDiscardableHandleManager));
962960
}
963961

964962
if (!deserializer.read<uint64_t>(&glyphImagesCount)) READ_FAILURE

src/core/SkTypeface_remote.cpp

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -19,14 +19,6 @@ SkScalerContextProxy::SkScalerContextProxy(sk_sp<SkTypeface> tf,
1919
: SkScalerContext{std::move(tf), effects, desc}
2020
, fDiscardableManager{std::move(manager)} {}
2121

22-
void SkScalerContextProxy::initCache(SkStrike* cache, SkStrikeCache* strikeCache) {
23-
SkASSERT(fCache == nullptr);
24-
SkASSERT(cache != nullptr);
25-
26-
fCache = cache;
27-
fStrikeCache = strikeCache;
28-
}
29-
3022
unsigned SkScalerContextProxy::generateGlyphCount() {
3123
SK_ABORT("Should never be called.");
3224
}

src/core/SkTypeface_remote.h

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,6 @@ class SkScalerContextProxy : public SkScalerContext {
2727
const SkDescriptor* desc,
2828
sk_sp<SkStrikeClient::DiscardableHandleManager> manager);
2929

30-
void initCache(SkStrike*, SkStrikeCache*);
31-
3230
protected:
3331
unsigned generateGlyphCount() override;
3432
bool generateAdvance(SkGlyph* glyph) override;
@@ -40,8 +38,6 @@ class SkScalerContextProxy : public SkScalerContext {
4038

4139
private:
4240
sk_sp<SkStrikeClient::DiscardableHandleManager> fDiscardableManager;
43-
SkStrike* fCache = nullptr;
44-
SkStrikeCache* fStrikeCache = nullptr;
4541
typedef SkScalerContext INHERITED;
4642
};
4743

0 commit comments

Comments
 (0)