AuroraMiddleware/skia2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

remove GrTextBlob::setMinAndMaxScale from API

Browse Source 
Change-Id: I7940fc31c7504e651cc1d035c662e4c1a403574e
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/374358
Commit-Queue: Herb Derby <herb@google.com>
Reviewed-by: Robert Phillips <robertphillips@google.com>
This commit is contained in:
Herb Derby 2021-02-23 13:21:37 -05:00 committed by Skia Commit-Bot
parent ad7a55fc58
commit 6d2b7688f6
2 changed files with 3 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/gpu/text/GrTextBlob.cpp
View File

@ -1411,12 +1411,6 @@ void GrTextBlob::addKey(const Key& key) {
bool GrTextBlob::hasPerspective() const { return fInitialMatrix.hasPerspective(); }
void GrTextBlob::setMinAndMaxScale(SkScalar scaledMin, SkScalar scaledMax) {
// we init fMaxMinScale and fMinMaxScale in the constructor
fMaxMinScale = std::max(scaledMin, fMaxMinScale);
fMinMaxScale = std::min(scaledMax, fMinMaxScale);
}
bool GrTextBlob::canReuse(const SkPaint& paint, const SkMatrix& drawMatrix) {
// A singular matrix will create a GrTextBlob with no SubRuns, but unknown glyphs can
// also cause empty runs. If there are no subRuns, then regenerate.
@ -1507,7 +1501,9 @@ void GrTextBlob::processSourceSDFT(const SkZip<SkGlyphVariant, SkPoint>& drawabl
const SkFont& runFont,
SkScalar minScale,
SkScalar maxScale) {
this->setMinAndMaxScale(minScale, maxScale);
fMaxMinScale = std::max(minScale, fMaxMinScale);
fMinMaxScale = std::min(maxScale, fMinMaxScale);
fSubRunList.append(SDFTSubRun::Make(drawables, runFont, strikeSpec, this, &fAlloc));
}

1
src/gpu/text/GrTextBlob.h
View File

@ -404,7 +404,6 @@ public:
bool hasPerspective() const;
const SkMatrix& initialMatrix() const { return fInitialMatrix; }
void setMinAndMaxScale(SkScalar scaledMin, SkScalar scaledMax);
std::tuple<SkScalar, SkScalar> scaleBounds() const {
return {fMaxMinScale, fMinMaxScale};
}