commit 8c0f615fdd41b8b8048bf398791bb2138c511826
author joshualitt <joshualitt@google.com> Wed Dec 10 14:12:22 2014 -0800
committer Commit bot <commit-bot@chromium.org> Wed Dec 10 14:12:22 2014 -0800
tree 99c1df79b95ce740b028382680a9af5359663219
parent c6bc58eded89b0c0a36b8e20e193c200f297a0da

Revert of Remove GP from drawstate, revision of invariant output for GP (patchset #9 id:160001 of https://codereview.chromium.org/791743003/)

Reason for revert:
breaks mac

Original issue's description:
> Remove GP from drawstate, revision of invariant output for GP
>
> BUG=skia:
>
> Committed: https://skia.googlesource.com/skia/+/c6bc58eded89b0c0a36b8e20e193c200f297a0da

TBR=bsalomon@google.com,egdaniel@google.com,joshualitt@chromium.org
NOTREECHECKS=true
NOTRY=true
BUG=skia:

Review URL: https://codereview.chromium.org/794843002

src/gpu/effects/GrBitmapTextGeoProc.cpp

diff --git a/src/gpu/effects/GrBitmapTextGeoProc.cpp b/src/gpu/effects/GrBitmapTextGeoProc.cpp
index 9c5e82e..1578fd8 100644
--- a/src/gpu/effects/GrBitmapTextGeoProc.cpp
+++ b/src/gpu/effects/GrBitmapTextGeoProc.cpp
@@ -84,15 +84,15 @@
     return SkToBool(this->inColor()) == SkToBool(gp.inColor());
 }
 
-void GrBitmapTextGeoProc::onGetInvariantOutputCoverage(GrInitInvariantOutput* out) const {
+void GrBitmapTextGeoProc::onComputeInvariantOutput(GrInvariantOutput* inout) const {
     if (GrPixelConfigIsAlphaOnly(this->texture(0)->config())) {
-        out->setUnknownSingleComponent();
+        inout->mulByUnknownAlpha();
     } else if (GrPixelConfigIsOpaque(this->texture(0)->config())) {
-        out->setUnknownOpaqueFourComponents();
-        out->setUsingLCDCoverage();
+        inout->mulByUnknownOpaqueColor();
+        inout->setUsingLCDCoverage();
     } else {
-        out->setUnknownFourComponents();
-        out->setUsingLCDCoverage();
+        inout->mulByUnknownColor();
+        inout->setUsingLCDCoverage();
     }
 }