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

simplify setColor, without needing the 4f or the colorspace

Browse Source 
Change-Id: I7f6fe83cfb653819c1b5d865421f4fd2121e9b4d
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/212418
Reviewed-by: Kevin Lubick <kjlubick@google.com>
Reviewed-by: Mike Reed <reed@google.com>
Commit-Queue: Mike Reed <reed@google.com>
Auto-Submit: Mike Reed <reed@google.com>
This commit is contained in:
Mike Reed 2019-05-20 11:47:49 -04:00 committed by Skia Commit-Bot
parent af9b7b9f09
commit dc2b98fd29
3 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
include/core/SkPaint.h
View File

@ -256,7 +256,11 @@ public:
@param color unpremultiplied RGBA @param color unpremultiplied RGBA
@param colorSpace SkColorSpace describing the encoding of color @param colorSpace SkColorSpace describing the encoding of color
*/ */
void setColor4f(const SkColor4f& color, SkColorSpace* colorSpace); void setColor(const SkColor4f& color, SkColorSpace* colorSpace = nullptr);
void setColor4f(const SkColor4f& color, SkColorSpace* colorSpace = nullptr) {
this->setColor(color, colorSpace);
}
/** Retrieves alpha from the color used when stroking and filling. /** Retrieves alpha from the color used when stroking and filling.

8
modules/canvaskit/canvaskit_bindings.cpp
View File

@ -961,7 +961,13 @@ EMSCRIPTEN_BINDINGS(Skia) {
.function("getStrokeWidth", &SkPaint::getStrokeWidth) .function("getStrokeWidth", &SkPaint::getStrokeWidth)
.function("setAntiAlias", &SkPaint::setAntiAlias) .function("setAntiAlias", &SkPaint::setAntiAlias)
.function("setBlendMode", &SkPaint::setBlendMode) .function("setBlendMode", &SkPaint::setBlendMode)
.function("setColor", &SkPaint::setColor) .function("setColor", optional_override([](SkPaint& self, SkColor c) {
self.setColor(c);
}))
.function("setColorf", optional_override([](SkPaint& self,
float r, float g, float b, float a) {
self.setColor({r, g, b, a});
}))
.function("setFilterQuality", &SkPaint::setFilterQuality) .function("setFilterQuality", &SkPaint::setFilterQuality)
.function("setMaskFilter", &SkPaint::setMaskFilter) .function("setMaskFilter", &SkPaint::setMaskFilter)
.function("setPathEffect", &SkPaint::setPathEffect) .function("setPathEffect", &SkPaint::setPathEffect)

8
src/core/SkPaint.cpp
View File

@ -57,7 +57,7 @@ SkPaint::SkPaint()
} }
SkPaint::SkPaint(const SkColor4f& color, SkColorSpace* colorSpace) : SkPaint() { SkPaint::SkPaint(const SkColor4f& color, SkColorSpace* colorSpace) : SkPaint() {
this->setColor4f(color, colorSpace); this->setColor(color, colorSpace);
} }
SkPaint::SkPaint(const SkPaint& src) = default; SkPaint::SkPaint(const SkPaint& src) = default;
@ -115,7 +115,7 @@ void SkPaint::setColor(SkColor color) {
fColor4f = SkColor4f::FromColor(color); fColor4f = SkColor4f::FromColor(color);
} }
void SkPaint::setColor4f(const SkColor4f& color, SkColorSpace* colorSpace) { void SkPaint::setColor(const SkColor4f& color, SkColorSpace* colorSpace) {
SkASSERT(fColor4f.fA >= 0 && fColor4f.fA <= 1.0f); SkASSERT(fColor4f.fA >= 0 && fColor4f.fA <= 1.0f);
SkColorSpaceXformSteps steps{colorSpace, kUnpremul_SkAlphaType, SkColorSpaceXformSteps steps{colorSpace, kUnpremul_SkAlphaType,
@ -362,7 +362,7 @@ SkReadPaintResult SkPaintPriv::Unflatten_PreV68(SkPaint* paint, SkReadBuffer& bu
} else { } else {
SkColor4f color; SkColor4f color;
buffer.readColor4f(&color); buffer.readColor4f(&color);
paint->setColor4f(color, sk_srgb_singleton()); paint->setColor(color, sk_srgb_singleton());
} }
unsigned flatFlags = unpack_paint_flags(paint, buffer.readUInt(), font); unsigned flatFlags = unpack_paint_flags(paint, buffer.readUInt(), font);
@ -417,7 +417,7 @@ SkReadPaintResult SkPaintPriv::Unflatten(SkPaint* paint, SkReadBuffer& buffer, S
{ {
SkColor4f color; SkColor4f color;
buffer.readColor4f(&color); buffer.readColor4f(&color);
paint->setColor4f(color, sk_srgb_singleton()); paint->setColor(color, sk_srgb_singleton());
} }
unsigned flatFlags = unpack_v68(paint, buffer.readUInt(), safe); unsigned flatFlags = unpack_v68(paint, buffer.readUInt(), safe);