Revert "Revert "Revert of https://codereview.chromium.org/110593003/""
authorreed@google.com <reed@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81>
Mon, 6 Jan 2014 13:34:39 +0000 (13:34 +0000)
committerreed@google.com <reed@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81>
Mon, 6 Jan 2014 13:34:39 +0000 (13:34 +0000)
commitba82bd11e2c055f885b2327aa230d2dac8b53f03
tree8e838e01d55b7a6d9ac811d00826d9a38e290f12
parent452eecb4436f27e057d4d2df26e3a70020a817b6
Revert "Revert "Revert of https://codereview.chromium.org/110593003/""

This reverts commit 0fef787f33aa38109a0c8427e0098d997efdd5ff.

failed in chrome: https://codereview.chromium.org/124503002/

Review URL: https://codereview.chromium.org/105523008

git-svn-id: http://skia.googlecode.com/svn/trunk@12906 2bbb7eff-a529-9590-31e7-b0007b416f81
17 files changed:
include/core/SkBitmapDevice.h
include/core/SkMallocPixelRef.h
include/core/SkPixelRef.h
include/gpu/SkGrPixelRef.h
include/images/SkImageRef.h
src/core/SkBitmapDevice.cpp
src/core/SkMallocPixelRef.cpp
src/core/SkPixelRef.cpp
src/core/SkScaledImageCache.cpp
src/gpu/SkGrPixelRef.cpp
src/images/SkImageRef.cpp
src/images/SkImageRef_ashmem.cpp
src/images/SkImageRef_ashmem.h
src/lazy/SkCachingPixelRef.cpp
src/lazy/SkCachingPixelRef.h
src/lazy/SkDiscardablePixelRef.cpp
src/lazy/SkDiscardablePixelRef.h