diff options
| author |  reed <reed@google.com> | 2016-09-11 05:40:31 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2016-09-11 05:40:31 -0700 |
| commit | 46f2d0ad0d0e4f4cf0e7d6f158b3fb9fe4f615fa (patch) | |
| tree | 48161200c6632fa8a6dae2eca652e5cca758fb27 /src | |
| parent | dddbbda3f38e2d8c375dffac7a5d32ef400198df (diff) | |
use expected name for setDrawLooper/getDrawLooper
Needed for future pipe cl.
Next cl should be to guard the looper entirely (since its deprecated)
BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2326173002
TBR=
Review-Url: https://codereview.chromium.org/2326173002
Diffstat (limited to 'src')
| -rw-r--r-- | src/core/SkPaint.cpp | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/src/core/SkPaint.cpp b/src/core/SkPaint.cpp index 58d6a0f95c..42b1a532de 100644 --- a/src/core/SkPaint.cpp +++ b/src/core/SkPaint.cpp @@ -73,7 +73,7 @@ SkPaint::SkPaint(const SkPaint& src) , COPY(fMaskFilter) , COPY(fColorFilter) , COPY(fRasterizer) - , COPY(fLooper) + , COPY(fDrawLooper) , COPY(fImageFilter) , COPY(fTextSize) , COPY(fTextScaleX) @@ -94,7 +94,7 @@ SkPaint::SkPaint(SkPaint&& src) { MOVE(fMaskFilter); MOVE(fColorFilter); MOVE(fRasterizer); - MOVE(fLooper); + MOVE(fDrawLooper); MOVE(fImageFilter); MOVE(fTextSize); MOVE(fTextScaleX); @@ -121,7 +121,7 @@ SkPaint& SkPaint::operator=(const SkPaint& src) { ASSIGN(fMaskFilter); ASSIGN(fColorFilter); ASSIGN(fRasterizer); - ASSIGN(fLooper); + ASSIGN(fDrawLooper); ASSIGN(fImageFilter); ASSIGN(fTextSize); ASSIGN(fTextScaleX); @@ -148,7 +148,7 @@ SkPaint& SkPaint::operator=(SkPaint&& src) { MOVE(fMaskFilter); MOVE(fColorFilter); MOVE(fRasterizer); - MOVE(fLooper); + MOVE(fDrawLooper); MOVE(fImageFilter); MOVE(fTextSize); MOVE(fTextScaleX); @@ -171,7 +171,7 @@ bool operator==(const SkPaint& a, const SkPaint& b) { && EQUAL(fMaskFilter) && EQUAL(fColorFilter) && EQUAL(fRasterizer) - && EQUAL(fLooper) + && EQUAL(fDrawLooper) && EQUAL(fImageFilter) && EQUAL(fTextSize) && EQUAL(fTextScaleX) @@ -363,8 +363,9 @@ MOVE_FIELD(ColorFilter) MOVE_FIELD(Xfermode) MOVE_FIELD(PathEffect) MOVE_FIELD(MaskFilter) +MOVE_FIELD(DrawLooper) #undef MOVE_FIELD -void SkPaint::setLooper(sk_sp<SkDrawLooper> looper) { fLooper = std::move(looper); } +void SkPaint::setLooper(sk_sp<SkDrawLooper> looper) { fDrawLooper = std::move(looper); } #define SET_PTR(Field) \ Sk##Field* SkPaint::set##Field(Sk##Field* f) { \ @@ -2359,7 +2360,7 @@ static bool affects_alpha(const SkImageFilter* imf) { } bool SkPaint::nothingToDraw() const { - if (fLooper) { + if (fDrawLooper) { return false; } SkXfermode::Mode mode; |