4 files changed, 0 insertions, 37 deletions
diff --git a/src/core/SkReadBuffer.cpp b/src/core/SkReadBuffer.cpp
index b0a371390b..ce87d51366 100644
--- a/src/core/SkReadBuffer.cpp
+++ b/src/core/SkReadBuffer.cpp
@@ -392,21 +392,3 @@ SkFlattenable* SkReadBuffer::readFlattenable(SkFlattenable::Type ft) {
     }
     return obj.release();
 }
-
-/**
- *  Needs to follow the same pattern as readFlattenable(), but explicitly skip whatever data
- *  has been written.
- */
-void SkReadBuffer::skipFlattenable() {
-    if (fFactoryCount > 0) {
-        if (0 == fReader.readU32()) {
-            return;
-        }
-    } else {
-        if (nullptr == this->readFunctionPtr()) {
-            return;
-        }
-    }
-    uint32_t sizeRecorded = fReader.readU32();
-    fReader.skip(sizeRecorded);
-}
diff --git a/src/core/SkReadBuffer.h b/src/core/SkReadBuffer.h
index ae03a69042..607f7d843f 100644
--- a/src/core/SkReadBuffer.h
+++ b/src/core/SkReadBuffer.h
@@ -107,8 +107,6 @@ public:
     bool eof() { return fReader.eof(); }
     virtual const void* skip(size_t size) { return fReader.skip(size); }
 
-    void* readFunctionPtr() { return fReader.readPtr(); }
-
     // primitives
     virtual bool readBool();
     virtual SkColor readColor();
@@ -148,12 +146,6 @@ public:
     sk_sp<SkShader> readShader() { return this->readFlattenable<SkShader>(); }
     sk_sp<SkXfermode> readXfermode() { return this->readFlattenable<SkXfermode>(); }
 
-    /**
-     *  Like readFlattenable() but explicitly just skips the data that was written for the
-     *  flattenable (or the sentinel that there wasn't one).
-     */
-    virtual void skipFlattenable();
-
     // binary data and arrays
     virtual bool readByteArray(void* value, size_t size);
     virtual bool readColorArray(SkColor* colors, size_t size);
diff --git a/src/core/SkValidatingReadBuffer.cpp b/src/core/SkValidatingReadBuffer.cpp
index a27d42d82d..2779516889 100644
--- a/src/core/SkValidatingReadBuffer.cpp
+++ b/src/core/SkValidatingReadBuffer.cpp
@@ -281,13 +281,3 @@ SkFlattenable* SkValidatingReadBuffer::readFlattenable(SkFlattenable::Type type)
     }
     return obj.release();
 }
-
-void SkValidatingReadBuffer::skipFlattenable() {
-    SkString name;
-    this->readString(&name);
-    if (fError) {
-        return;
-    }
-    uint32_t sizeRecorded = this->readUInt();
-    this->skip(sizeRecorded);
-}
diff --git a/src/core/SkValidatingReadBuffer.h b/src/core/SkValidatingReadBuffer.h
index cd2d0c1ebf..3729e72b29 100644
--- a/src/core/SkValidatingReadBuffer.h
+++ b/src/core/SkValidatingReadBuffer.h
@@ -45,7 +45,6 @@ public:
 
     // common data structures
     SkFlattenable* readFlattenable(SkFlattenable::Type type) override;
-    void skipFlattenable() override;
     void readPoint(SkPoint* point) override;
     void readMatrix(SkMatrix* matrix) override;
     void readIRect(SkIRect* rect) override;