diff --git a/src/codec/SkHeifCodec.cpp b/src/codec/SkHeifCodec.cpp
index dcbfabc..dadb4cd 100644
--- a/src/codec/SkHeifCodec.cpp
+++ b/src/codec/SkHeifCodec.cpp
@@ -332,6 +332,15 @@
     return fSwizzler.get();
 }
 
+bool SkHeifCodec::onRewind() {
+    fSwizzler.reset(nullptr);
+    fSwizzleSrcRow = nullptr;
+    fColorXformSrcRow = nullptr;
+    fStorage.reset();
+
+    return true;
+}
+
 SkCodec::Result SkHeifCodec::onStartScanlineDecode(
         const SkImageInfo& dstInfo, const Options& options) {
     // TODO: For now, just decode the whole thing even when there is a subset.
diff --git a/src/codec/SkHeifCodec.h b/src/codec/SkHeifCodec.h
index e409097..d844f57 100644
--- a/src/codec/SkHeifCodec.h
+++ b/src/codec/SkHeifCodec.h
@@ -43,6 +43,8 @@
 
     bool conversionSupported(const SkImageInfo&, bool, bool) override;
 
+    bool onRewind() override;
+
 private:
     /*
      * Creates an instance of the decoder