SkXPS: fix drawBitmapRect()

Change-Id: Id618d0f96a7143dde3966ef4bb51924fb49cb6a8
Reviewed-on: https://skia-review.googlesource.com/9837
Reviewed-by: Ben Wagner <bungeman@google.com>
Commit-Queue: Hal Canary <halcanary@google.com>
This commit is contained in:
Hal Canary 2017-03-17 11:48:59 -04:00 committed by Skia Commit-Bot
parent 31249bb2df
commit bc21243343

View File

@ -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<IXpsOMTileBrush> 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);