diff options
| author | Herb Derby <herb@google.com> | 2018-11-08 16:40:26 -0500 |
|---|---|---|
| committer | Skia Commit-Bot <skia-commit-bot@chromium.org> | 2018-11-09 20:01:42 +0000 |
| commit | c34150079a0aa7b4ef0f79611c536ae336a65089 (patch) | |
| tree | dca55628ace300493e1eec840f2b204555ede3c9 /bench | |
| parent | 106296323223b6ac9980862ae6e9ce039bbd1534 (diff) | |
| download | skqp-c34150079a0aa7b4ef0f79611c536ae336a65089.tar.gz | |
Reland "Move remove ptr args to MakeRecAndEffects"
This is a reland of b07aba42145e29e0e995b373844c59846058a9ba
Original change's description:
> Move remove ptr args to MakeRecAndEffects
>
> Move this conversion out through the transitive closure of calls. As you
> move up the stack, everything becomes refs instread of pointers.
>
> Reorder args of MakeRecAndEffects and setupCache to match the majority of other
> calls.
>
> Change-Id: I72baf457cd9140f76ee5f7122493284c4be5bcd0
> Reviewed-on: https://skia-review.googlesource.com/c/169765
> Reviewed-by: Ben Wagner <bungeman@google.com>
> Commit-Queue: Herb Derby <herb@google.com>
Change-Id: I2ff7f218ecc7b18ae6a2b293cecdb059eea77562
Reviewed-on: https://skia-review.googlesource.com/c/170222
Reviewed-by: Ben Wagner <bungeman@google.com>
Commit-Queue: Herb Derby <herb@google.com>
Diffstat (limited to 'bench')
| -rw-r--r-- | bench/PathTextBench.cpp | 2 | ||||
| -rw-r--r-- | bench/SkGlyphCacheBench.cpp | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/bench/PathTextBench.cpp b/bench/PathTextBench.cpp index 8c7c9f7f54..9bc69e7478 100644 --- a/bench/PathTextBench.cpp +++ b/bench/PathTextBench.cpp @@ -46,7 +46,7 @@ private: void onDelayedSetup() override { SkPaint defaultPaint; - auto cache = SkStrikeCache::FindOrCreateStrikeExclusive(defaultPaint); + auto cache = SkStrikeCache::FindOrCreateStrikeWithNoDeviceExclusive(defaultPaint); for (int i = 0; i < kNumGlyphs; ++i) { SkPackedGlyphID id(cache->unicharToGlyph(kGlyphs[i])); sk_ignore_unused_variable(cache->getScalerContext()->getPath(id, &fGlyphs[i])); diff --git a/bench/SkGlyphCacheBench.cpp b/bench/SkGlyphCacheBench.cpp index 08d43e3eca..be99c9c483 100644 --- a/bench/SkGlyphCacheBench.cpp +++ b/bench/SkGlyphCacheBench.cpp @@ -21,7 +21,8 @@ static void do_font_stuff(SkPaint* paint) { for (SkScalar i = 8; i < 64; i++) { paint->setTextSize(i); auto cache = SkStrikeCache::FindOrCreateStrikeExclusive( - *paint, nullptr, SkScalerContextFlags::kNone, nullptr); + *paint, SkSurfaceProps(0, kUnknown_SkPixelGeometry), + SkScalerContextFlags::kNone, SkMatrix::I()); uint16_t glyphs['z']; for (int c = ' '; c < 'z'; c++) { glyphs[c] = cache->unicharToGlyph(c); |