commit 4598fa1b1acab2db3834e0b55eed7ec69232d077
author Herb Derby <herb@google.com> Wed Jun 10 14:54:22 2020 -0400
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Thu Jun 11 16:26:43 2020 +0000
tree 7459a4c5f36ef5c4c29c1ef9e2ca33443c0e4cf6
parent 36248741c28b993c02042c5d24ec233fcc362810

move test op creation to GrTextAtlasOp

Change-Id: If6de2f7812ead2d3722d528805901e0f7e67a6b5
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/295358
Commit-Queue: Herb Derby <herb@google.com>
Reviewed-by: Robert Phillips <robertphillips@google.com>

tests/DrawOpAtlasTest.cpp

diff --git a/tests/DrawOpAtlasTest.cpp b/tests/DrawOpAtlasTest.cpp
index e5e0378..7d0d0d7 100644
--- a/tests/DrawOpAtlasTest.cpp
+++ b/tests/DrawOpAtlasTest.cpp
@@ -31,10 +31,10 @@
 #include "src/gpu/GrRenderTargetContext.h"
 #include "src/gpu/GrTextureProxy.h"
 #include "src/gpu/GrXferProcessor.h"
+#include "src/gpu/ops/GrAtlasTextOp.h"
 #include "src/gpu/ops/GrDrawOp.h"
 #include "src/gpu/ops/GrOp.h"
 #include "src/gpu/text/GrAtlasManager.h"
-#include "src/gpu/text/GrTextContext.h"
 #include "tests/Test.h"
 #include "tools/gpu/GrContextFactory.h"
 
@@ -195,8 +195,6 @@
 
     auto gpu = context->priv().getGpu();
     auto resourceProvider = context->priv().resourceProvider();
-    auto drawingManager = context->priv().drawingManager();
-    auto textContext = drawingManager->getTextContext();
     auto opMemoryPool = context->priv().opMemoryPool();
 
     auto rtc = GrRenderTargetContext::Make(
@@ -212,8 +210,9 @@
     SkSimpleMatrixProvider matrixProvider(SkMatrix::I());
 
     std::unique_ptr<GrDrawOp> op =
-            textContext->createOp_TestingOnly(context, textContext, rtc.get(), paint, font,
-                                              matrixProvider, text, 16, 16);
+            GrAtlasTextOp::CreateOpTestingOnly(
+                    rtc.get(), paint, font, matrixProvider, text, 16, 16);
+
     bool hasMixedSampledCoverage = false;
     op->finalize(*context->priv().caps(), nullptr, hasMixedSampledCoverage, GrClampType::kAuto);