commit 289e3d8dd70b08b509aa29594fe831e0278304ef
author Brian Salomon <bsalomon@google.com> Wed Dec 14 15:52:56 2016 -0500
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Wed Dec 14 21:29:49 2016 +0000
tree fc8e4e63eda88c1b504bafc1f60aabc4067899bf
parent 222e9ad98be456c1aa5ef7be38a7ea11a3e3a7f1

Bring sk_sp to oval GrDrawOps and rename batch->op

Change-Id: Ic0e95a29f1e2479d3d79b7d175290cb20422b585
Reviewed-on: https://skia-review.googlesource.com/6082
Commit-Queue: Brian Salomon <bsalomon@google.com>
Reviewed-by: Brian Osman <brianosman@google.com>

src/gpu/GrRenderTargetContext.cpp

diff --git a/src/gpu/GrRenderTargetContext.cpp b/src/gpu/GrRenderTargetContext.cpp
index 0ded922..1c0832b 100644
--- a/src/gpu/GrRenderTargetContext.cpp
+++ b/src/gpu/GrRenderTargetContext.cpp
@@ -12,7 +12,6 @@
 #include "GrDrawingManager.h"
 #include "GrFixedClip.h"
 #include "GrGpuResourcePriv.h"
-#include "GrOvalRenderer.h"
 #include "GrPathRenderer.h"
 #include "GrPipelineBuilder.h"
 #include "GrRenderTarget.h"
@@ -25,6 +24,7 @@
 #include "batches/GrDrawVerticesBatch.h"
 #include "batches/GrNinePatch.h"  // TODO Factory
 #include "batches/GrOp.h"
+#include "batches/GrOvalOpFactory.h"
 #include "batches/GrRectOpFactory.h"
 #include "batches/GrRegionBatch.h"
 #include "batches/GrShadowRRectBatch.h"
@@ -926,12 +926,12 @@
     aaType = this->decideAAType(aa);
     if (GrAAType::kCoverage == aaType) {
         const GrShaderCaps* shaderCaps = fContext->caps()->shaderCaps();
-        sk_sp<GrDrawOp> op(GrOvalRenderer::CreateRRectBatch(paint.getColor(),
-                                                            paint.usesDistanceVectorField(),
-                                                            viewMatrix,
-                                                            rrect,
-                                                            stroke,
-                                                            shaderCaps));
+        sk_sp<GrDrawOp> op = GrOvalOpFactory::MakeRRectOp(paint.getColor(),
+                                                          paint.usesDistanceVectorField(),
+                                                          viewMatrix,
+                                                          rrect,
+                                                          stroke,
+                                                          shaderCaps);
         if (op) {
             GrPipelineBuilder pipelineBuilder(paint, aaType);
             this->getOpList()->addDrawOp(pipelineBuilder, this, *clip, std::move(op));
@@ -1159,11 +1159,8 @@
     aaType = this->decideAAType(aa);
     if (GrAAType::kCoverage == aaType) {
         const GrShaderCaps* shaderCaps = fContext->caps()->shaderCaps();
-        sk_sp<GrDrawOp> op(GrOvalRenderer::CreateOvalBatch(paint.getColor(),
-                                                           viewMatrix,
-                                                           oval,
-                                                           stroke,
-                                                           shaderCaps));
+        sk_sp<GrDrawOp> op =
+                GrOvalOpFactory::MakeOvalOp(paint.getColor(), viewMatrix, oval, stroke, shaderCaps);
         if (op) {
             GrPipelineBuilder pipelineBuilder(paint, aaType);
             this->getOpList()->addDrawOp(pipelineBuilder, this, clip, std::move(op));
@@ -1189,14 +1186,14 @@
     GrAAType aaType = this->decideAAType(aa);
     if (GrAAType::kCoverage == aaType) {
         const GrShaderCaps* shaderCaps = fContext->caps()->shaderCaps();
-        sk_sp<GrDrawOp> op(GrOvalRenderer::CreateArcBatch(paint.getColor(),
-                                                          viewMatrix,
-                                                          oval,
-                                                          startAngle,
-                                                          sweepAngle,
-                                                          useCenter,
-                                                          style,
-                                                          shaderCaps));
+        sk_sp<GrDrawOp> op = GrOvalOpFactory::MakeArcOp(paint.getColor(),
+                                                        viewMatrix,
+                                                        oval,
+                                                        startAngle,
+                                                        sweepAngle,
+                                                        useCenter,
+                                                        style,
+                                                        shaderCaps);
         if (op) {
             GrPipelineBuilder pipelineBuilder(paint, aaType);
             this->getOpList()->addDrawOp(pipelineBuilder, this, clip, std::move(op));
@@ -1401,11 +1398,8 @@
 
         if (isOval && !path.isInverseFillType()) {
             const GrShaderCaps* shaderCaps = fContext->caps()->shaderCaps();
-            sk_sp<GrDrawOp> op(GrOvalRenderer::CreateOvalBatch(paint.getColor(),
-                                                               viewMatrix,
-                                                               ovalRect,
-                                                               style.strokeRec(),
-                                                               shaderCaps));
+            sk_sp<GrDrawOp> op = GrOvalOpFactory::MakeOvalOp(
+                    paint.getColor(), viewMatrix, ovalRect, style.strokeRec(), shaderCaps);
             if (op) {
                 GrPipelineBuilder pipelineBuilder(paint, aaType);
                 this->getOpList()->addDrawOp(pipelineBuilder, this, clip, std::move(op));