From 620ba3afe09d4173c87537040fe50c1c1895fb1a Mon Sep 17 00:00:00 2001 From: reed Date: Wed, 6 May 2015 07:54:38 -0700 Subject: 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 --- src/core/SkPaintPriv.h | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'src/core/SkPaintPriv.h') 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 -- cgit v1.2.3