include/images/SkImageRef.h - Issue 68973005: Expand pixelref to return SkImageInfo and rowbytes

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/images/SkImageRef.h

Issue 68973005: Expand pixelref to return SkImageInfo and rowbytes (Closed) Base URL: https://skia.googlecode.com/svn/trunk

Patch Set: add SK_SUPPORT_LEGACY_ONLOCKPIXELS so we can land in stages for Chrome Created 7 years 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/images/SkImageRef.h

diff --git a/include/images/SkImageRef.h b/include/images/SkImageRef.h

index 0599a8d9633dfe8a7284801b49b5d3efc78a8b9b..c20754e6125b95005e2bcacf07dca53368bd0af1 100644

--- a/include/images/SkImageRef.h

+++ b/include/images/SkImageRef.h

@@ -72,9 +72,10 @@ protected:

When these are called, we will have already acquired the mutex!

- virtual void* onLockPixels(SkColorTable**);

+ virtual bool onGetInfo(SkImageInfo*) SK_OVERRIDE;

+ virtual bool onNewLockPixels(LockRec*) SK_OVERRIDE;

// override this in your subclass to clean up when we're unlocking pixels

- virtual void onUnlockPixels() {}

+ virtual void onUnlockPixels() SK_OVERRIDE {}

SkImageRef(SkFlattenableReadBuffer&, SkBaseMutex* mutex = NULL);

virtual void flatten(SkFlattenableWriteBuffer&) const SK_OVERRIDE;