From 07f665efb918f68e406b76a78d0b76d5c714f16c Mon Sep 17 00:00:00 2001 From: Herb Derby Date: Mon, 13 Feb 2017 20:04:00 +0000 Subject: Revert "Always make SkImageShaders in heap." This reverts commit ff590a12441002d281254ec6a86070ac0a19263f. Reason for revert: This breaks the android roll because they are using a private call. Updating android tests to use new api. Original change's description: > Always make SkImageShaders in heap. > > I made a couple of measurments, and it looks like any differences is > well below the noise threshold. > > Just for the record run1: .9991 of baseline and run2 .9988 of baseline. > I was using top25 .skps as workload. > > TBR=mtklein@google.com > > Change-Id: If4fa06e5d5df72fb67dbb4bbb99c926f05765897 > Reviewed-on: https://skia-review.googlesource.com/8341 > Reviewed-by: Herb Derby > Commit-Queue: Herb Derby > TBR=mtklein@chromium.org,mtklein@google.com,herb@google.com,reviews@skia.org NOPRESUBMIT=true NOTREECHECKS=true NOTRY=true Change-Id: Ibdaafc796702e250933b62e5f4abb5e2ce8d40c0 Reviewed-on: https://skia-review.googlesource.com/8393 Commit-Queue: Herb Derby Reviewed-by: Herb Derby --- src/core/SkShader.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/core/SkShader.cpp') diff --git a/src/core/SkShader.cpp b/src/core/SkShader.cpp index cfdd8b946e..81aae116d5 100644 --- a/src/core/SkShader.cpp +++ b/src/core/SkShader.cpp @@ -232,7 +232,7 @@ sk_sp SkShader::MakeBitmapShader(const SkBitmap& src, TileMode tmx, Ti if (localMatrix && !localMatrix->invert(nullptr)) { return nullptr; } - return SkMakeBitmapShader(src, tmx, tmy, localMatrix, kIfMutable_SkCopyPixelsMode); + return SkMakeBitmapShader(src, tmx, tmy, localMatrix, kIfMutable_SkCopyPixelsMode, nullptr); } sk_sp SkShader::MakePictureShader(sk_sp src, TileMode tmx, TileMode tmy, -- cgit v1.2.3