diff options
| author |  robertphillips@google.com <robertphillips@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2013-12-13 15:24:37 +0000 |
|---|---|---|
| committer | robertphillips@google.com <robertphillips@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2013-12-13 15:24:37 +0000 |
| commit | 0daa1adb03b4b1fc11d854cb7754416ac05a31e8 (patch) | |
| tree | 65250ae1cb608dbebfa25e96c3c31335379ccd3a /src/images/SkImageRef_GlobalPool.cpp | |
| parent | 3c5f29a8a5f8113a831f132f1bb3d839d9fb285a (diff) | |
Reverting r12665 & r12666 (Remove duplicate impl for SkImageInfo flattening) due to Chromium/Blink compilation errors
https://codereview.chromium.org/112603003/
git-svn-id: http://skia.googlecode.com/svn/trunk@12667 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'src/images/SkImageRef_GlobalPool.cpp')
| -rw-r--r-- | src/images/SkImageRef_GlobalPool.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/images/SkImageRef_GlobalPool.cpp b/src/images/SkImageRef_GlobalPool.cpp index f91cebabbf..352dd42d9f 100644 --- a/src/images/SkImageRef_GlobalPool.cpp +++ b/src/images/SkImageRef_GlobalPool.cpp @@ -24,10 +24,10 @@ static SkImageRefPool* GetGlobalPool() { 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); |