src/images/SkImageRef_GlobalPool.cpp - 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/images/SkImageRef_GlobalPool.cpp

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/images/SkImageRef_GlobalPool.cpp

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

--- src/images/SkImageRef_GlobalPool.cpp (revision 12666)

+++ src/images/SkImageRef_GlobalPool.cpp (working copy)

@@ -24,10 +24,10 @@

return gPool;

}

-SkImageRef_GlobalPool::SkImageRef_GlobalPool(const SkImageInfo& info,

- SkStreamRewindable* stream,

+SkImageRef_GlobalPool::SkImageRef_GlobalPool(SkStreamRewindable* stream,

+ SkBitmap::Config config,

int sampleSize)

- : SkImageRef(info, stream, sampleSize, &gGlobalPoolMutex) {

+ : SkImageRef(stream, config, sampleSize, &gGlobalPoolMutex) {

SkASSERT(&gGlobalPoolMutex == this->mutex());

SkAutoMutexAcquire ac(gGlobalPoolMutex);

GetGlobalPool()->addToHead(this);

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