6b3155c4be0476bc53541b0431c368a44e69f0a7 - platform/external/skia

commit	6b3155c4be0476bc53541b0431c368a44e69f0a7	[log] [tgz]
author	Mike Reed <reed@google.com>	Mon Apr 03 14:41:44 2017 -0400
committer	Skia Commit-Bot <skia-commit-bot@chromium.org>	Mon Apr 03 19:29:38 2017 +0000
tree	2de5a87716b38a587c475731df815e5c8178e133
parent	2db3232c88cbaec5585f263111f334ca7272fe10 [diff]

Revert[4] "clean up (partially) colortable api""""

Fixes:
- create temp api for android to pass nullptr
- don't release and access sk_sp<SkData> at the same time in parameters

This reverts commit b14131c1851eea6acbd34cc42a8f860daed36b21.

Bug: skia:
Change-Id: Ic0e4f62520ba9f35455499ed30d306ad19d998a8
Reviewed-on: https://skia-review.googlesource.com/11129
Commit-Queue: Mike Reed <reed@google.com>
Reviewed-by: Matt Sarett <msarett@google.com>

bench/BitmapBench.cpp[diff]
bench/RepeatTileBench.cpp[diff]
dm/DMSrcSink.cpp[diff]
fuzz/fuzz.cpp[diff]
gm/all_bitmap_configs.cpp[diff]
gm/bitmapfilters.cpp[diff]
gm/encode-srgb.cpp[diff]
gm/image_pict.cpp[diff]
gm/tinybitmap.cpp[diff]
gn/android_framework_defines.gni[diff]
include/core/SkBitmap.h[diff]
include/core/SkColorTable.h[diff]
include/core/SkMallocPixelRef.h[diff]
public.bzl[diff]
samplecode/SampleBlur.cpp[diff]
samplecode/SampleDitherBitmap.cpp[diff]
samplecode/SampleFilter.cpp[diff]
samplecode/SampleTinyBitmap.cpp[diff]
src/core/SkBitmap.cpp[diff]
src/core/SkBitmapDevice.cpp[diff]
src/core/SkColorTable.cpp[diff]
src/core/SkImageCacherator.cpp[diff]
src/core/SkMallocPixelRef.cpp[diff]
src/core/SkSpecialSurface.cpp[diff]
src/effects/gradients/SkGradientShader.cpp[diff]
src/effects/gradients/SkGradientShaderPriv.h[diff]
src/image/SkSurface_Raster.cpp[diff]
tests/BitmapCopyTest.cpp[diff]
tests/BitmapTest.cpp[diff]
tests/CodecPriv.h[diff]
tests/CodecTest.cpp[diff]
tests/GifTest.cpp[diff]
tests/ImageTest.cpp[diff]
tests/MallocPixelRefTest.cpp[diff]
tests/PixelRefTest.cpp[diff]
tests/WritePixelsTest.cpp[diff]
tools/Resources.cpp[diff]

37 files changed

tree: 2de5a87716b38a587c475731df815e5c8178e133