From 91e260f4dbcb4006c3b177c2eba7ed0dc1af3e3d Mon Sep 17 00:00:00 2001 From: Timothy Liang Date: Fri, 15 Jun 2018 13:28:35 -0400 Subject: Reland "Reland "added 565 to 8888 conversion for gpu LCD text rendering for macOS"" This reverts commit 5540528f81c0a1ad10b8086a1009b799717329f6. Reason for revert: Changed unique pointer to not be static Original change's description: > Revert "Reland "added 565 to 8888 conversion for gpu LCD text rendering for macOS"" > > This reverts commit 0513dd8675534afdd605cea32778a4b4671b2c3d. > > Reason for revert: Still has static initializer. > > Original change's description: > > Reland "added 565 to 8888 conversion for gpu LCD text rendering for macOS" > > > > This reverts commit cf274da6faa9d32e08053180c8113fcaab666028. > > > > Reason for revert: removed the static initializer > > > > Original change's description: > > > Revert "added 565 to 8888 conversion for gpu LCD text rendering for macOS" > > > > > > This reverts commit e6f2ecafaf0efecacfd4256f280e26ee74cb7e16. > > > > > > Reason for revert: breaking chrome roll cause of static initializers > > > > > > Original change's description: > > > > added 565 to 8888 conversion for gpu LCD text rendering for macOS > > > > > > > > Bug: skia: > > > > Change-Id: Ie24160bb098d388bf4ad69d0c2f9f8ed4beb215c > > > > Reviewed-on: https://skia-review.googlesource.com/134508 > > > > Commit-Queue: Timothy Liang > > > > Reviewed-by: Jim Van Verth > > > > > > TBR=egdaniel@google.com,jvanverth@google.com,timliang@google.com > > > > > > Change-Id: Ida97a4085c93fcb990999ab71f99364ec2ef86b7 > > > No-Presubmit: true > > > No-Tree-Checks: true > > > No-Try: true > > > Bug: skia: > > > Reviewed-on: https://skia-review.googlesource.com/135000 > > > Reviewed-by: Greg Daniel > > > Commit-Queue: Greg Daniel > > > > Change-Id: I40c29b73970c55b3579a0169bbad666a798b2348 > > Bug: skia: > > Reviewed-on: https://skia-review.googlesource.com/135021 > > Reviewed-by: Jim Van Verth > > Reviewed-by: Greg Daniel > > Commit-Queue: Timothy Liang > > TBR=egdaniel@google.com,jvanverth@google.com,timliang@google.com > > Change-Id: I2632d02adc9ba791e5a55adafe0ad10a63f50073 > No-Presubmit: true > No-Tree-Checks: true > No-Try: true > Bug: skia: > Reviewed-on: https://skia-review.googlesource.com/135240 > Reviewed-by: Ben Wagner > Commit-Queue: Ben Wagner Bug: skia: CQ_INCLUDE_TRYBOTS=luci.chromium.try:android-marshmallow-arm64-rel Change-Id: Ie4fa0e4f862546068ed4ab818d4956de7175cb3d Reviewed-on: https://skia-review.googlesource.com/135241 Reviewed-by: Greg Daniel Commit-Queue: Timothy Liang --- src/gpu/text/GrGlyphCache.h | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'src/gpu/text/GrGlyphCache.h') diff --git a/src/gpu/text/GrGlyphCache.h b/src/gpu/text/GrGlyphCache.h index 7e707ec64c..8375d1f19a 100644 --- a/src/gpu/text/GrGlyphCache.h +++ b/src/gpu/text/GrGlyphCache.h @@ -12,6 +12,7 @@ #include "GrGlyph.h" #include "SkArenaAlloc.h" #include "SkGlyphCache.h" +#include "SkMasks.h" #include "SkTDynamicHash.h" class GrGlyphCache; @@ -127,6 +128,8 @@ public: return strike; } + const SkMasks& getMasks() const { return *f565Masks; } + void freeAll(); static void HandleEviction(GrDrawOpAtlas::AtlasID, void*); @@ -145,6 +148,7 @@ private: StrikeHash fCache; GrTextStrike* fPreserveStrike; SkScalar fGlyphSizeLimit; + std::unique_ptr f565Masks; }; #endif -- cgit v1.2.3