diff options
| author |  reed <reed@google.com> | 2016-03-25 09:08:00 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2016-03-25 09:08:00 -0700 |
| commit | fe63045f075165b1be5d3e7fc5c710021d85f53b (patch) | |
| tree | c60f764504ba1d622613a432c88e43f7f65c0fec /tools | |
| parent | cce49271124ff75c880dc0dfed1489f02c82890b (diff) | |
move setshader to sk_sp, re-using SK_SUPPORT_LEGACY_CREATESHADER_PTR
BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1829303002
Review URL: https://codereview.chromium.org/1829303002
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/VisualBench/VisualBenchmarkStream.cpp | 3 | ||||
| -rw-r--r-- | tools/debugger/SkDrawCommand.cpp | 3 |
2 files changed, 2 insertions, 4 deletions
diff --git a/tools/VisualBench/VisualBenchmarkStream.cpp b/tools/VisualBench/VisualBenchmarkStream.cpp index b15ac7e8f1..56780f8f99 100644 --- a/tools/VisualBench/VisualBenchmarkStream.cpp +++ b/tools/VisualBench/VisualBenchmarkStream.cpp @@ -56,8 +56,7 @@ private: paint.setStrokeWidth(2); SkPaint perlinPaint; - perlinPaint.setShader(SkPerlinNoiseShader::CreateTurbulence(0.1f, 0.1f, 1, 0, - nullptr))->unref(); + perlinPaint.setShader(SkPerlinNoiseShader::MakeTurbulence(0.1f, 0.1f, 1, 0, nullptr)); for (int i = 0; i < loops; i++) { canvas->drawPath(fPath, paint); canvas->drawRect(fPerlinRect, perlinPaint); diff --git a/tools/debugger/SkDrawCommand.cpp b/tools/debugger/SkDrawCommand.cpp index 5dc6079897..af1270c9e5 100644 --- a/tools/debugger/SkDrawCommand.cpp +++ b/tools/debugger/SkDrawCommand.cpp @@ -1125,8 +1125,7 @@ static void extract_json_paint_shader(Json::Value& jsonPaint, UrlDataManager& ur Json::Value jsonShader = jsonPaint[SKDEBUGCANVAS_ATTRIBUTE_SHADER]; SkShader* shader = (SkShader*) load_flattenable(jsonShader, urlDataManager); if (shader != nullptr) { - target->setShader(shader); - shader->unref(); + target->setShader(sk_ref_sp(shader)); } } } |