diff options
author | reed <reed@google.com> | 2015-06-09 12:16:53 -0700 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2015-06-09 12:16:53 -0700 |
commit | 41e010cb901c0da9066c4df562030808c9ccd7f8 (patch) | |
tree | 3bf17e946f9eadd43040ea6968adcfa5f2f882a4 /src/core/SkBlitter.cpp | |
parent | 1831f990c31bad0d84641663c96aa8eebf846ab9 (diff) |
Revert[2] SkDraw and all Blitters to use pixmap instead of bitmapi
This reverts commit b3f0ec9f9967da2f80f0d842cb7fd53617b48de3.
BUG=skia:
Review URL: https://codereview.chromium.org/1168303006
Diffstat (limited to 'src/core/SkBlitter.cpp')
-rw-r--r-- | src/core/SkBlitter.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/core/SkBlitter.cpp b/src/core/SkBlitter.cpp index 2ac7b51180..59078d6a87 100644 --- a/src/core/SkBlitter.cpp +++ b/src/core/SkBlitter.cpp @@ -33,7 +33,7 @@ SkShader::Context* SkBlitter::getShaderContext() const { return NULL; } -const SkBitmap* SkBlitter::justAnOpaqueColor(uint32_t* value) { +const SkPixmap* SkBlitter::justAnOpaqueColor(uint32_t* value) { return NULL; } @@ -243,7 +243,7 @@ void SkNullBlitter::blitRect(int x, int y, int width, int height) {} void SkNullBlitter::blitMask(const SkMask& mask, const SkIRect& clip) {} -const SkBitmap* SkNullBlitter::justAnOpaqueColor(uint32_t* value) { +const SkPixmap* SkNullBlitter::justAnOpaqueColor(uint32_t* value) { return NULL; } @@ -404,7 +404,7 @@ void SkRectClipBlitter::blitMask(const SkMask& mask, const SkIRect& clip) { } } -const SkBitmap* SkRectClipBlitter::justAnOpaqueColor(uint32_t* value) { +const SkPixmap* SkRectClipBlitter::justAnOpaqueColor(uint32_t* value) { return fBlitter->justAnOpaqueColor(value); } @@ -540,7 +540,7 @@ void SkRgnClipBlitter::blitMask(const SkMask& mask, const SkIRect& clip) { } } -const SkBitmap* SkRgnClipBlitter::justAnOpaqueColor(uint32_t* value) { +const SkPixmap* SkRgnClipBlitter::justAnOpaqueColor(uint32_t* value) { return fBlitter->justAnOpaqueColor(value); } @@ -778,7 +778,7 @@ private: #include "SkCoreBlitters.h" -SkBlitter* SkBlitter::Choose(const SkBitmap& device, +SkBlitter* SkBlitter::Choose(const SkPixmap& device, const SkMatrix& matrix, const SkPaint& origPaint, SkTBlitterAllocator* allocator, @@ -944,7 +944,7 @@ private: typedef SkShader::Context INHERITED; }; -SkShaderBlitter::SkShaderBlitter(const SkBitmap& device, const SkPaint& paint, +SkShaderBlitter::SkShaderBlitter(const SkPixmap& device, const SkPaint& paint, SkShader::Context* shaderContext) : INHERITED(device) , fShader(paint.getShader()) |