Make skpaint->grpaint flow work for composing draws

include/gpu/GrInvariantOutput.h

Index: include/gpu/GrInvariantOutput.h
diff --git a/include/gpu/GrInvariantOutput.h b/include/gpu/GrInvariantOutput.h
index 83deac39f7ab102f51e9202f931412a6e012ed82..fa91be97a6015aac84073c23da72d69e98dbd880 100644
--- a/include/gpu/GrInvariantOutput.h
+++ b/include/gpu/GrInvariantOutput.h
@@ -223,10 +223,6 @@ public:
                 fIsSingleComponent = true;
             }

[robertphillips, 2015/09/25 19:52:17]

rm this else ?

[bsalomon, 2015/09/25 20:45:07]

Done.

         } else if (kA_GrColorComponentFlag & fValidFlags) {
-            // Assuming fColor is premul means if a is 0 the color must be all 0s.
-            if (!GrColorUnpackA(fColor)) {
-                this->internalSetToTransparentBlack();
-            }
         }
         SkDEBUGCODE(this->validate());
     }
@@ -249,6 +245,7 @@ public:
 
     GrColor color() const { return fColor; }
     GrColorComponentFlags validFlags() const { return fValidFlags; }
+    bool willUseInputColor() const { return fWillUseInputColor; }
 
     /**
      * If isSingleComponent is true, then the flag values for r, g, b, and a must all be the
@@ -308,7 +305,6 @@ private:
 
     bool isSingleComponent() const { return fIsSingleComponent; }
 
-    bool willUseInputColor() const { return fWillUseInputColor; }
     void resetWillUseInputColor() { fWillUseInputColor = true; }
 
     bool allStagesMulInput() const { return !fNonMulStageFound; }