diff options
| author |  bsalomon <bsalomon@google.com> | 2016-05-10 09:14:17 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2016-05-10 09:14:17 -0700 |
| commit | 6663acff010ce752e4bf778da81fa97448c9db31 (patch) | |
| tree | ba48f7716f7ef948d9faac90599b8a555c0f51d3 /tests | |
| parent | 44d427e048b2e290e086dc2c9f9227818388ef17 (diff) | |
Replace GrStrokeInfo with GrStyle.
A side effect is that arbitrary path effects can no be pushed deeper into the Ganesh flow for paths. They may be applied by path renderers.
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1957363002
Committed: https://skia.googlesource.com/skia/+/33595bdf4b64a745f6340338d307e806e96c587f
Review-Url: https://codereview.chromium.org/1957363002
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/GpuDrawPathTest.cpp | 7 | ||||
| -rw-r--r-- | tests/TessellatingPathRendererTests.cpp | 4 |
2 files changed, 5 insertions, 6 deletions
diff --git a/tests/GpuDrawPathTest.cpp b/tests/GpuDrawPathTest.cpp index 2dc7702fff..dc8db0ff70 100644 --- a/tests/GpuDrawPathTest.cpp +++ b/tests/GpuDrawPathTest.cpp @@ -11,7 +11,7 @@ #include "GrContext.h" #include "GrPath.h" -#include "GrStrokeInfo.h" +#include "GrStyle.h" #include "SkBitmap.h" #include "SkCanvas.h" #include "SkColor.h" @@ -104,9 +104,8 @@ DEF_GPUTEST(GrPathKeys, reporter, /*factory*/) { bool isVolatile; GrUniqueKey key1, key2; - GrStrokeInfo stroke(SkStrokeRec::kFill_InitStyle); - GrPath::ComputeKey(path1, stroke, &key1, &isVolatile); - GrPath::ComputeKey(path2, stroke, &key2, &isVolatile); + GrPath::ComputeKey(path1, GrStyle::SimpleFill(), &key1, &isVolatile); + GrPath::ComputeKey(path2, GrStyle::SimpleFill(), &key2, &isVolatile); REPORTER_ASSERT(reporter, key1 != key2); } diff --git a/tests/TessellatingPathRendererTests.cpp b/tests/TessellatingPathRendererTests.cpp index 32973ee1c8..9d550775ba 100644 --- a/tests/TessellatingPathRendererTests.cpp +++ b/tests/TessellatingPathRendererTests.cpp @@ -239,7 +239,7 @@ static void test_path(GrDrawTarget* dt, GrRenderTarget* rt, GrResourceProvider* pipelineBuilder.setXPFactory( GrPorterDuffXPFactory::Create(SkXfermode::kSrc_Mode))->unref(); pipelineBuilder.setRenderTarget(rt); - GrStrokeInfo stroke(SkStrokeRec::kFill_InitStyle); + GrStyle style(SkStrokeRec::kFill_InitStyle); GrPathRenderer::DrawPathArgs args; args.fTarget = dt; args.fPipelineBuilder = &pipelineBuilder; @@ -247,7 +247,7 @@ static void test_path(GrDrawTarget* dt, GrRenderTarget* rt, GrResourceProvider* args.fColor = GrColor_WHITE; args.fViewMatrix = &SkMatrix::I(); args.fPath = &path; - args.fStroke = &stroke; + args.fStyle = &style; args.fAntiAlias = false; tess.drawPath(args); } |