Revert "Revert "Revert "Revert of https://codereview.chromium.org/110593003/"""
authorreed@google.com <reed@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81>
Mon, 6 Jan 2014 17:08:27 +0000 (17:08 +0000)
committerreed@google.com <reed@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81>
Mon, 6 Jan 2014 17:08:27 +0000 (17:08 +0000)
commitd0419b1fe781ed21d4aa0dc80df6b3e79ed37e46
treef05a83dc474cb6e40d4aee25bbe7bb59a692e933
parent86b39f311e174ddbd0d2f8de8d18dd45a8a2334f
Revert "Revert "Revert "Revert of https://codereview.chromium.org/110593003/"""

This reverts commit aaa89649590323fe40f52439d9a9a3376bb3b8ae.

BUG=

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

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