diff options
| author |  reed <reed@chromium.org> | 2015-06-08 19:58:07 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2015-06-08 19:58:07 -0700 |
| commit | b3f0ec9f9967da2f80f0d842cb7fd53617b48de3 (patch) | |
| tree | f00f2095e30e48180a2a3a073be5bf1a1fe3f4c2 /src/core/SkBlitter.h | |
| parent | 86ae0a9e465f157eaa263ef7515e10619946ff83 (diff) | |
Revert of change SkDraw and all Blitters to use pixmap instead of bitmap (patchset #6 id:100001 of https://codereview.chromium.org/1148793007/)
Reason for revert:
speculative revert to try to unblock DEPS roll
Original issue's description:
> change SkDraw and all Blitters to use pixmap instead of bitmap
>
> BUG=skia:
>
> Committed: https://skia.googlesource.com/skia/+/c31af44336f5eb4a50e83e76e51962d46c3ed458
TBR=scroggo@google.com,jvanverth@google.com,reed@google.com
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=skia:
Review URL: https://codereview.chromium.org/1164373003
Diffstat (limited to 'src/core/SkBlitter.h')
| -rw-r--r-- | src/core/SkBlitter.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/core/SkBlitter.h b/src/core/SkBlitter.h index b8126c24c6..695585a798 100644 --- a/src/core/SkBlitter.h +++ b/src/core/SkBlitter.h @@ -8,11 +8,11 @@ #ifndef SkBlitter_DEFINED #define SkBlitter_DEFINED +#include "SkBitmap.h" #include "SkBitmapProcShader.h" #include "SkMask.h" #include "SkMatrix.h" #include "SkPaint.h" -#include "SkPixmap.h" #include "SkRefCnt.h" #include "SkRegion.h" #include "SkShader.h" @@ -51,7 +51,7 @@ public: bitmap it draws into, and assign value. If not, return NULL and ignore the value parameter. */ - virtual const SkPixmap* justAnOpaqueColor(uint32_t* value); + virtual const SkBitmap* justAnOpaqueColor(uint32_t* value); // (x, y), (x + 1, y) virtual void blitAntiH2(int x, int y, U8CPU a0, U8CPU a1) { @@ -122,7 +122,7 @@ public: /** @name Factories Return the correct blitter to use given the specified context. */ - static SkBlitter* Choose(const SkPixmap& dst, + static SkBlitter* Choose(const SkBitmap& device, const SkMatrix& matrix, const SkPaint& paint, SkTBlitterAllocator*, @@ -152,7 +152,7 @@ public: void blitV(int x, int y, int height, SkAlpha alpha) override; void blitRect(int x, int y, int width, int height) override; void blitMask(const SkMask&, const SkIRect& clip) override; - const SkPixmap* justAnOpaqueColor(uint32_t* value) override; + const SkBitmap* justAnOpaqueColor(uint32_t* value) override; bool isNullBlitter() const override; }; @@ -176,7 +176,7 @@ public: virtual void blitAntiRect(int x, int y, int width, int height, SkAlpha leftAlpha, SkAlpha rightAlpha) override; void blitMask(const SkMask&, const SkIRect& clip) override; - const SkPixmap* justAnOpaqueColor(uint32_t* value) override; + const SkBitmap* justAnOpaqueColor(uint32_t* value) override; int requestRowsPreserved() const override { return fBlitter->requestRowsPreserved(); @@ -211,7 +211,7 @@ public: virtual void blitAntiRect(int x, int y, int width, int height, SkAlpha leftAlpha, SkAlpha rightAlpha) override; void blitMask(const SkMask&, const SkIRect& clip) override; - const SkPixmap* justAnOpaqueColor(uint32_t* value) override; + const SkBitmap* justAnOpaqueColor(uint32_t* value) override; int requestRowsPreserved() const override { return fBlitter->requestRowsPreserved(); |