Move drawDRRect back to GrDrawContext

src/gpu/SkGpuDevice.cpp

 /*
  * Copyright 2011 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "SkGpuDevice.h"
 
 #include "GrBlurUtils.h"
@@ skipping 26 matching lines @@
 #include "SkStroke.h"
 #include "SkSurface.h"
 #include "SkSurface_Gpu.h"
 #include "SkTLazy.h"
 #include "SkUtils.h"
 #include "SkVertState.h"
 #include "SkXfermode.h"
 #include "batches/GrRectBatchFactory.h"
 #include "effects/GrBicubicEffect.h"
 #include "effects/GrDashingEffect.h"
-#include "effects/GrRRectEffect.h"
 #include "effects/GrSimpleTextureEffect.h"
 #include "effects/GrTextureDomain.h"
 #include "text/GrTextUtils.h"
 
 #if SK_SUPPORT_GPU
 
 #define ASSERT_SINGLE_OWNER \
     SkDEBUGCODE(GrSingleOwner::AutoEnforce debug_SingleOwner(fContext->debugSingleOwner());)
 
 enum { kDefaultImageFilterCacheSize = 32 * 1024 * 1024 };
@@ skipping 496 matching lines @@
                                             *draw.fMatrix, nullptr,
                                             draw.fClip->getBounds(), true);
         return;
     }
 
     SkASSERT(!strokeInfo.isDashed());
 
     fDrawContext->drawRRect(fClip, grPaint, *draw.fMatrix, rect, strokeInfo);
 }
 
-bool SkGpuDevice::drawFilledDRRect(const SkMatrix& viewMatrix, const SkRRect& origOuter,
-                                   const SkRRect& origInner, const SkPaint& paint) {
-    SkASSERT(!origInner.isEmpty());
-    SkASSERT(!origOuter.isEmpty());
-
-    bool applyAA = paint.isAntiAlias() && !fRenderTarget->isUnifiedMultisampled();
-
-    GrPrimitiveEdgeType innerEdgeType = applyAA ? kInverseFillAA_GrProcessorEdgeType :
-                                                  kInverseFillBW_GrProcessorEdgeType;
-    GrPrimitiveEdgeType outerEdgeType = applyAA ? kFillAA_GrProcessorEdgeType :
-                                                  kFillBW_GrProcessorEdgeType;
-
-    SkTCopyOnFirstWrite<SkRRect> inner(origInner), outer(origOuter);
-    SkMatrix inverseVM;
-    if (!viewMatrix.isIdentity()) {
-        if (!origInner.transform(viewMatrix, inner.writable())) {
-            return false;
-        }
-        if (!origOuter.transform(viewMatrix, outer.writable())) {
-            return false;
-        }
-        if (!viewMatrix.invert(&inverseVM)) {
-            return false;
-        }
-    } else {
-        inverseVM.reset();
-    }         
-
-    GrPaint grPaint;
-
-    if (!SkPaintToGrPaint(this->context(), paint, viewMatrix, &grPaint)) {
-        return false;
-    }
-
-    grPaint.setAntiAlias(false);
-
-    // TODO these need to be a geometry processors
-    SkAutoTUnref<GrFragmentProcessor> innerEffect(GrRRectEffect::Create(innerEdgeType, *inner));
-    if (!innerEffect) {
-        return false;
-    }
-
-    SkAutoTUnref<GrFragmentProcessor> outerEffect(GrRRectEffect::Create(outerEdgeType, *outer));
-    if (!outerEffect) {
-        return false;
-    }
-
-    grPaint.addCoverageFragmentProcessor(innerEffect);
-    grPaint.addCoverageFragmentProcessor(outerEffect);
-
-    SkRect bounds = outer->getBounds();
-    if (applyAA) {
-        bounds.outset(SK_ScalarHalf, SK_ScalarHalf);
-    }
-  
-    fDrawContext->fillRectWithLocalMatrix(fClip, grPaint, SkMatrix::I(), bounds, inverseVM);
-    return true;
-}
-
 
 void SkGpuDevice::drawDRRect(const SkDraw& draw, const SkRRect& outer,
                              const SkRRect& inner, const SkPaint& paint) {
     ASSERT_SINGLE_OWNER
     GR_CREATE_TRACE_MARKER_CONTEXT("SkGpuDevice", "drawDRRect", fContext);
     CHECK_FOR_ANNOTATION(paint);
     CHECK_SHOULD_DRAW(draw);
 
     if (outer.isEmpty()) {
        return;
     }
 
     if (inner.isEmpty()) {
         return this->drawRRect(draw, outer, paint);
     }
 
     SkStrokeRec stroke(paint);
 
     if (stroke.isFillStyle() && !paint.getMaskFilter() && !paint.getPathEffect()) {
-        if (this->drawFilledDRRect(*draw.fMatrix, outer, inner, paint)) {
+        GrPaint grPaint;
+        if (!SkPaintToGrPaint(this->context(), paint, *draw.fMatrix, &grPaint)) {
             return;
         }
+
+        fDrawContext->drawDRRect(fClip, grPaint, *draw.fMatrix, outer, inner);
+        return;
     }
 
     SkPath path;
     path.setIsVolatile(true);
     path.addRRect(outer);
     path.addRRect(inner);
     path.setFillType(SkPath::kEvenOdd_FillType);
 
     GrBlurUtils::drawPathWithMaskFilter(fContext, fDrawContext,
                                         fClip, path, paint,
@@ skipping 1291 matching lines @@
 }
 
 SkImageFilter::Cache* SkGpuDevice::getImageFilterCache() {
     ASSERT_SINGLE_OWNER
     // We always return a transient cache, so it is freed after each
     // filter traversal.
     return SkGpuDevice::NewImageFilterCache();
 }
 
 #endif