XPFactory lazily initializie in drawstate / GrPaint

src/gpu/GrContext.cpp

Index: src/gpu/GrContext.cpp
diff --git a/src/gpu/GrContext.cpp b/src/gpu/GrContext.cpp
index 785691dbba8af5e0d1dfcd848fe40f83c29aa22e..e736121cef6f4115922ec8713cf29e4d7a49a9a6 100755
--- a/src/gpu/GrContext.cpp
+++ b/src/gpu/GrContext.cpp
@@ -1569,19 +1569,14 @@ GrDrawTarget* GrContext::prepareToDraw(GrDrawState* ds,
 
     ASSERT_OWNED_RESOURCE(fRenderTarget.get());
     if (ds) {
-        if (paint) {

[egdaniel, 2015/01/21 22:31:36]

Do we want to support the case where we have a DrawState but no paint? In
practice I don't think we ever hit this case, but should it be supported?

The confusing thing is the comment for this function says "he paint can be NULL
in which case the draw state is left unmodified". The old code clearly is not
respecting this comment since it resets the draw state if there is no paint.

[bsalomon, 2015/01/21 23:03:06]

If it's not being used, then let's just update the docs.

-            SkASSERT(acf);
-            ds->setFromPaint(*paint, fRenderTarget.get());
+        SkASSERT(paint && acf);
+        ds->setFromPaint(*paint, fRenderTarget.get());
 #if GR_DEBUG_PARTIAL_COVERAGE_CHECK

[egdaniel, 2015/01/21 22:31:36]

what is this debug check for? is it still useful to sit around in our code?

[bsalomon, 2015/01/21 23:03:06]

Since we're on the path to deleting canUFCPP, ok to remove

-            if ((paint->hasMask()) &&
-                !fDrawState->canUseFracCoveragePrimProc(paint.getColor(), fGpu->caps())) {
-                SkDebugf("Partial pixel coverage will be incorrectly blended.\n");
-            }
-#endif
-        } else {
-            ds->reset();
-            ds->setRenderTarget(fRenderTarget.get());
+        if ((paint->hasMask()) &&
+            !fDrawState->canUseFracCoveragePrimProc(paint.getColor(), fGpu->caps())) {
+            SkDebugf("Partial pixel coverage will be incorrectly blended.\n");
         }
+#endif
         ds->setState(GrDrawState::kClip_StateBit, fClip && !fClip->fClipStack->isWideOpen());
     }
     fDrawBuffer->setClip(fClip);