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/SkBlitMask.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/SkBlitMask.h')
| -rw-r--r-- | src/core/SkBlitMask.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/core/SkBlitMask.h b/src/core/SkBlitMask.h index 3fc306f8c8..32db43c3d8 100644 --- a/src/core/SkBlitMask.h +++ b/src/core/SkBlitMask.h @@ -8,9 +8,9 @@ #ifndef SkBlitMask_DEFINED #define SkBlitMask_DEFINED +#include "SkBitmap.h" #include "SkColor.h" #include "SkMask.h" -#include "SkPixmap.h" class SkBlitMask { public: @@ -18,7 +18,7 @@ public: * Returns true if the device config and mask format were supported. * else return false (nothing was drawn) */ - static bool BlitColor(const SkPixmap& device, const SkMask& mask, + static bool BlitColor(const SkBitmap& device, const SkMask& mask, const SkIRect& clip, SkColor color); /** |