From 9283d20afc27571f7a871d1bd1100dd5df584941 Mon Sep 17 00:00:00 2001 From: reed Date: Sun, 13 Mar 2016 13:01:57 -0700 Subject: Revert of more shader-->sp conversions (patchset #5 id:80001 of https://codereview.chromium.org/1789633002/ ) Reason for revert: seems to have changed pictureshadertile Original issue's description: > more shader-->sp conversions > > BUG=skia: > GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1789633002 > > Committed: https://skia.googlesource.com/skia/+/ce563cdd48ec7ce4e0420dd88760df9be9dba50c TBR=fmalita@chromium.org # Skipping CQ checks because original CL landed less than 1 days ago. NOPRESUBMIT=true NOTREECHECKS=true NOTRY=true BUG=skia: Review URL: https://codereview.chromium.org/1790353002 --- gm/tiledscaledbitmap.cpp | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'gm/tiledscaledbitmap.cpp') diff --git a/gm/tiledscaledbitmap.cpp b/gm/tiledscaledbitmap.cpp index d74d40bf49..daecbb05e2 100644 --- a/gm/tiledscaledbitmap.cpp +++ b/gm/tiledscaledbitmap.cpp @@ -1,10 +1,10 @@ + /* * Copyright 2014 Google Inc. * * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ - #include "gm.h" #include "Resources.h" @@ -14,6 +14,7 @@ #include "SkShader.h" #include "SkStream.h" + /*** * * This GM reproduces Skia bug 2904, in which a tiled bitmap shader was failing to draw correctly @@ -63,8 +64,10 @@ protected: mat.setScale(121.f/360.f, 93.f/288.f); mat.postTranslate(-72, -72); - paint.setShader(SkShader::MakeBitmapShader(fBitmap, SkShader::kRepeat_TileMode, - SkShader::kRepeat_TileMode, &mat)); + SkShader *shader = SkShader::CreateBitmapShader(fBitmap, SkShader::kRepeat_TileMode, SkShader::kRepeat_TileMode, &mat); + paint.setShader(shader); + + SkSafeUnref(shader); canvas->drawRectCoords(8,8,1008, 608, paint); } -- cgit v1.2.3