From bc21243343b24ffb62b83cdfa0a2bb6c60f07c0f Mon Sep 17 00:00:00 2001 From: Hal Canary Date: Fri, 17 Mar 2017 11:48:59 -0400 Subject: SkXPS: fix drawBitmapRect() Change-Id: Id618d0f96a7143dde3966ef4bb51924fb49cb6a8 Reviewed-on: https://skia-review.googlesource.com/9837 Reviewed-by: Ben Wagner Commit-Queue: Hal Canary --- src/xps/SkXPSDevice.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'src/xps') diff --git a/src/xps/SkXPSDevice.cpp b/src/xps/SkXPSDevice.cpp index 514c9332ba..75f4119e52 100644 --- a/src/xps/SkXPSDevice.cpp +++ b/src/xps/SkXPSDevice.cpp @@ -1054,7 +1054,7 @@ HRESULT SkXPSDevice::createXpsBrush(const SkPaint& skPaint, //TODO: outMatrix?? SkMatrix localMatrix = shader->getLocalMatrix(); if (parentTransform) { - localMatrix.preConcat(*parentTransform); + localMatrix.postConcat(*parentTransform); } SkTScopedComPtr tileBrush; @@ -2256,6 +2256,7 @@ void SkXPSDevice::drawBitmapRect(const SkBitmap& bitmap, const SkRect& dst, const SkPaint& paint, SkCanvas::SrcRectConstraint constraint) { + // TODO(halcanary): more closely use correct logic for src > bitmap.bounds(). SkRect srcBounds = src ? *src : SkRect::Make(bitmap.bounds()); SkMatrix matrix = SkMatrix::MakeRectToRect(srcBounds, dst, SkMatrix::kFill_ScaleToFit); -- cgit v1.2.3