From 5079d84e9164b106522e7ed38881e2c475d90ed3 Mon Sep 17 00:00:00 2001 From: Mike Klein Date: Mon, 12 Nov 2018 16:08:03 +0000 Subject: [PATCH] Revert "put kNone back too" This reverts commit 49e1239f94fe8b44fa15f657337681a6ffc610ff. Reason for revert: need more Original change's description: > put kNone back too > > Change-Id: I07969ca6b7367460259901cf526b11cbf2793663 > Reviewed-on: https://skia-review.googlesource.com/c/170420 > Auto-Submit: Mike Klein > Reviewed-by: Mike Klein > Commit-Queue: Mike Klein TBR=mtklein@google.com,reed@google.com Change-Id: Id027f6d82d2c61bfc6a2c4ee4f894452830e6889 No-Presubmit: true No-Tree-Checks: true No-Try: true Reviewed-on: https://skia-review.googlesource.com/c/170421 Reviewed-by: Mike Klein Commit-Queue: Mike Klein --- include/codec/SkCodec.h | 5 ----- 1 file changed, 5 deletions(-) diff --git a/include/codec/SkCodec.h b/include/codec/SkCodec.h index 623a35fe1c..fc58db942d 100644 --- a/include/codec/SkCodec.h +++ b/include/codec/SkCodec.h @@ -594,11 +594,6 @@ 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. */