diff options
author | 2013-12-06 21:43:05 +0000 | |
---|---|---|
committer | 2013-12-06 21:43:05 +0000 | |
commit | 2ebc10dd12a6fe55fda37a9bd5b1e0c1c1e08232 (patch) | |
tree | aa813ad903bfbe78fc82c6e5d97d06111fecd119 /src/images/SkImageRef_GlobalPool.cpp | |
parent | 473f0aa2bb218e50fce5e19063f8c8fdaf57fad4 (diff) |
Revert "Revert "Revert "PixelRef now returns (nearly) everything that is currently in SkBitmap. The goal is to refactor bitmap later to remove redundancy, and more interestingly, remove the chance for a disconnect between the actual (pixelref) rowbytes and config, and the one claimed by the bitmap."""
This reverts commit 5f035e90d6dea0139a4f204b634e7b7b3b4976d7.
Reverting because it breaks chrome/blink due to new SkPixelRef constructor arg.
BUG=
Review URL: https://codereview.chromium.org/108993002
git-svn-id: http://skia.googlecode.com/svn/trunk@12551 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); |