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

Remove paint from simplifyTextBlobIgnoringRSXForm.

Browse Source 
It isn't used, so remove it.

Change-Id: Ic10d54e5cb54e458c94f2e544c3a022be2068f0d
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/235016
Reviewed-by: Herb Derby <herb@google.com>
Commit-Queue: Ben Wagner <bungeman@google.com>
This commit is contained in:
Ben Wagner 2019-08-15 14:06:56 -04:00 committed by Skia Commit-Bot
parent 0be3480546
commit 4008519f84
2 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/core/SkGlyphRun.cpp
View File

@ -187,7 +187,7 @@ void SkGlyphRunBuilder::drawTextBlob(const SkPaint& paint, const SkTextBlob& blo
for (SkTextBlobRunIterator it(&blob); !it.done(); it.next()) {
if (it.positioning() != SkTextBlobRunIterator::kRSXform_Positioning) {
simplifyTextBlobIgnoringRSXForm(paint, it, positions);
simplifyTextBlobIgnoringRSXForm(it, positions);
} else {
// Handle kRSXform_Positioning
if (!this->empty()) {
@ -224,7 +224,7 @@ void SkGlyphRunBuilder::textBlobToGlyphRunListIgnoringRSXForm(
SkPoint* positions = fPositions;
for (SkTextBlobRunIterator it(&blob); !it.done(); it.next()) {
simplifyTextBlobIgnoringRSXForm(paint, it, positions);
simplifyTextBlobIgnoringRSXForm(it, positions);
positions += it.glyphCount();
}
@ -233,8 +233,7 @@ void SkGlyphRunBuilder::textBlobToGlyphRunListIgnoringRSXForm(
}
}
void SkGlyphRunBuilder::simplifyTextBlobIgnoringRSXForm(const SkPaint& paint,
const SkTextBlobRunIterator& it,
void SkGlyphRunBuilder::simplifyTextBlobIgnoringRSXForm(const SkTextBlobRunIterator& it,
SkPoint* positions) {
size_t runSize = it.glyphCount();

1
src/core/SkGlyphRun.h
View File

@ -158,7 +158,6 @@ private:
SkSpan<const char> text = SkSpan<const char>{},
SkSpan<const uint32_t> clusters = SkSpan<const uint32_t>{});
void simplifyTextBlobIgnoringRSXForm(
const SkPaint& paint,
const SkTextBlobRunIterator& it,
SkPoint* positions);