diff options
| author |  reed <reed@google.com> | 2015-05-06 07:54:38 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2015-05-06 07:54:38 -0700 |
| commit | 620ba3afe09d4173c87537040fe50c1c1895fb1a (patch) | |
| tree | 0f0fb4d37186651d783bd794390f950e7adaaac0 /src/core/SkPaintPriv.h | |
| parent | 7882924c10fadaed427b6aa65dc7aa6577b94f32 (diff) | |
Revert of Revert of Make drawImage a virtual on SkDevice (patchset #1 id:1 of https://codereview.chromium.org/1124003002/)
Reason for revert:
retry now that some fixes (onDrawImage overrides) have landed in chrome/blink
Original issue's description:
> 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:
>
> Committed: https://skia.googlesource.com/skia/+/3538e3bfe2e00bc1b5b48d977fa7adff64d8c96b
TBR=robertphillips@google.com,mtklein@google.com,reed@chromium.org
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=skia:
Review URL: https://codereview.chromium.org/1126273002
Diffstat (limited to 'src/core/SkPaintPriv.h')
| -rw-r--r-- | src/core/SkPaintPriv.h | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/src/core/SkPaintPriv.h b/src/core/SkPaintPriv.h index 88fc4fc349..be441b8f72 100644 --- a/src/core/SkPaintPriv.h +++ b/src/core/SkPaintPriv.h @@ -8,11 +8,12 @@ #ifndef SkPaintPriv_DEFINED #define SkPaintPriv_DEFINED +#include "SkTypes.h" + class SkBitmap; +class SkImage; class SkPaint; -#include "SkTypes.h" - enum SkPaintBitmapOpacity { // No content replaces the paint's color kNoBitmap_SkPaintBitmapOpacity = 0, @@ -40,6 +41,7 @@ bool isPaintOpaque(const SkPaint* paint, SkPaintBitmapOpacity contentType); shader. @return true if paint is opaque */ -bool isPaintOpaque(const SkPaint* paint, - const SkBitmap* bmpReplacesShader = NULL); +bool isPaintOpaque(const SkPaint* paint, const SkBitmap* bmpReplacesShader = NULL); +bool isPaintOpaque(const SkPaint* paint, const SkImage* image); + #endif |