src/lazy/SkCachingPixelRef.h - Issue 112603003: Reverting r12665 & r12666 (Remove duplicate impl for SkImageInfo flattening) due to Chromium/Blink …

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/SkCachingPixelRef.h

Issue 112603003: Reverting r12665 & r12666 (Remove duplicate impl for SkImageInfo flattening) due to Chromium/Blink … (Closed) Base URL: http://skia.googlecode.com/svn/trunk/

Patch Set: 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:

View side-by-side diff with in-line comments

Download patch

Index: src/lazy/SkCachingPixelRef.h

===================================================================

--- src/lazy/SkCachingPixelRef.h (revision 12666)

+++ src/lazy/SkCachingPixelRef.h (working copy)

@@ -40,7 +40,7 @@

protected:

virtual ~SkCachingPixelRef();

- virtual bool onNewLockPixels(LockRec*) SK_OVERRIDE;

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

virtual void onUnlockPixels() SK_OVERRIDE;

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

@@ -58,12 +58,12 @@

SkImageGenerator* const fImageGenerator;

bool fErrorInDecoding;

void* fScaledCacheId;

+ const SkImageInfo fInfo;

const size_t fRowBytes;

SkCachingPixelRef(SkImageGenerator* imageGenerator,

const SkImageInfo& info,

size_t rowBytes);

typedef SkPixelRef INHERITED;

};

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