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/SkAAClip.cpp | |
| 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/SkAAClip.cpp')
| -rw-r--r-- | src/core/SkAAClip.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/core/SkAAClip.cpp b/src/core/SkAAClip.cpp index 19e94c8c86..e55451e3d9 100644 --- a/src/core/SkAAClip.cpp +++ b/src/core/SkAAClip.cpp @@ -1297,7 +1297,7 @@ public: void blitMask(const SkMask&, const SkIRect& clip) override { unexpected(); } - const SkPixmap* justAnOpaqueColor(uint32_t*) override { + const SkBitmap* justAnOpaqueColor(uint32_t*) override { return NULL; } @@ -2219,6 +2219,6 @@ void SkAAClipBlitter::blitMask(const SkMask& origMask, const SkIRect& clip) { } while (y < stopY); } -const SkPixmap* SkAAClipBlitter::justAnOpaqueColor(uint32_t* value) { +const SkBitmap* SkAAClipBlitter::justAnOpaqueColor(uint32_t* value) { return NULL; } |