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

Pass FT_COLR_Paint by const reference.

Browse Source 
This FreeType union is 80 bytes in size and sometimes two of them are
being passed by value. Pass them by const reference instead.

Change-Id: I69f2a326e586c1ddf80d79db96f3df7ed2d00e31
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/527285
Commit-Queue: Ben Wagner <bungeman@google.com>
Auto-Submit: Ben Wagner <bungeman@google.com>
Reviewed-by: Herb Derby <herb@google.com>
Commit-Queue: Herb Derby <herb@google.com>
This commit is contained in:
Ben Wagner 2022-04-04 15:41:21 -04:00 committed by SkCQ
parent 9fbd4984c8
commit 8381a3b52a
1 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/ports/SkFontHost_FreeType_common.cpp
View File

@ -520,10 +520,10 @@ inline SkPoint SkVectorProjection(SkPoint a, SkPoint b) {
bool colrv1_configure_skpaint(FT_Face face, bool colrv1_configure_skpaint(FT_Face face,
const SkSpan<SkColor>& palette, const SkSpan<SkColor>& palette,
const SkColor foregroundColor, const SkColor foregroundColor,
FT_COLR_Paint colrv1_paint, const FT_COLR_Paint& colrv1_paint,
SkPaint* paint) { SkPaint* paint) {
auto fetch_color_stops = [&face, &palette, &foregroundColor]( auto fetch_color_stops = [&face, &palette, &foregroundColor](
FT_ColorStopIterator& color_stop_iterator, const FT_ColorStopIterator& color_stop_iterator,
std::vector<SkScalar>& stops, std::vector<SkScalar>& stops,
std::vector<SkColor>& colors) -> bool { std::vector<SkColor>& colors) -> bool {
const FT_UInt num_color_stops = color_stop_iterator.num_color_stops; const FT_UInt num_color_stops = color_stop_iterator.num_color_stops;
@ -538,8 +538,9 @@ bool colrv1_configure_skpaint(FT_Face face,
sorted_stops.resize(num_color_stops); sorted_stops.resize(num_color_stops);
FT_ColorStop color_stop; FT_ColorStop color_stop;
while (FT_Get_Colorline_Stops(face, &color_stop, &color_stop_iterator)) { FT_ColorStopIterator mutable_color_stop_iterator = color_stop_iterator;
FT_UInt index = color_stop_iterator.current_color_stop - 1; while (FT_Get_Colorline_Stops(face, &color_stop, &mutable_color_stop_iterator)) {
FT_UInt index = mutable_color_stop_iterator.current_color_stop - 1;
sorted_stops[index].stop_pos = color_stop.stop_offset / float(1 << 14); sorted_stops[index].stop_pos = color_stop.stop_offset / float(1 << 14);
FT_UInt16& palette_index = color_stop.color.palette_index; FT_UInt16& palette_index = color_stop.color.palette_index;
if (palette_index == kForegroundColorPaletteIndex) { if (palette_index == kForegroundColorPaletteIndex) {
@ -591,7 +592,7 @@ bool colrv1_configure_skpaint(FT_Face face,
break; break;
} }
case FT_COLR_PAINTFORMAT_LINEAR_GRADIENT: { case FT_COLR_PAINTFORMAT_LINEAR_GRADIENT: {
FT_PaintLinearGradient& linear_gradient = colrv1_paint.u.linear_gradient; const FT_PaintLinearGradient& linear_gradient = colrv1_paint.u.linear_gradient;
SkPoint line_positions[2] = {SkPoint::Make(SkFixedToScalar(linear_gradient.p0.x), SkPoint line_positions[2] = {SkPoint::Make(SkFixedToScalar(linear_gradient.p0.x),
-SkFixedToScalar(linear_gradient.p0.y)), -SkFixedToScalar(linear_gradient.p0.y)),
SkPoint::Make(SkFixedToScalar(linear_gradient.p1.x), SkPoint::Make(SkFixedToScalar(linear_gradient.p1.x),
@ -660,7 +661,7 @@ bool colrv1_configure_skpaint(FT_Face face,
break; break;
} }
case FT_COLR_PAINTFORMAT_RADIAL_GRADIENT: { case FT_COLR_PAINTFORMAT_RADIAL_GRADIENT: {
FT_PaintRadialGradient& radial_gradient = colrv1_paint.u.radial_gradient; const FT_PaintRadialGradient& radial_gradient = colrv1_paint.u.radial_gradient;
SkPoint start = SkPoint::Make(SkFixedToScalar(radial_gradient.c0.x), SkPoint start = SkPoint::Make(SkFixedToScalar(radial_gradient.c0.x),
-SkFixedToScalar(radial_gradient.c0.y)); -SkFixedToScalar(radial_gradient.c0.y));
SkScalar radius = SkFixedToScalar(radial_gradient.r0); SkScalar radius = SkFixedToScalar(radial_gradient.r0);
@ -684,7 +685,7 @@ bool colrv1_configure_skpaint(FT_Face face,
break; break;
} }
case FT_COLR_PAINTFORMAT_SWEEP_GRADIENT: { case FT_COLR_PAINTFORMAT_SWEEP_GRADIENT: {
FT_PaintSweepGradient& sweep_gradient = colrv1_paint.u.sweep_gradient; const FT_PaintSweepGradient& sweep_gradient = colrv1_paint.u.sweep_gradient;
SkPoint center = SkPoint::Make(SkFixedToScalar(sweep_gradient.center.x), SkPoint center = SkPoint::Make(SkFixedToScalar(sweep_gradient.center.x),
-SkFixedToScalar(sweep_gradient.center.y)); -SkFixedToScalar(sweep_gradient.center.y));
SkScalar startAngle = SkFixedToScalar(sweep_gradient.start_angle * 180.0f); SkScalar startAngle = SkFixedToScalar(sweep_gradient.start_angle * 180.0f);
@ -736,7 +737,7 @@ void colrv1_draw_paint(SkCanvas* canvas,
const SkSpan<SkColor>& palette, const SkSpan<SkColor>& palette,
const SkColor foregroundColor, const SkColor foregroundColor,
FT_Face face, FT_Face face,
FT_COLR_Paint colrv1_paint) { const FT_COLR_Paint& colrv1_paint) {
SkPaint paint; SkPaint paint;
switch (colrv1_paint.format) { switch (colrv1_paint.format) {
@ -784,7 +785,7 @@ void colrv1_draw_paint(SkCanvas* canvas,
} }
void colrv1_draw_glyph_with_path(SkCanvas* canvas, const SkSpan<SkColor>& palette, SkColor foregroundColor, FT_Face face, void colrv1_draw_glyph_with_path(SkCanvas* canvas, const SkSpan<SkColor>& palette, SkColor foregroundColor, FT_Face face,
FT_COLR_Paint glyphPaint, FT_COLR_Paint fillPaint) { const FT_COLR_Paint& glyphPaint, const FT_COLR_Paint& fillPaint) {
SkASSERT(glyphPaint.format == FT_COLR_PAINTFORMAT_GLYPH); SkASSERT(glyphPaint.format == FT_COLR_PAINTFORMAT_GLYPH);
SkASSERT(fillPaint.format == FT_COLR_PAINTFORMAT_SOLID || SkASSERT(fillPaint.format == FT_COLR_PAINTFORMAT_SOLID ||
fillPaint.format == FT_COLR_PAINTFORMAT_LINEAR_GRADIENT || fillPaint.format == FT_COLR_PAINTFORMAT_LINEAR_GRADIENT ||
@ -818,7 +819,7 @@ void colrv1_draw_glyph_with_path(SkCanvas* canvas, const SkSpan<SkColor>& palett
* bounding box calculation mode, no SkCanvas is specified, but we only want to * bounding box calculation mode, no SkCanvas is specified, but we only want to
* retrieve the transform from the FreeType paint object. */ * retrieve the transform from the FreeType paint object. */
void colrv1_transform(FT_Face face, void colrv1_transform(FT_Face face,
FT_COLR_Paint colrv1_paint, const FT_COLR_Paint& colrv1_paint,
SkCanvas* canvas, SkCanvas* canvas,
SkMatrix* out_transform = nullptr) { SkMatrix* out_transform = nullptr) {
SkMatrix transform; SkMatrix transform;