SkDevice::drawBitmap takes x,y, not matrix

Motivation:  a simpler call should make it easier for SkPDF to learn how
to do drawBitmap with A8 bitmap and a maskfilter.
Change-Id: I1a5d190b40b0e9e08fa8876d265a9835a3e9987d
Reviewed-on: https://skia-review.googlesource.com/20961
Reviewed-by: Mike Reed <reed@google.com>
Commit-Queue: Hal Canary <halcanary@google.com>

1 files changed, 4 insertions, 2 deletions

diff --git a/src/xps/SkXPSDevice.cpp b/src/xps/SkXPSDevice.cpp
index 202259090e..801b80c0b0 100644
--- a/src/xps/SkXPSDevice.cpp
+++ b/src/xps/SkXPSDevice.cpp
@@ -1780,7 +1780,9 @@ HRESULT SkXPSDevice::clipToPath(IXpsOMVisual* xpsVisual,
 }
 
 void SkXPSDevice::drawBitmap(const SkBitmap& bitmap,
-                             const SkMatrix& matrix, const SkPaint& paint) {
+                             SkScalar x,
+                             SkScalar y,
+                             const SkPaint& paint) {
     if (this->cs().isEmpty(size(*this))) {
         return;
     }
@@ -1807,7 +1809,7 @@ void SkXPSDevice::drawBitmap(const SkBitmap& bitmap,
     HRVM(shadedGeometry->GetFigures(&shadedFigures),
          "Could not get the figures for bitmap.");
 
-    SkMatrix transform = matrix;
+    SkMatrix transform = SkMatrix::MakeTrans(x, y);
     transform.postConcat(this->ctm());
 
     SkTScopedComPtr<IXpsOMMatrixTransform> xpsTransform;