From 9c9005a347e9996f357bd79591bd34f74f8bbc66 Mon Sep 17 00:00:00 2001 From: "commit-bot@chromium.org" Date: Mon, 28 Apr 2014 14:55:39 +0000 Subject: Move SkShader::fLocalMatrix into SkShader constructor. As a first step towards removing SkShader::setLocalMatrix, which will make SkShader thread-safe, remove calls to setLocalMatrix that happen immediately after the shader is being created. Instead, pass the matrix into the constructor or factory method. BUG=skia:1976 R=scroggo@google.com, reed@google.com, skyostil@google.com, mtklein@google.com Author: dominikg@chromium.org Review URL: https://codereview.chromium.org/245963010 git-svn-id: http://skia.googlecode.com/svn/trunk@14401 2bbb7eff-a529-9590-31e7-b0007b416f81 --- samplecode/SampleAARectModes.cpp | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) (limited to 'samplecode/SampleAARectModes.cpp') diff --git a/samplecode/SampleAARectModes.cpp b/samplecode/SampleAARectModes.cpp index bea0e28799..f9972aea9b 100644 --- a/samplecode/SampleAARectModes.cpp +++ b/samplecode/SampleAARectModes.cpp @@ -68,14 +68,13 @@ static SkShader* make_bg_shader() { *bm.getAddr32(1, 0) = *bm.getAddr32(0, 1) = SkPackARGB32(0xFF, 0xCC, 0xCC, 0xCC); - SkShader* s = SkShader::CreateBitmapShader(bm, - SkShader::kRepeat_TileMode, - SkShader::kRepeat_TileMode); - SkMatrix m; m.setScale(SkIntToScalar(6), SkIntToScalar(6)); - s->setLocalMatrix(m); - return s; + + return SkShader::CreateBitmapShader(bm, + SkShader::kRepeat_TileMode, + SkShader::kRepeat_TileMode, + &m); } class AARectsModesView : public SampleView { -- cgit v1.2.3