SkRemote: refactoring

src/core/SkRemote_protocol.h

Index: src/core/SkRemote_protocol.h
diff --git a/src/core/SkRemote_protocol.h b/src/core/SkRemote_protocol.h
index d34a4b6c4b0cfbae49430cca81b6f0e29991ba90..b89d491379dcfb618aba854f2fbef46489b8c822 100644
--- a/src/core/SkRemote_protocol.h
+++ b/src/core/SkRemote_protocol.h
@@ -15,8 +15,6 @@ namespace SkRemote {
     // It is safe to append to this enum without breaking protocol compatibility.
     // Resorting, deleting, or inserting anywhere but the end will break compatibility.
     enum class Type : uint8_t {
-        kNone,
-
         kMatrix,
         kMisc,
         kPath,
@@ -25,30 +23,6 @@ namespace SkRemote {
         kXfermode,
     };
 
-    class ID {
-    public:
-        explicit ID(Type type = Type::kNone) : fVal((uint64_t)type << 56) {}
-        ID(Type type, uint64_t val) {
-            fVal = (uint64_t)type << 56 | val;
-            SkASSERT(this->type() == type && this->val() == val);
-        }
-
-        Type    type() const { return (Type)(fVal >> 56); }
-        uint64_t val() const { return fVal & ~((uint64_t)0xFF << 56); }
-
-        bool operator==(ID o) const { return fVal == o.fVal; }
-        ID operator++() {
-            ++fVal;
-            SkASSERT(this->val() != 0);  // Overflow is particularly bad as it'd change our Type.
-            return *this;
-        }
-
-    private:
-        // High 8 bits hold a Type.  Low 56 bits are unique within that Type.
-        // Any change to this format will break protocol compatibility.
-        uint64_t fVal;
-    };
-
 }  // namespace SkRemote
 
 #endif//SkRemote_protocol_DEFINED