commit f41b2bd449e0eebe4b88c9ca668c2d72492c0b75
author Greg Daniel <egdaniel@google.com> Thu Aug 22 16:19:24 2019 -0400
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Thu Aug 22 20:52:09 2019 +0000
tree 924c2b3b30a3160554e4f4a0b430c7242c23d3f6
parent f21bf9e50bb175eb151e90a01d7f8351da0802f8

Reland "Merge GrOpList and GrRTOpList and rename to GrOpsTask."

This reverts commit f21bf9e50bb175eb151e90a01d7f8351da0802f8.

Reason for revert: relanding with infra fix

Original change's description:
> Revert "Merge GrOpList and GrRTOpList and rename to GrOpsTask."
>
> This reverts commit 2a5954140b49d18e5161a30a4ae2c7ac28bc1993.
>
> Reason for revert: breaking everything
>
> Original change's description:
> > Merge GrOpList and GrRTOpList and rename to GrOpsTask.
> >
> > Change-Id: I8f4f2218a30fd0541a8f79f7bb9850f9500cd243
> > Reviewed-on: https://skia-review.googlesource.com/c/skia/+/236343
> > Commit-Queue: Greg Daniel <egdaniel@google.com>
> > Reviewed-by: Brian Salomon <bsalomon@google.com>
>
> TBR=egdaniel@google.com,bsalomon@google.com,robertphillips@google.com
>
> Change-Id: I27840ea0343e8e6b388556afb7bd2e76386d611d
> No-Presubmit: true
> No-Tree-Checks: true
> No-Try: true
> Reviewed-on: https://skia-review.googlesource.com/c/skia/+/236349
> Reviewed-by: Greg Daniel <egdaniel@google.com>
> Commit-Queue: Greg Daniel <egdaniel@google.com>

TBR=egdaniel@google.com,bsalomon@google.com,robertphillips@google.com

Change-Id: Ibd3a06e4a91dbb1f225dcc8d17d0db3967b6f85f
No-Presubmit: true
No-Tree-Checks: true
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/236350
Commit-Queue: Greg Daniel <egdaniel@google.com>
Reviewed-by: Greg Daniel <egdaniel@google.com>

tests/OpChainTest.cpp

diff --git a/tests/OpChainTest.cpp b/tests/OpChainTest.cpp
index 90acfa7..1cbc437 100644
--- a/tests/OpChainTest.cpp
+++ b/tests/OpChainTest.cpp
@@ -9,7 +9,7 @@
 #include "src/gpu/GrContextPriv.h"
 #include "src/gpu/GrMemoryPool.h"
 #include "src/gpu/GrOpFlushState.h"
-#include "src/gpu/GrRenderTargetOpList.h"
+#include "src/gpu/GrOpsTask.h"
 #include "src/gpu/ops/GrOp.h"
 #include "tests/Test.h"
 
@@ -205,7 +205,7 @@
                 GrOpFlushState flushState(context->priv().getGpu(),
                                           context->priv().resourceProvider(),
                                           &tracker);
-                GrRenderTargetOpList opList(sk_ref_sp(context->priv().opMemoryPool()),
+                GrOpsTask opsTask(sk_ref_sp(context->priv().opMemoryPool()),
                                             sk_ref_sp(proxy->asRenderTargetProxy()),
                                             context->priv().auditTrail());
                 // This assumes the particular values of kRanges.
@@ -221,14 +221,14 @@
                     range.fOffset += pos;
                     auto op = TestOp::Make(context.get(), value, range, result, &combinable);
                     op->writeResult(validResult);
-                    opList.addOp(std::move(op),
-                                 GrTextureResolveManager(context->priv().drawingManager()),
-                                 *context->priv().caps());
+                    opsTask.addOp(std::move(op),
+                                  GrTextureResolveManager(context->priv().drawingManager()),
+                                  *context->priv().caps());
                 }
-                opList.makeClosed(*context->priv().caps());
-                opList.prepare(&flushState);
-                opList.execute(&flushState);
-                opList.endFlush();
+                opsTask.makeClosed(*context->priv().caps());
+                opsTask.prepare(&flushState);
+                opsTask.execute(&flushState);
+                opsTask.endFlush();
 #if 0  // Useful to repeat a random configuration that fails the test while debugger attached.
                 if (!std::equal(result, result + result_width(), validResult)) {
                     repeat = true;