aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/images/SkImageRef_ashmem.cpp
diff options
context:
space:
mode:
authorGravatar reed@google.com <reed@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81>2013-12-13 14:18:14 +0000
committerGravatar reed@google.com <reed@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81>2013-12-13 14:18:14 +0000
commit93b40594b78ab40170b5a7fa0811fa95ab8fc30f (patch)
treed53758c80a78befb760b718e3765972337a40fdb /src/images/SkImageRef_ashmem.cpp
parentc83a91f4721739f05f9df51d496d50b5d028b132 (diff)
Remvoe duplicate impl for SkImageInfo flattening
Add onNewLockPixels This reverts commit bb8eff6a70c52b7644391cfd4f4d21bf7294a6bf. BUG= Review URL: https://codereview.chromium.org/111323005 git-svn-id: http://skia.googlecode.com/svn/trunk@12665 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'src/images/SkImageRef_ashmem.cpp')
-rw-r--r--src/images/SkImageRef_ashmem.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/images/SkImageRef_ashmem.cpp b/src/images/SkImageRef_ashmem.cpp
index 9933ca9b4b..eaa875d48f 100644
--- a/src/images/SkImageRef_ashmem.cpp
+++ b/src/images/SkImageRef_ashmem.cpp
@@ -31,10 +31,10 @@ static size_t roundToPageSize(size_t size) {
return newsize;
}
-SkImageRef_ashmem::SkImageRef_ashmem(SkStreamRewindable* stream,
- SkBitmap::Config config,
- int sampleSize)
- : SkImageRef(stream, config, sampleSize) {
+SkImageRef_ashmem::SkImageRef_ashmem(const SkImageInfo& info,
+ SkStreamRewindable* stream,
+ int sampleSize)
+ : SkImageRef(info, stream, sampleSize) {
fRec.fFD = -1;
fRec.fAddr = NULL;