diff options
| author |  reed <reed@chromium.org> | 2015-05-05 17:30:45 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2015-05-05 17:30:45 -0700 |
| commit | 3538e3bfe2e00bc1b5b48d977fa7adff64d8c96b (patch) | |
| tree | 215ee85419b07a42e582d46eae24352b4d3a7940 /src/core/SkPaintPriv.cpp | |
| parent | d96a67bcb196aa4f73ff773bd45810a94ca872d8 (diff) | |
Revert of Make drawImage a virtual on SkDevice (patchset #4 id:60001 of https://codereview.chromium.org/1122643005/)
Reason for revert:
speculative to see if it unblocks DEPS roll
Original issue's description:
> Make drawImage a virtual on SkDevice
>
> Now with patch for SkDeferredCanvas
>
> This reverts commit 119468b71f8f4f45657ab30ead331be665de5a57.
>
> BUG=skia:
>
> Committed: https://skia.googlesource.com/skia/+/14fe8fd3e53b5e988aac189a8bc3ed28904d85c8
TBR=robertphillips@google.com,mtklein@google.com,reed@google.com
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=skia:
Review URL: https://codereview.chromium.org/1124003002
Diffstat (limited to 'src/core/SkPaintPriv.cpp')
| -rw-r--r-- | src/core/SkPaintPriv.cpp | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/src/core/SkPaintPriv.cpp b/src/core/SkPaintPriv.cpp index 3ced573929..c6957cd1ca 100644 --- a/src/core/SkPaintPriv.cpp +++ b/src/core/SkPaintPriv.cpp @@ -9,7 +9,6 @@ #include "SkBitmap.h" #include "SkColorFilter.h" -#include "SkImage.h" #include "SkPaint.h" #include "SkShader.h" @@ -50,8 +49,3 @@ bool isPaintOpaque(const SkPaint* paint, const SkBitmap* bmpReplacesShader) { return isPaintOpaque(paint, contentType); } - -bool isPaintOpaque(const SkPaint* paint, const SkImage* image) { - return isPaintOpaque(paint, image->isOpaque() ? - kOpaque_SkPaintBitmapOpacity : kUnknown_SkPaintBitmapOpacity); -} |