diff options
| author |  Brian Salomon <bsalomon@google.com> | 2017-07-16 00:40:10 +0000 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2017-07-17 13:08:38 +0000 |
| commit | e3e9628ecf863f433f26bf6107d6a39ced57fe30 (patch) | |
| tree | b8c5d4a29af83dd528a460a4131dcda1047e8b03 /src/gpu/GrDrawOpTest.h | |
| parent | d4b678751117983dc92a85a3879445bd8aa33ffb (diff) | |
Revert "Make GrAtlasTextOp a non-legacy GrMeshDrawOp"
This reverts commit 434a58ab5fefcc1b86588c7fce898b1e5bd248ba.
Reason for revert: <INSERT REASONING HERE>
Original change's description:
> Make GrAtlasTextOp a non-legacy GrMeshDrawOp
>
> Change-Id: Ib9eaf149100b0ccecf1c18a755263f2579b8e6f6
> Reviewed-on: https://skia-review.googlesource.com/23482
> Reviewed-by: Jim Van Verth <jvanverth@google.com>
> Commit-Queue: Brian Salomon <bsalomon@google.com>
TBR=jvanverth@google.com,bsalomon@google.com
# Not skipping CQ checks because original CL landed > 1 day ago.
Change-Id: I7fd8503b4e0c297b2cfaf979545354aa58d1f989
Reviewed-on: https://skia-review.googlesource.com/23760
Reviewed-by: Brian Salomon <bsalomon@google.com>
Commit-Queue: Brian Salomon <bsalomon@google.com>
Diffstat (limited to 'src/gpu/GrDrawOpTest.h')
| -rw-r--r-- | src/gpu/GrDrawOpTest.h | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/gpu/GrDrawOpTest.h b/src/gpu/GrDrawOpTest.h index b77fe48bf7..a30ca2801f 100644 --- a/src/gpu/GrDrawOpTest.h +++ b/src/gpu/GrDrawOpTest.h @@ -27,13 +27,12 @@ void GrDrawRandomOp(SkRandom*, GrRenderTargetContext*, GrPaint&&); #define GR_DRAW_OP_TEST_DEFINE(Op) \ std::unique_ptr<GrDrawOp> Op##__Test(GrPaint&& paint, SkRandom* random, GrContext* context, \ GrFSAAType fsaaType) -#define GR_DRAW_OP_TEST_FRIEND(Op) \ - friend std::unique_ptr<GrDrawOp> Op##__Test(GrPaint&& paint, SkRandom* random, \ - GrContext* context, GrFSAAType fsaaType) /** Variations for GrLegacyMeshDrawOps. To be deleted. */ #define GR_LEGACY_MESH_DRAW_OP_TEST_DEFINE(Op) \ std::unique_ptr<GrLegacyMeshDrawOp> Op##__Test(SkRandom* random, GrContext* context) +#define GR_LEGACY_MESH_DRAW_OP_TEST_FRIEND(Op) \ + friend std::unique_ptr<GrLegacyMeshDrawOp> Op##__Test(SkRandom* random, GrContext* context); /** Helper for op test factories to pick a random stencil state. */ const GrUserStencilSettings* GrGetRandomStencil(SkRandom* random, GrContext*); |