Revert[4] "clean up (partially) colortable api""""
authorMike Reed <reed@google.com>
Mon, 3 Apr 2017 18:41:44 +0000 (14:41 -0400)
committerSkia Commit-Bot <skia-commit-bot@chromium.org>
Mon, 3 Apr 2017 19:29:38 +0000 (19:29 +0000)
commit6b3155c4be0476bc53541b0431c368a44e69f0a7
tree2de5a87716b38a587c475731df815e5c8178e133
parent2db3232c88cbaec5585f263111f334ca7272fe10
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>
37 files changed:
bench/BitmapBench.cpp
bench/RepeatTileBench.cpp
dm/DMSrcSink.cpp
fuzz/fuzz.cpp
gm/all_bitmap_configs.cpp
gm/bitmapfilters.cpp
gm/encode-srgb.cpp
gm/image_pict.cpp
gm/tinybitmap.cpp
gn/android_framework_defines.gni
include/core/SkBitmap.h
include/core/SkColorTable.h
include/core/SkMallocPixelRef.h
public.bzl
samplecode/SampleBlur.cpp
samplecode/SampleDitherBitmap.cpp
samplecode/SampleFilter.cpp
samplecode/SampleTinyBitmap.cpp
src/core/SkBitmap.cpp
src/core/SkBitmapDevice.cpp
src/core/SkColorTable.cpp
src/core/SkImageCacherator.cpp
src/core/SkMallocPixelRef.cpp
src/core/SkSpecialSurface.cpp
src/effects/gradients/SkGradientShader.cpp
src/effects/gradients/SkGradientShaderPriv.h
src/image/SkSurface_Raster.cpp
tests/BitmapCopyTest.cpp
tests/BitmapTest.cpp
tests/CodecPriv.h
tests/CodecTest.cpp
tests/GifTest.cpp
tests/ImageTest.cpp
tests/MallocPixelRefTest.cpp
tests/PixelRefTest.cpp
tests/WritePixelsTest.cpp
tools/Resources.cpp