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

SkPaint: new constructor

Browse Source 
Change-Id: I5033070bf5d52571869a687387b4f4fc6dddfdd2
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/211597
Commit-Queue: Hal Canary <halcanary@google.com>
Reviewed-by: Mike Reed <reed@google.com>
This commit is contained in:
Hal Canary 2019-05-02 11:31:28 -04:00 committed by Skia Commit-Bot
parent 53610832a0
commit 0a7b393e32
7 changed files with 50 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
gm/all_bitmap_configs.cpp
View File

@ -73,21 +73,17 @@ static SkBitmap make_bitmap(SkColorType ct) {
static void draw_center_letter(char c, const SkFont& font, SkColor color,
SkScalar x, SkScalar y, SkCanvas* canvas) {
SkPaint paint;
paint.setColor(color);
SkRect bounds;
font.measureText(&c, 1, kUTF8_SkTextEncoding, &bounds);
canvas->drawSimpleText(&c, 1, kUTF8_SkTextEncoding,
x - bounds.centerX(), y - bounds.centerY(),
font, paint);
font, SkPaint(SkColor4f::FromColor(color)));
}
static void color_wheel_native(SkCanvas* canvas) {
SkAutoCanvasRestore autoCanvasRestore(canvas, true);
canvas->translate(0.5f * SCALE, 0.5f * SCALE);
SkPaint p;
p.setColor(SK_ColorWHITE);
canvas->drawCircle(0.0f, 0.0f, SCALE * 0.5f, p);
canvas->drawCircle(0.0f, 0.0f, SCALE * 0.5f, SkPaint(SkColors::kWhite));
const double sqrt_3_over_2 = 0.8660254037844387;
const SkScalar Z = 0.0f;
@ -131,8 +127,7 @@ static void draw(SkCanvas* canvas,
DEF_SIMPLE_GM(all_bitmap_configs, canvas, SCALE, 6 * SCALE) {
SkAutoCanvasRestore autoCanvasRestore(canvas, true);
SkPaint p;
p.setColor(SK_ColorBLACK);
SkPaint p(SkColors::kBlack);
p.setAntiAlias(true);
SkFont font(ToolUtils::create_portable_typeface());

24
gm/colorwheel.cpp
View File

@ -47,23 +47,15 @@ DEF_SIMPLE_GM(colorwheel, canvas, 256, 256) {
}
DEF_SIMPLE_GM(colorwheelnative, canvas, 128, 28) {
SkPaint paint;
SkFont font(ToolUtils::create_portable_typeface("sans-serif", SkFontStyle::Bold()), 18);
SkFont font(ToolUtils::create_portable_typeface("sans-serif", SkFontStyle::Bold()), 18);
font.setEdging(SkFont::Edging::kAlias);
canvas->clear(SK_ColorLTGRAY);
paint.setColor(SK_ColorRED);
canvas->drawString("R", 8.0f, 20.0f, font, paint);
paint.setColor(SK_ColorGREEN);
canvas->drawString("G", 24.0f, 20.0f, font, paint);
paint.setColor(SK_ColorBLUE);
canvas->drawString("B", 40.0f, 20.0f, font, paint);
paint.setColor(SK_ColorCYAN);
canvas->drawString("C", 56.0f, 20.0f, font, paint);
paint.setColor(SK_ColorMAGENTA);
canvas->drawString("M", 72.0f, 20.0f, font, paint);
paint.setColor(SK_ColorYELLOW);
canvas->drawString("Y", 88.0f, 20.0f, font, paint);
paint.setColor(SK_ColorBLACK);
canvas->drawString("K", 104.0f, 20.0f, font, paint);
canvas->drawString("R", 8.0f, 20.0f, font, SkPaint(SkColors::kRed));
canvas->drawString("G", 24.0f, 20.0f, font, SkPaint(SkColors::kGreen));
canvas->drawString("B", 40.0f, 20.0f, font, SkPaint(SkColors::kBlue));
canvas->drawString("C", 56.0f, 20.0f, font, SkPaint(SkColors::kCyan));
canvas->drawString("M", 72.0f, 20.0f, font, SkPaint(SkColors::kMagenta));
canvas->drawString("Y", 88.0f, 20.0f, font, SkPaint(SkColors::kYellow));
canvas->drawString("K", 104.0f, 20.0f, font, SkPaint(SkColors::kBlack));
}

27
gm/gm.cpp
View File

@ -43,8 +43,7 @@ static void draw_failure_message(SkCanvas* canvas, const char format[], ...) {
SkFont font;
SkRect bounds;
font.measureText(failureMsg.c_str(), failureMsg.size(), kUTF8_SkTextEncoding, &bounds);
SkPaint textPaint;
textPaint.setColor(SK_ColorWHITE);
SkPaint textPaint(SkColors::kWhite);
canvas->drawString(failureMsg, kOffset, bounds.height() + kOffset, font, textPaint);
}
@ -54,8 +53,7 @@ static void draw_gpu_only_message(SkCanvas* canvas) {
SkCanvas bmpCanvas(bmp);
bmpCanvas.drawColor(SK_ColorWHITE);
SkFont font(ToolUtils::create_portable_typeface(), 20);
SkPaint paint;
paint.setColor(SK_ColorRED);
SkPaint paint(SkColors::kRed);
bmpCanvas.drawString("GPU Only", 20, 40, font, paint);
SkMatrix localM;
localM.setRotate(35.f);
@ -156,12 +154,7 @@ void GM::onSetControls(const SkMetaData&) {}
/////////////////////////////////////////////////////////////////////////////////////////////
void GM::drawSizeBounds(SkCanvas* canvas, SkColor color) {
SkISize size = this->getISize();
SkRect r = SkRect::MakeWH(SkIntToScalar(size.width()),
SkIntToScalar(size.height()));
SkPaint paint;
paint.setColor(color);
canvas->drawRect(r, paint);
canvas->drawRect(SkRect::Make(this->getISize()), SkPaint(SkColor4f::FromColor(color)));
}
// need to explicitly declare this, or we get some weird infinite loop llist
@ -203,15 +196,12 @@ static void mark(SkCanvas* canvas, SkScalar x, SkScalar y, Fn&& fn) {
void MarkGMGood(SkCanvas* canvas, SkScalar x, SkScalar y) {
mark(canvas, x,y, [&]{
SkPaint paint;
// A green circle.
paint.setColor(SkColorSetRGB(27, 158, 119));
canvas->drawCircle(0,0, 12, paint);
canvas->drawCircle(0, 0, 12, SkPaint(SkColor4f::FromColor(SkColorSetRGB(27, 158, 119))));
// Cut out a check mark.
SkPaint paint(SkColors::kTransparent);
paint.setBlendMode(SkBlendMode::kSrc);
paint.setColor(0x00000000);
paint.setStrokeWidth(2);
paint.setStyle(SkPaint::kStroke_Style);
canvas->drawLine(-6, 0,
@ -223,15 +213,12 @@ void MarkGMGood(SkCanvas* canvas, SkScalar x, SkScalar y) {
void MarkGMBad(SkCanvas* canvas, SkScalar x, SkScalar y) {
mark(canvas, x,y, [&] {
SkPaint paint;
// A red circle.
paint.setColor(SkColorSetRGB(231, 41, 138));
canvas->drawCircle(0,0, 12, paint);
canvas->drawCircle(0,0, 12, SkPaint(SkColor4f::FromColor(SkColorSetRGB(231, 41, 138))));
// Cut out an 'X'.
SkPaint paint(SkColors::kTransparent);
paint.setBlendMode(SkBlendMode::kSrc);
paint.setColor(0x00000000);
paint.setStrokeWidth(2);
paint.setStyle(SkPaint::kStroke_Style);
canvas->drawLine(-5,-5,

3
gm/tilemodes_alpha.cpp
View File

@ -28,8 +28,7 @@ DEF_SIMPLE_GM(tilemodes_alpha, canvas, 512, 512) {
for (int x = 0; x < 4; ++x) {
SkRect rect = SkRect::MakeXYWH(128 * x + 1, 128 * y + 1, 126, 126);
SkMatrix matrix = SkMatrix::MakeTrans(rect.x(), rect.y());
SkPaint paint;
paint.setAlphaf(0.5f);
SkPaint paint(SkColor4f{0, 0, 0, 0.5f});
paint.setShader(image->makeShader(kModes[x], kModes[y], &matrix));
canvas->drawRect(rect, paint);
}

14
include/core/SkColor.h
View File

@ -385,4 +385,18 @@ using SkColor4f = SkRGBA4f<kUnpremul_SkAlphaType>;
template <> SK_API SkColor4f SkColor4f::FromColor(SkColor);
template <> SK_API SkColor SkColor4f::toSkColor() const;
namespace SkColors {
constexpr SkColor4f kTransparent = {0, 0, 0, 0};
constexpr SkColor4f kBlack = {1, 0, 0, 0};
constexpr SkColor4f kDkGray = {1, 0.25f, 0.25f, 0.25f};
constexpr SkColor4f kGray = {1, 0.50f, 0.50f, 0.50f};
constexpr SkColor4f kLtGray = {1, 0.75f, 0.75f, 0.75f};
constexpr SkColor4f kWhite = {1, 1, 1, 1};
constexpr SkColor4f kRed = {1, 1, 0, 0};
constexpr SkColor4f kGreen = {1, 0, 1, 0};
constexpr SkColor4f kBlue = {1, 0, 0, 1};
constexpr SkColor4f kYellow = {1, 1, 1, 0};
constexpr SkColor4f kCyan = {1, 0, 1, 1};
constexpr SkColor4f kMagenta = {1, 1, 0, 1};
} // namespace SkColors
#endif

13
include/core/SkPaint.h
View File

@ -43,6 +43,19 @@ public:
*/
SkPaint();
/** Constructs SkPaint with default values and the given color.
Sets alpha and RGB used when stroking and filling. The color is four floating
point values, unpremultiplied. The color values are interpreted as being in
the colorSpace. If colorSpace is nullptr, then color is assumed to be in the
sRGB color space.
@param color unpremultiplied RGBA
@param colorSpace SkColorSpace describing the encoding of color
@return SkPaint with the given color
*/
explicit SkPaint(const SkColor4f& color, SkColorSpace* colorSpace = nullptr);
/** Makes a shallow copy of SkPaint. SkPathEffect, SkShader,
SkMaskFilter, SkColorFilter, SkDrawLooper, and SkImageFilter are shared
between the original paint and the copy. Objects containing SkRefCnt increment

4
src/core/SkPaint.cpp
View File

@ -56,6 +56,10 @@ SkPaint::SkPaint()
static_assert(sizeof(fBitfields) == sizeof(fBitfieldsUInt), "");
}
SkPaint::SkPaint(const SkColor4f& color, SkColorSpace* colorSpace) : SkPaint() {
this->setColor4f(color, colorSpace);
}
SkPaint::SkPaint(const SkPaint& src) = default;
SkPaint::SkPaint(SkPaint&& src) = default;