2 files changed, 2 insertions, 88 deletions
diff --git a/include/codec/SkAndroidCodec.h b/include/codec/SkAndroidCodec.h
index e1e2843393..2bf38025bf 100644
--- a/include/codec/SkAndroidCodec.h
+++ b/include/codec/SkAndroidCodec.h
@@ -231,12 +231,12 @@ public:
         return this->getAndroidPixels(info, pixels, rowBytes);
     }
 
+    SkCodec* codec() const { return fCodec.get(); }
+
 protected:
 
     SkAndroidCodec(SkCodec*);
 
-    SkCodec* codec() const { return fCodec.get(); }
-
     virtual SkISize onGetSampledDimensions(int sampleSize) const = 0;
 
     virtual bool onGetSupportedSubset(SkIRect* desiredSubset) const = 0;
diff --git a/include/codec/SkAnimatedImage.h b/include/codec/SkAnimatedImage.h
deleted file mode 100644
index aece2f66d1..0000000000
--- a/include/codec/SkAnimatedImage.h
+++ /dev/null
@@ -1,86 +0,0 @@
-/*
- * Copyright 2018 Google Inc.
- *
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
-
-#ifndef SkAnimatedImage_DEFINED
-#define SkAnimatedImage_DEFINED
-
-#include "SkBitmap.h"
-#include "SkCodecAnimation.h"
-#include "SkDrawable.h"
-
-class SkCodec;
-
-/**
- *  Thread unsafe drawable for drawing animated images (e.g. GIF).
- */
-class SK_API SkAnimatedImage : public SkDrawable {
-public:
-    /**
-     *  Create an SkAnimatedImage from the SkCodec.
-     *
-     *  Returns null on failure to allocate pixels. On success, this will
-     *  decode the first frame. It will not animate until start() is called.
-     */
-    static sk_sp<SkAnimatedImage> MakeFromCodec(std::unique_ptr<SkCodec>);
-
-    ~SkAnimatedImage() override;
-
-    /**
-     *  Start or resume the animation. update() must be called to advance the
-     *  time.
-     */
-    void start();
-
-    /**
-     *  Stop the animation. update() has no effect while the animation is
-     *  stopped.
-     */
-    void stop();
-
-    /**
-     *  Reset the animation to the beginning.
-     */
-    void reset();
-
-    /**
-     *  Update the current time. If the image is animating, this may decode
-     *  a new frame.
-     *
-     *  @return the time to show the next frame.
-     *      Returns numeric_limits<double>::max() if there is no max frame to
-     *      show, and -1.0 if the animation is not running.
-     */
-    double update(double msecs);
-
-protected:
-    SkRect onGetBounds() override;
-    void onDraw(SkCanvas*) override;
-
-private:
-    struct Frame {
-        SkBitmap fBitmap;
-        int      fIndex;
-        SkCodecAnimation::DisposalMethod fDisposalMethod;
-
-        Frame();
-        bool copyTo(Frame*) const;
-    };
-
-    std::unique_ptr<SkCodec> fCodec;
-    bool                     fFinished;
-    bool                     fRunning;
-    double                   fNowMS;
-    double                   fRemainingMS;
-    Frame                    fActiveFrame;
-    Frame                    fRestoreFrame;
-
-    SkAnimatedImage(std::unique_ptr<SkCodec>);
-
-    typedef SkDrawable INHERITED;
-};
-
-#endif // SkAnimatedImage_DEFINED