Revert 248ff023 & 2cb6cb72
authorHal Canary <halcanary@google.com>
Tue, 22 Nov 2016 21:21:38 +0000 (14:21 -0700)
committerSkia Commit-Bot <skia-commit-bot@chromium.org>
Tue, 22 Nov 2016 21:23:51 +0000 (21:23 +0000)
commita2b4bdce8cfd1a91407595a25683ecff982af22e
tree2e8fad7d92be4e8a024db784747944d110a80123
parent6b77f1cf09f6a3c47a42e29dc28087ac9f9cdb25
Revert 248ff023 & 2cb6cb72

Revert "SkImageEncoder: simplify API"
This reverts commit 248ff02331d7f73ee4b6c5a7eabeae1080c16cd4.
Revert "Fix bug: can't convert nullptr -> bool"
This reverts commit 2cb6cb7218171b357bb5c934f032ba69c7b78401.
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=5151
NOTRY=true

Change-Id: I5f6414392d6545f74db0b5bb50608d04f053a8ec
Reviewed-on: https://skia-review.googlesource.com/5151
Commit-Queue: Hal Canary <halcanary@google.com>
Reviewed-by: Hal Canary <halcanary@google.com>
67 files changed:
BUILD.gn
bench/EncoderBench.cpp
bench/GLBench.cpp
bench/nanobench.cpp
cmake/example.cpp
debugger/QT/SkDebuggerGUI.cpp
dm/DM.cpp
fuzz/fuzz.cpp
gm/encode-platform.cpp
gm/encode.cpp
gm/image.cpp
gm/image_shader.cpp
gn/android_framework_defines.gni
include/codec/SkAndroidCodec.h
include/codec/SkCodec.h
include/codec/SkEncodedFormat.h
include/core/SkEncodedImageFormat.h [deleted file]
include/core/SkImage.h
include/core/SkImageEncoder.h
public.bzl
samplecode/SampleApp.cpp
samplecode/SampleSlides.cpp
src/android/SkBitmapRegionCodec.h
src/android/SkBitmapRegionDecoder.cpp
src/animator/SkSnapshot.cpp
src/animator/SkSnapshot.h
src/codec/SkAndroidCodec.cpp
src/codec/SkBmpCodec.h
src/codec/SkGifCodec.h
src/codec/SkIcoCodec.h
src/codec/SkJpegCodec.h
src/codec/SkPngCodec.h
src/codec/SkRawAdapterCodec.h
src/codec/SkRawCodec.h
src/codec/SkSampledCodec.cpp
src/codec/SkWbmpCodec.cpp
src/codec/SkWbmpCodec.h
src/codec/SkWebpCodec.h
src/gpu/GrSurface.cpp
src/image/SkImage.cpp
src/images/SkForceLinking.cpp
src/images/SkImageEncoder.cpp
src/images/SkImageEncoderPriv.h [deleted file]
src/images/SkImageEncoder_Factory.cpp
src/images/SkJPEGImageEncoder.cpp
src/images/SkKTXImageEncoder.cpp
src/images/SkPNGImageEncoder.cpp
src/images/SkWEBPImageEncoder.cpp
src/ports/SkImageEncoder_CG.cpp
src/ports/SkImageEncoder_WIC.cpp
src/ports/SkImageEncoder_none.cpp
src/svg/SkSVGDevice.cpp
src/xps/SkXPSDevice.cpp
tests/BlitRowTest.cpp
tests/CodecTest.cpp
tests/ImageTest.cpp
tests/PDFDocumentTest.cpp
tests/PathOpsConicIntersectionTest.cpp
tests/PathOpsSkpClipTest.cpp
tests/SkpSkGrTest.cpp
tools/colorspaceinfo.cpp
tools/get_images_from_skps.cpp
tools/imgblur.cpp
tools/picture_utils.cpp
tools/sk_tool_utils.h
tools/skdiff/skdiff_utils.cpp
tools/skiaserve/Request.cpp