aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/core/SkBitmapProcState.h
diff options
context:
space:
mode:
authorGravatar Brian Osman <brianosman@google.com>2016-11-08 17:08:54 -0500
committerGravatar Skia Commit-Bot <skia-commit-bot@chromium.org>2016-11-09 01:05:07 +0000
commit7b8400dad2f82dcc6ed3c7cc1707ebaf85f04840 (patch)
treedc1e131776fb1922b113f1a5e723205d8c13ccfe /src/core/SkBitmapProcState.h
parentc8b15684fe5b5b924b90091fedfbedf2806535e0 (diff)
Rename SkSourceGammaTreatment to SkDestinationSurfaceColorMode
This is much more explicit about what that type represents (are we in legacy mode or not), which also makes it suitable for other (upcoming) usage. BUG=skia: GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=4529 Change-Id: Iacb397c34e7765f1ca86c0195bc622b2be4d9acf Reviewed-on: https://skia-review.googlesource.com/4529 Commit-Queue: Brian Osman <brianosman@google.com> Reviewed-by: Brian Salomon <bsalomon@google.com>
Diffstat (limited to 'src/core/SkBitmapProcState.h')
-rw-r--r--src/core/SkBitmapProcState.h32
1 files changed, 16 insertions, 16 deletions
diff --git a/src/core/SkBitmapProcState.h b/src/core/SkBitmapProcState.h
index e2e4f96951..1818406f61 100644
--- a/src/core/SkBitmapProcState.h
+++ b/src/core/SkBitmapProcState.h
@@ -29,23 +29,23 @@ class SkPaint;
struct SkBitmapProcInfo {
SkBitmapProcInfo(const SkBitmapProvider&, SkShader::TileMode tmx, SkShader::TileMode tmy,
- SkSourceGammaTreatment);
+ SkDestinationSurfaceColorMode);
SkBitmapProcInfo(const SkBitmap&, SkShader::TileMode tmx, SkShader::TileMode tmy,
- SkSourceGammaTreatment);
+ SkDestinationSurfaceColorMode);
~SkBitmapProcInfo();
- const SkBitmapProvider fProvider;
+ const SkBitmapProvider fProvider;
- SkPixmap fPixmap;
- SkMatrix fInvMatrix; // This changes based on tile mode.
+ SkPixmap fPixmap;
+ SkMatrix fInvMatrix; // This changes based on tile mode.
// TODO: combine fInvMatrix and fRealInvMatrix.
- SkMatrix fRealInvMatrix; // The actual inverse matrix.
- SkColor fPaintColor;
- SkShader::TileMode fTileModeX;
- SkShader::TileMode fTileModeY;
- SkFilterQuality fFilterQuality;
- SkMatrix::TypeMask fInvType;
- SkSourceGammaTreatment fSrcGammaTreatment;
+ SkMatrix fRealInvMatrix; // The actual inverse matrix.
+ SkColor fPaintColor;
+ SkShader::TileMode fTileModeX;
+ SkShader::TileMode fTileModeY;
+ SkFilterQuality fFilterQuality;
+ SkMatrix::TypeMask fInvType;
+ SkDestinationSurfaceColorMode fColorMode;
bool init(const SkMatrix& inverse, const SkPaint&);
@@ -59,11 +59,11 @@ private:
struct SkBitmapProcState : public SkBitmapProcInfo {
SkBitmapProcState(const SkBitmapProvider& prov, SkShader::TileMode tmx, SkShader::TileMode tmy,
- SkSourceGammaTreatment treatment)
- : SkBitmapProcInfo(prov, tmx, tmy, treatment) {}
+ SkDestinationSurfaceColorMode colorMode)
+ : SkBitmapProcInfo(prov, tmx, tmy, colorMode) {}
SkBitmapProcState(const SkBitmap& bitmap, SkShader::TileMode tmx, SkShader::TileMode tmy,
- SkSourceGammaTreatment treatment)
- : SkBitmapProcInfo(bitmap, tmx, tmy, treatment) {}
+ SkDestinationSurfaceColorMode colorMode)
+ : SkBitmapProcInfo(bitmap, tmx, tmy, colorMode) {}
bool setup(const SkMatrix& inv, const SkPaint& paint) {
return this->init(inv, paint) && this->chooseProcs();