src/lazy/SkDiscardablePixelRef.h - Issue 119753009: Revert of Add onNewLockPixels, that returns rowbytes and relies on info in pixelref

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: src/lazy/SkDiscardablePixelRef.h

Issue 119753009: Revert of Add onNewLockPixels, that returns rowbytes and relies on info in pixelref (Closed) Base URL: https://skia.googlecode.com/svn/trunk

Patch Set: Created 6 years, 12 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

Index: src/lazy/SkDiscardablePixelRef.h

diff --git a/src/lazy/SkDiscardablePixelRef.h b/src/lazy/SkDiscardablePixelRef.h

index 4a013fda031abd456ce03f01edb7e7824495833d..3367096c266793f6b38756c6c43c50f34f275c81 100644

--- a/src/lazy/SkDiscardablePixelRef.h

+++ b/src/lazy/SkDiscardablePixelRef.h

@@ -28,8 +28,7 @@

protected:

~SkDiscardablePixelRef();

- virtual bool onNewLockPixels(LockRec*) SK_OVERRIDE;

+ virtual void* onLockPixels(SkColorTable**) SK_OVERRIDE;

virtual void onUnlockPixels() SK_OVERRIDE;

virtual bool onLockPixelsAreWritable() const SK_OVERRIDE { return false; }

@@ -50,12 +49,9 @@

SkDiscardablePixelRef(const SkImageInfo&, SkImageGenerator*,

size_t rowBytes,

SkDiscardableMemory::Factory* factory);

friend bool SkInstallDiscardablePixelRef(SkImageGenerator*,

SkBitmap*,

SkDiscardableMemory::Factory*);

typedef SkPixelRef INHERITED;

};

#endif // SkDiscardablePixelRef_DEFINED

« no previous file with comments | « src/lazy/SkCachingPixelRef.cpp ('k') | src/lazy/SkDiscardablePixelRef.cpp » ('j') | no next file with comments »