Revert "Revert "Remove GrPipeline from GrDrawOp.""

This reverts commit c48af934608bbb65650641f66adb51f2102d4274.

Change-Id: I4ba78fd7e5a7d406b88223ca6f7245c029b60f76
Reviewed-on: https://skia-review.googlesource.com/9981
Reviewed-by: Brian Salomon <bsalomon@google.com>
Commit-Queue: Brian Salomon <bsalomon@google.com>

1 files changed, 8 insertions, 9 deletions

diff --git a/src/gpu/GrXferProcessor.cpp b/src/gpu/GrXferProcessor.cpp
index 4d877d6b27..32ab45c65e 100644
--- a/src/gpu/GrXferProcessor.cpp
+++ b/src/gpu/GrXferProcessor.cpp
@@ -176,14 +176,6 @@ SkString GrXferProcessor::BlendInfo::dump() const {
 
 ///////////////////////////////////////////////////////////////////////////////
 
-bool GrXPFactory::WillReadDst(const GrXPFactory* factory,
-                              const GrProcessorSet::FragmentProcessorAnalysis& analysis) {
-    if (factory) {
-        return factory->willReadsDst(analysis);
-    }
-    return GrPorterDuffXPFactory::WillSrcOverReadDst(analysis);
-}
-
 bool GrXPFactory::WillNeedDstTexture(const GrXPFactory* factory, const GrCaps& caps,
                                      const GrProcessorSet::FragmentProcessorAnalysis& analysis) {
     bool result;
@@ -193,7 +185,6 @@ bool GrXPFactory::WillNeedDstTexture(const GrXPFactory* factory, const GrCaps& c
     } else {
         result = GrPorterDuffXPFactory::WillSrcOverNeedDstTexture(caps, analysis);
     }
-    SkASSERT(!(result && !WillReadDst(factory, analysis)));
     return result;
 }
 
@@ -204,6 +195,14 @@ bool GrXPFactory::CompatibleWithCoverageAsAlpha(const GrXPFactory* factory, bool
     return GrPorterDuffXPFactory::SrcOverIsCompatibleWithCoverageAsAlpha();
 }
 
+bool GrXPFactory::CanCombineOverlappedStencilAndCover(const GrXPFactory* factory,
+                                                      bool colorIsOpaque) {
+    if (factory) {
+        return factory->canCombineOverlappedStencilAndCover(colorIsOpaque);
+    }
+    return GrPorterDuffXPFactory::SrcOverCanCombineOverlappedStencilAndCover(colorIsOpaque);
+}
+
 GrXferProcessor* GrXPFactory::createXferProcessor(const FragmentProcessorAnalysis& analysis,
                                                   bool hasMixedSamples,
                                                   const DstTexture* dstTexture,