Revert "Revert of https://codereview.chromium.org/110593003/"
authorreed@google.com <reed@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81>
Fri, 3 Jan 2014 17:58:57 +0000 (17:58 +0000)
committerreed@google.com <reed@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81>
Fri, 3 Jan 2014 17:58:57 +0000 (17:58 +0000)
commit927138977fa256a6719baf74221882555b24008f
treeb7dfd1d849aa0d6377f405b8ce5a583fb80f1172
parentd4bda508c9467b69fa45897474be45712080ce69
Revert "Revert of https://codereview.chromium.org/110593003/"

This reverts commit c7abb25b25ba8b97948371d2bf0a2e3e78468f73.

and fixes the ashmem break

BUG=

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

git-svn-id: http://skia.googlecode.com/svn/trunk@12887 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