diff options
| author | Mike Klein <mtklein@google.com> | 2018-11-12 16:08:30 +0000 |
|---|---|---|
| committer | Mike Klein <mtklein@google.com> | 2018-11-12 16:26:04 +0000 |
| commit | eb4d641d943767a37814a0b4bab8a3e88fd01ca4 (patch) | |
| tree | d6745c131c22df0c7241bf3bd1e48b5e19485d85 | |
| parent | 5079d84e9164b106522e7ed38881e2c475d90ed3 (diff) | |
| download | skqp-eb4d641d943767a37814a0b4bab8a3e88fd01ca4.tar.gz | |
Revert "remove old name for SkCodec::kNoFrame"
This reverts commit 06a477c3300d7e1ceae339f704df7b6e0710dc1d.
Reason for revert: <INSERT REASONING HERE>
Original change's description:
> remove old name for SkCodec::kNoFrame
>
> Cq-Include-Trybots: skia.primary:Build-Debian9-Clang-arm-Release-Flutter_Android
> Change-Id: I039aed7591aa7767046f28a48798b6fa2f7fd643
> Reviewed-on: https://skia-review.googlesource.com/c/169224
> Reviewed-by: Leon Scroggins <scroggo@google.com>
TBR=mtklein@google.com,scroggo@google.com
# Not skipping CQ checks because original CL landed > 1 day ago.
Change-Id: I6c61ee27a4167127c74c14e0f9e05a4bbac931a8
Cq-Include-Trybots: skia.primary:Build-Debian9-Clang-arm-Release-Flutter_Android
Reviewed-on: https://skia-review.googlesource.com/c/170422
Reviewed-by: Mike Klein <mtklein@google.com>
Commit-Queue: Mike Klein <mtklein@google.com>
| -rw-r--r-- | gn/flutter_defines.gni | 1 | ||||
| -rw-r--r-- | include/codec/SkCodec.h | 5 |
2 files changed, 6 insertions, 0 deletions
diff --git a/gn/flutter_defines.gni b/gn/flutter_defines.gni index f0339765dd..08c9b535f9 100644 --- a/gn/flutter_defines.gni +++ b/gn/flutter_defines.gni @@ -4,6 +4,7 @@ # found in the LICENSE file. flutter_defines = [ "SK_DISABLE_EXPLICIT_GPU_RESOURCE_ALLOCATION", + "SK_LEGACY_SKCODEC_NONE_ENUM", # Flutter always wants this https://github.com/flutter/flutter/issues/11402 "SK_ENABLE_DUMP_GPU", diff --git a/include/codec/SkCodec.h b/include/codec/SkCodec.h index fc58db942d..623a35fe1c 100644 --- a/include/codec/SkCodec.h +++ b/include/codec/SkCodec.h @@ -594,6 +594,11 @@ public: // is residing in dst's memory. static constexpr int kNoFrame = -1; + // This transitional definition was added in August 2018, and will eventually be removed. +#ifdef SK_LEGACY_SKCODEC_NONE_ENUM + static constexpr int kNone = kNoFrame; +#endif + /** * Information about individual frames in a multi-framed image. */ |