1 files changed, 27 insertions, 29 deletions

diff --git a/chromium/third_party/blink/renderer/platform/graphics/intercepting_canvas.h b/chromium/third_party/blink/renderer/platform/graphics/intercepting_canvas.h
index 0a2324a681e..732c863f952 100644
--- a/chromium/third_party/blink/renderer/platform/graphics/intercepting_canvas.h
+++ b/chromium/third_party/blink/renderer/platform/graphics/intercepting_canvas.h
@@ -88,15 +88,17 @@ class InterceptingCanvasBase : public SkCanvas {
   void onDrawOval(const SkRect&, const SkPaint&) override = 0;
   void onDrawRRect(const SkRRect&, const SkPaint&) override = 0;
   void onDrawPath(const SkPath&, const SkPaint&) override = 0;
-  void onDrawImage(const SkImage*,
-                   SkScalar,
-                   SkScalar,
-                   const SkPaint*) override = 0;
-  void onDrawImageRect(const SkImage*,
-                       const SkRect* src,
-                       const SkRect& dst,
-                       const SkPaint*,
-                       SrcRectConstraint) override = 0;
+  void onDrawImage2(const SkImage*,
+                    SkScalar,
+                    SkScalar,
+                    const SkSamplingOptions&,
+                    const SkPaint*) override = 0;
+  void onDrawImageRect2(const SkImage*,
+                        const SkRect& src,
+                        const SkRect& dst,
+                        const SkSamplingOptions&,
+                        const SkPaint*,
+                        SrcRectConstraint) override = 0;
   void onDrawVerticesObject(const SkVertices*,
                             SkBlendMode bmode,
                             const SkPaint&) override = 0;
@@ -115,9 +117,8 @@ class InterceptingCanvasBase : public SkCanvas {
   void onDrawPicture(const SkPicture*,
                      const SkMatrix*,
                      const SkPaint*) override = 0;
-  void didSetMatrix(const SkMatrix&) override = 0;
+  void didSetM44(const SkM44&) override = 0;
   void didConcat44(const SkM44&) override = 0;
-  void didConcat(const SkMatrix&) override = 0;
   void didScale(SkScalar, SkScalar) override = 0;
   void didTranslate(SkScalar, SkScalar) override = 0;
   void willSave() override = 0;
@@ -179,21 +180,24 @@ class InterceptingCanvas : public InterceptingCanvasBase {
     this->SkCanvas::onDrawPath(path, paint);
   }
 
-  void onDrawImage(const SkImage* image,
-                   SkScalar x,
-                   SkScalar y,
-                   const SkPaint* paint) override {
+  void onDrawImage2(const SkImage* image,
+                    SkScalar x,
+                    SkScalar y,
+                    const SkSamplingOptions& sampling,
+                    const SkPaint* paint) override {
     Interceptor interceptor(this);
-    this->SkCanvas::onDrawImage(image, x, y, paint);
+    this->SkCanvas::onDrawImage2(image, x, y, sampling, paint);
   }
 
-  void onDrawImageRect(const SkImage* image,
-                       const SkRect* src,
-                       const SkRect& dst,
-                       const SkPaint* paint,
-                       SrcRectConstraint constraint) override {
+  void onDrawImageRect2(const SkImage* image,
+                        const SkRect& src,
+                        const SkRect& dst,
+                        const SkSamplingOptions& sampling,
+                        const SkPaint* paint,
+                        SrcRectConstraint constraint) override {
     Interceptor interceptor(this);
-    this->SkCanvas::onDrawImageRect(image, src, dst, paint, constraint);
+    this->SkCanvas::onDrawImageRect2(image, src, dst, sampling, paint,
+                                     constraint);
   }
 
   void onDrawVerticesObject(const SkVertices* vertices,
@@ -250,16 +254,10 @@ class InterceptingCanvas : public InterceptingCanvasBase {
     this->UnrollDrawPicture(picture, matrix, paint, nullptr);
   }
 
-  void didSetMatrix(const SkMatrix& matrix) override {
-    Interceptor interceptor(this);
-  }
+  void didSetM44(const SkM44&) override { Interceptor interceptor(this); }
 
   void didConcat44(const SkM44&) override { Interceptor interceptor(this); }
 
-  void didConcat(const SkMatrix& matrix) override {
-    Interceptor interceptor(this);
-  }
-
   void didScale(SkScalar x, SkScalar y) override {
     Interceptor interceptor(this);
   }