| Index: src/codec/SkGifCodec.h
|
| diff --git a/src/codec/SkGifCodec.h b/src/codec/SkGifCodec.h
|
| index 8748df74a5bd9a3ef8a38bcb3bae7390d0ad265e..97432cbcfa4e67bd6f29465e86b724ee35a34b6f 100644
|
| --- a/src/codec/SkGifCodec.h
|
| +++ b/src/codec/SkGifCodec.h
|
| @@ -11,7 +11,6 @@
|
| #include "SkColorTable.h"
|
| #include "SkImageInfo.h"
|
| #include "SkSwizzler.h"
|
| -#include "../private/SkTArray.h"
|
|
|
| struct GifFileType;
|
| struct SavedImage;
|
| @@ -68,13 +67,8 @@ protected:
|
|
|
| uint64_t onGetFillValue(const SkImageInfo&) const override;
|
|
|
| - size_t onGetFrameCount() override {
|
| - return (size_t) fFrameInfos.count();
|
| - }
|
| -
|
| - size_t onGetRequiredFrame(size_t) override;
|
| + std::vector<FrameInfo> onGetFrameInfo() override;
|
|
|
| - size_t onGetFrameDuration(size_t) override;
|
| private:
|
|
|
| /*
|
| @@ -152,7 +146,7 @@ private:
|
| GifFileType* gif, uint32_t transIndex);
|
|
|
|
|
| - struct FrameInfo : public SkCodecAnimation::FrameInfo {
|
| + struct GifFrameInfo : public SkCodecAnimation::FrameInfo {
|
| uint32_t fTransIndex;
|
| };
|
|
|
| @@ -161,7 +155,7 @@ private:
|
| uint32_t fFillIndex;
|
| SkAutoTDelete<SkSwizzler> fSwizzler;
|
| SkAutoTUnref<SkColorTable> fColorTable;
|
| - SkTArray<FrameInfo> fFrameInfos;
|
| + std::vector<GifFrameInfo> fFrameInfos;
|
|
|
| typedef SkCodec INHERITED;
|
| };
|
|
|