diff options
author | Hal Canary <halcanary@google.com> | 2016-11-30 17:07:59 -0500 |
---|---|---|
committer | Skia Commit-Bot <skia-commit-bot@chromium.org> | 2016-11-30 22:48:56 +0000 |
commit | 1fcc40474f1ad1f522d0a61086e25a71ca0a6881 (patch) | |
tree | 298d1a0b66d5d1899133c6252c877931661c5e95 /tests | |
parent | 3a7492fc04d83ed2729d2ba226d5277459536b74 (diff) |
SkEncodeImage: no more link-time registration
Also, no more SkImageEncoder class.
SK_SUPPORT_LEGACY_IMAGE_ENCODER_CLASS now only guards some
old API shims.
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=5006
Change-Id: I3797f584f3e8e12ade10d31e8733163453725f40
Reviewed-on: https://skia-review.googlesource.com/5006
Commit-Queue: Hal Canary <halcanary@google.com>
Reviewed-by: Leon Scroggins <scroggo@google.com>
Reviewed-by: Mike Reed <reed@google.com>
Diffstat (limited to 'tests')
-rw-r--r-- | tests/PathOpsExtendedTest.cpp | 4 | ||||
-rw-r--r-- | tests/PathOpsSkpClipTest.cpp | 1 |
2 files changed, 0 insertions, 5 deletions
diff --git a/tests/PathOpsExtendedTest.cpp b/tests/PathOpsExtendedTest.cpp index f699b8b208..9b08ba923b 100644 --- a/tests/PathOpsExtendedTest.cpp +++ b/tests/PathOpsExtendedTest.cpp @@ -9,7 +9,6 @@ #include "PathOpsThreadedCommon.h" #include "SkBitmap.h" #include "SkCanvas.h" -#include "SkForceLinking.h" #include "SkMatrix.h" #include "SkMutex.h" #include "SkPaint.h" @@ -29,9 +28,6 @@ bool SimplifyDebug(const SkPath& one, SkPath* result SkDEBUGPARAMS(bool skipAssert) SkDEBUGPARAMS(const char* testName)); - -__SK_FORCE_IMAGE_DECODER_LINKING; - static const char marker[] = "</div>\n" "\n" diff --git a/tests/PathOpsSkpClipTest.cpp b/tests/PathOpsSkpClipTest.cpp index 57e9bd1b64..0c866bd379 100644 --- a/tests/PathOpsSkpClipTest.cpp +++ b/tests/PathOpsSkpClipTest.cpp @@ -13,7 +13,6 @@ #include "SkColor.h" #include "SkColorPriv.h" #include "SkCommandLineFlags.h" -#include "SkForceLinking.h" #include "SkGraphics.h" #include "SkImageEncoder.h" #include "SkOSFile.h" |