diff options
| author |  reed <reed@google.com> | 2015-05-06 10:16:02 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2015-05-06 10:16:02 -0700 |
| commit | 06dad4b92f1fcb593bc686f9537d3e0d866b2241 (patch) | |
| tree | 3b97c5085b52d904c52f497db74a3acef6226bb2 /src/core/SkPaintPriv.cpp | |
| parent | d9b6be197fe9cc75e068aaaf941455c13b2e38c3 (diff) | |
Revert of Revert of Revert of Make drawImage a virtual on SkDevice (patchset #1 id:1 of https://codereview.chromium.org/1126273002/)
Reason for revert:
still breaking webglconformance
Original issue's description:
> 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:
>
> Committed: https://skia.googlesource.com/skia/+/620ba3afe09d4173c87537040fe50c1c1895fb1a
TBR=robertphillips@google.com,mtklein@google.com,reed@chromium.org
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=skia:
Review URL: https://codereview.chromium.org/1127993004
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); -} |