1 files changed, 1 insertions, 20 deletions

diff --git a/src/gpu/GrProcessorSet.h b/src/gpu/GrProcessorSet.h
index 56cbee1cac..6ebb00bee2 100644
--- a/src/gpu/GrProcessorSet.h
+++ b/src/gpu/GrProcessorSet.h
@@ -18,10 +18,6 @@ class GrXferProcessor;
 class GrXPFactory;
 
 class GrProcessorSet : private SkNoncopyable {
-private:
-    // Arbitrary constructor arg for empty set and analysis
-    enum class Empty { kEmpty };
-
 public:
     GrProcessorSet(GrPaint&& paint);
 
@@ -84,14 +80,6 @@ public:
         }
 
     private:
-        constexpr Analysis(Empty)
-                : fUsesLocalCoords(false)
-                , fCompatibleWithCoverageAsAlpha(true)
-                , fRequiresDstTexture(false)
-                , fCanCombineOverlappedStencilAndCover(true)
-                , fRequiresBarrierBetweenOverlappingDraws(false)
-                , fIsInitialized(true)
-                , fInputColorType(kOriginal_InputColorType) {}
         enum InputColorType : uint32_t {
             kOriginal_InputColorType,
             kOverridden_InputColorType,
@@ -134,13 +122,7 @@ public:
 
     bool isFinalized() const { return SkToBool(kFinalized_Flag & fFlags); }
 
-    static const GrProcessorSet& EmptySet() { return gEmpty; }
-    static constexpr const Analysis EmptySetAnalysis() { return Analysis(Empty::kEmpty); }
-
 private:
-    GrProcessorSet(Empty) : fXP((const GrXferProcessor*)nullptr), fFlags(kFinalized_Flag) {}
-    static const GrProcessorSet gEmpty;
-
     // This absurdly large limit allows Analysis and this to pack fields together.
     static constexpr int kMaxColorProcessors = UINT8_MAX;
 
@@ -148,7 +130,6 @@ private:
 
     union XP {
         XP(const GrXPFactory* factory) : fFactory(factory) {}
-        XP(const GrXferProcessor* processor) : fProcessor(processor) {}
         const GrXPFactory* fFactory;
         const GrXferProcessor* fProcessor;
     };
@@ -160,7 +141,7 @@ private:
 
     SkAutoSTArray<4, const GrFragmentProcessor*> fFragmentProcessors;
     XP fXP;
-    uint8_t fColorFragmentProcessorCnt = 0;
+    uint8_t fColorFragmentProcessorCnt;
     uint8_t fFragmentProcessorOffset = 0;
     uint8_t fFlags;
 };