include/effects/SkMergeImageFilter.h - Issue 920513003: Make filters use SkImage instead of SkBitmap

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: include/effects/SkMergeImageFilter.h

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:

Index: include/effects/SkMergeImageFilter.h

diff --git a/include/effects/SkMergeImageFilter.h b/include/effects/SkMergeImageFilter.h

index 52ff9d77761d56c569813cc6a7bd90dc52e2bb50..ad8006a0d65d7a7154fd2888280deb561b35b233 100644

--- a/include/effects/SkMergeImageFilter.h

+++ b/include/effects/SkMergeImageFilter.h

@@ -38,8 +38,8 @@ protected:

const CropRect* cropRect);

void flatten(SkWriteBuffer&) const SK_OVERRIDE;

- virtual bool onFilterImage(Proxy*, const SkBitmap& src, const Context&,

- SkBitmap* result, SkIPoint* loc) const SK_OVERRIDE;

+ virtual bool onFilterImage(Proxy*, const SkImage* src, const Context&,

+ SkAutoTUnref<const SkImage>& result, SkIPoint* loc) const SK_OVERRIDE;

private:

uint8_t* fModes; // SkXfermode::Mode