Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(554)

Unified Diff: src/effects/SkDropShadowImageFilter.cpp

Issue 920513003: Make filters use SkImage instead of SkBitmap Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: Created 5 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « src/effects/SkDisplacementMapEffect.cpp ('k') | src/effects/SkLightingImageFilter.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: src/effects/SkDropShadowImageFilter.cpp
diff --git a/src/effects/SkDropShadowImageFilter.cpp b/src/effects/SkDropShadowImageFilter.cpp
index c453411d8064b4901bdca1f49d13cabdcd21a2fd..3dd9081561125ce2f7a80edc8e0ae0dda882ed2e 100644
--- a/src/effects/SkDropShadowImageFilter.cpp
+++ b/src/effects/SkDropShadowImageFilter.cpp
@@ -53,13 +53,14 @@ void SkDropShadowImageFilter::flatten(SkWriteBuffer& buffer) const {
buffer.writeInt(static_cast<int>(fShadowMode));
}
-bool SkDropShadowImageFilter::onFilterImage(Proxy* proxy, const SkBitmap& source,
+bool SkDropShadowImageFilter::onFilterImage(Proxy* proxy, const SkImage* source,
const Context& ctx,
- SkBitmap* result, SkIPoint* offset) const
+ SkAutoTUnref<const SkImage>& result,
+ SkIPoint* offset) const
{
- SkBitmap src = source;
+ SkAutoTUnref<const SkImage> src(SkRef(source));
SkIPoint srcOffset = SkIPoint::Make(0, 0);
- if (getInput(0) && !getInput(0)->filterImage(proxy, source, ctx, &src, &srcOffset))
+ if (getInput(0) && !getInput(0)->filterImage(proxy, source, ctx, src, &srcOffset))
return false;
SkIRect bounds;
@@ -88,11 +89,17 @@ bool SkDropShadowImageFilter::onFilterImage(Proxy* proxy, const SkBitmap& source
ctx.ctm().mapVectors(&offsetVec, 1);
canvas.translate(SkIntToScalar(srcOffset.fX - bounds.fLeft),
SkIntToScalar(srcOffset.fY - bounds.fTop));
- canvas.drawBitmap(src, offsetVec.fX, offsetVec.fY, &paint);
+ canvas.drawImage(src, offsetVec.fX, offsetVec.fY, &paint);
if (fShadowMode == kDrawShadowAndForeground_ShadowMode) {
- canvas.drawBitmap(src, 0, 0);
+ canvas.drawImage(src, 0, 0);
}
- *result = device->accessBitmap(false);
+
+ SkImage* image = device->newImageSnapshot();
+ if (NULL == image) {
+ return false;
+ }
+ result.reset(image);
+
offset->fX = bounds.fLeft;
offset->fY = bounds.fTop;
return true;
« no previous file with comments | « src/effects/SkDisplacementMapEffect.cpp ('k') | src/effects/SkLightingImageFilter.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698