0daa1adb03b4b1fc11d854cb7754416ac05a31e8 - platform/external/skia

commit	0daa1adb03b4b1fc11d854cb7754416ac05a31e8	[log] [tgz]
author	robertphillips@google.com <robertphillips@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81>	Fri Dec 13 15:24:37 2013 +0000
committer	robertphillips@google.com <robertphillips@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81>	Fri Dec 13 15:24:37 2013 +0000
tree	65250ae1cb608dbebfa25e96c3c31335379ccd3a
parent	3c5f29a8a5f8113a831f132f1bb3d839d9fb285a [diff]

Reverting r12665 & r12666 (Remove duplicate impl for SkImageInfo flattening) due to Chromium/Blink compilation errors

https://codereview.chromium.org/112603003/



git-svn-id: http://skia.googlecode.com/svn/trunk@12667 2bbb7eff-a529-9590-31e7-b0007b416f81

include/core/SkBitmapDevice.h[diff]
include/core/SkMallocPixelRef.h[diff]
include/core/SkPicture.h[diff]
include/core/SkPixelRef.h[diff]
include/gpu/GrSurface.h[diff]
include/gpu/SkGr.h[diff]
include/gpu/SkGrPixelRef.h[diff]
include/images/SkImageRef.h[diff]
include/images/SkImageRef_GlobalPool.h[diff]
samplecode/SamplePicture.cpp[diff]
src/core/SkBitmap.cpp[diff]
src/core/SkBitmapDevice.cpp[diff]
src/core/SkImageFilterUtils.cpp[diff]
src/core/SkMallocPixelRef.cpp[diff]
src/core/SkMaskFilter.cpp[diff]
src/core/SkPixelRef.cpp[diff]
src/effects/gradients/SkGradientShader.cpp[diff]
src/gpu/GrSurface.cpp[diff]
src/gpu/SkGpuDevice.cpp[diff]
src/gpu/SkGr.cpp[diff]
src/gpu/SkGrPixelRef.cpp[diff]
src/image/SkDataPixelRef.cpp[diff]
src/image/SkDataPixelRef.h[diff]
src/image/SkImage_Raster.cpp[diff]
src/image/SkSurface_Raster.cpp[diff]
src/images/SkImageRef.cpp[diff]
src/images/SkImageRef_GlobalPool.cpp[diff]
src/images/SkImageRef_ashmem.cpp[diff]
src/images/SkImageRef_ashmem.h[diff]
src/lazy/SkCachingPixelRef.cpp[diff]
src/lazy/SkCachingPixelRef.h[diff]
src/lazy/SkDiscardablePixelRef.cpp[diff]
src/lazy/SkDiscardablePixelRef.h[diff]
tests/PictureTest.cpp[diff]
tests/PixelRefTest.cpp[diff]
tests/SerializationTest.cpp[diff]

36 files changed

tree: 65250ae1cb608dbebfa25e96c3c31335379ccd3a