diff options
| author |  Herb Derby <herb@google.com> | 2017-02-14 15:06:23 +0000 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2017-02-14 15:06:35 +0000 |
| commit | bfdc87a62193aae20fac0bce37bed7b656f299bb (patch) | |
| tree | a08542f5c7c91356257d1224451893725efa8a4e /src/xps | |
| parent | 8be952ad8c9deefe19cff36f9ad217563400f817 (diff) | |
Revert "Revert "Always make SkImageShaders in heap.""
This reverts commit 07f665efb918f68e406b76a78d0b76d5c714f16c.
Reason for revert: Android code moved from priv api to real api
Original change's description:
> 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 <herb@google.com>
> > Commit-Queue: Herb Derby <herb@google.com>
> >
>
> 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 <herb@google.com>
> Reviewed-by: Herb Derby <herb@google.com>
>
TBR=mtklein@chromium.org,mtklein@google.com,herb@google.com,reviews@skia.org
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
Change-Id: I320b5ebf707d74ffafd8b70d69646b74a30f0ae8
Reviewed-on: https://skia-review.googlesource.com/8407
Commit-Queue: Herb Derby <herb@google.com>
Reviewed-by: Herb Derby <herb@google.com>
Diffstat (limited to 'src/xps')
| -rw-r--r-- | src/xps/SkXPSDevice.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/xps/SkXPSDevice.cpp b/src/xps/SkXPSDevice.cpp index 5b52ab8b04..302f79eebb 100644 --- a/src/xps/SkXPSDevice.cpp +++ b/src/xps/SkXPSDevice.cpp @@ -2273,7 +2273,7 @@ void SkXPSDevice::drawBitmapRect(const SkDraw& draw, auto bitmapShader = SkMakeBitmapShader(bitmap, SkShader::kClamp_TileMode, SkShader::kClamp_TileMode, &matrix, - kNever_SkCopyPixelsMode, nullptr); + kNever_SkCopyPixelsMode); SkASSERT(bitmapShader); if (!bitmapShader) { return; } SkPaint paintWithShader(paint); |