Merge "Fix setShadowLayer + drawTextOnPath" into rvc-dev am: 7e17bc6496 am: e21afec2c5 am: 697eda359d am: 847725f66e

Change-Id: I06729007ece72910f2b3f6d5af3f027489547315

1 files changed, 4 insertions, 2 deletions

diff --git a/libs/hwui/SkiaCanvas.cpp b/libs/hwui/SkiaCanvas.cpp
index 1896193d3958..49e606b705d2 100644
--- a/libs/hwui/SkiaCanvas.cpp
+++ b/libs/hwui/SkiaCanvas.cpp
@@ -790,9 +790,11 @@ void SkiaCanvas::drawLayoutOnPath(const minikin::Layout& layout, float hOffset,
         xform[i - start].fTx = pos.x() - tan.y() * y - halfWidth * tan.x();
         xform[i - start].fTy = pos.y() + tan.x() * y - halfWidth * tan.y();
     }
-    auto* finalCanvas = this->asSkCanvas();
+
+    sk_sp<SkTextBlob> textBlob(builder.make());
+
     apply_looper(&paintCopy, [&](const SkPaint& p) {
-        finalCanvas->drawTextBlob(builder.make(), 0, 0, paintCopy);
+        mCanvas->drawTextBlob(textBlob, 0, 0, p);
     });
 }