commit 0046a50a793be2630512dbc0eeba253a6a82dab3
author Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Sat Sep 25 12:05:07 2021 +0000
committer Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Sat Sep 25 12:05:07 2021 +0000
tree 3e7f9d545e51615cfd343fb0c8eca6f6724f8a9a
parent f7e00f028346ce324136d438a8b683f1f7521f6b
parent 1f557dfea71415a8f5e8282870f05e0a076e0e2f

Snap for 7767684 from 1f557dfea71415a8f5e8282870f05e0a076e0e2f to mainline-media-swcodec-release

Change-Id: I13b99592ab5eb6f214cd09f6563d28151058c200

src/core/SkCanvas.cpp

diff --git a/src/core/SkCanvas.cpp b/src/core/SkCanvas.cpp
index 833df74..bcfb5f9 100644
--- a/src/core/SkCanvas.cpp
+++ b/src/core/SkCanvas.cpp
@@ -2364,7 +2364,7 @@
     // drawable bounds are no longer reliable (e.g. android displaylist)
     // so don't use them for quick-reject
     this->predrawNotify();
-    this->baseDevice()->drawDrawable(dr, matrix, this);
+    this->topDevice()->drawDrawable(dr, matrix, this);
 }
 
 void SkCanvas::onDrawAtlas2(const SkImage* atlas, const SkRSXform xform[], const SkRect tex[],

src/gpu/SkGpuDevice.cpp

diff --git a/src/gpu/SkGpuDevice.cpp b/src/gpu/SkGpuDevice.cpp
index fc6a862..ffcfe53 100644
--- a/src/gpu/SkGpuDevice.cpp
+++ b/src/gpu/SkGpuDevice.cpp
@@ -950,13 +950,14 @@
 
     GrBackendApi api = this->recordingContext()->backend();
     if (GrBackendApi::kVulkan == api) {
-        const SkMatrix& ctm = canvas->getLocalToDeviceAs3x3();
+        const SkMatrix& ctm = this->localToDevice();
         const SkMatrix& combinedMatrix = matrix ? SkMatrix::Concat(ctm, *matrix) : ctm;
         std::unique_ptr<SkDrawable::GpuDrawHandler> gpuDraw =
-                drawable->snapGpuDrawHandler(api, combinedMatrix, canvas->getDeviceClipBounds(),
+                drawable->snapGpuDrawHandler(api, combinedMatrix, this->devClipBounds(),
                                              this->imageInfo());
         if (gpuDraw) {
-            fSurfaceDrawContext->drawDrawable(std::move(gpuDraw), drawable->getBounds());
+            fSurfaceDrawContext->drawDrawable(
+                    std::move(gpuDraw), combinedMatrix.mapRect(drawable->getBounds()));
             return;
         }
     }