Add flag in preparation for 4x4 matrices in SkCanvas

Part of the transition is for getTotalMatrix() to return by value. Related Skia CL: https://skia-review.googlesource.com/c/skia/+/262056 Change-Id: I7fd9e303b6078911bf82b3c43d2092e6131821c8 Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1987192 Reviewed-by: Florin Malita <fmalita@chromium.org> Reviewed-by: vmpstr <vmpstr@chromium.org> Commit-Queue: vmpstr <vmpstr@chromium.org> Cr-Commit-Position: refs/heads/master@{#728926}
Denger-Network · Jan 7, 2020 · f97e2d1 · f97e2d1
1 parent b7df28d
commit f97e2d1
Show file tree

Hide file tree

Showing 7 changed files with 10 additions and 6 deletions.
diff --git a/cc/paint/paint_canvas.h b/cc/paint/paint_canvas.h
@@ -180,7 +180,7 @@ class CC_PAINT_EXPORT PaintCanvas {
   virtual void drawPicture(sk_sp<const PaintRecord> record) = 0;
 
   virtual bool isClipEmpty() const = 0;
-  virtual const SkMatrix& getTotalMatrix() const = 0;
+  virtual SkMatrix getTotalMatrix() const = 0;
 
   // Used for printing
   enum class AnnotationType {

diff --git a/cc/paint/record_paint_canvas.cc b/cc/paint/record_paint_canvas.cc
@@ -296,7 +296,7 @@ bool RecordPaintCanvas::isClipEmpty() const {
   return GetCanvas()->isClipEmpty();
 }
 
-const SkMatrix& RecordPaintCanvas::getTotalMatrix() const {
+SkMatrix RecordPaintCanvas::getTotalMatrix() const {
   return GetCanvas()->getTotalMatrix();
 }
 

diff --git a/cc/paint/record_paint_canvas.h b/cc/paint/record_paint_canvas.h
@@ -102,7 +102,7 @@ class CC_PAINT_EXPORT RecordPaintCanvas : public PaintCanvas {
   void drawPicture(sk_sp<const PaintRecord> record) override;
 
   bool isClipEmpty() const override;
-  const SkMatrix& getTotalMatrix() const override;
+  SkMatrix getTotalMatrix() const override;
 
   void Annotate(AnnotationType type,
                 const SkRect& rect,

diff --git a/cc/paint/skia_paint_canvas.cc b/cc/paint/skia_paint_canvas.cc
@@ -328,7 +328,7 @@ bool SkiaPaintCanvas::isClipEmpty() const {
   return canvas_->isClipEmpty();
 }
 
-const SkMatrix& SkiaPaintCanvas::getTotalMatrix() const {
+SkMatrix SkiaPaintCanvas::getTotalMatrix() const {
   return canvas_->getTotalMatrix();
 }
 

diff --git a/cc/paint/skia_paint_canvas.h b/cc/paint/skia_paint_canvas.h
@@ -126,7 +126,7 @@ class CC_PAINT_EXPORT SkiaPaintCanvas final : public PaintCanvas {
   void drawPicture(sk_sp<const PaintRecord> record) override;
 
   bool isClipEmpty() const override;
-  const SkMatrix& getTotalMatrix() const override;
+  SkMatrix getTotalMatrix() const override;
 
   void Annotate(AnnotationType type,
                 const SkRect& rect,

diff --git a/skia/config/SkUserConfig.h b/skia/config/SkUserConfig.h
@@ -211,6 +211,10 @@ SK_API void SkDebugf_FileLine(const char* file,
 #define SK_DISABLE_REDUCE_OPLIST_SPLITTING
 #endif
 
+#ifndef SK_SUPPORT_LEGACY_CANVAS_MATRIX_33
+#define SK_SUPPORT_LEGACY_CANVAS_MATRIX_33
+#endif
+
 #ifndef SK_IGNORE_LINEONLY_AA_CONVEX_PATH_OPTS
 #define SK_IGNORE_LINEONLY_AA_CONVEX_PATH_OPTS
 #endif

diff --git a/third_party/blink/renderer/platform/graphics/test/mock_paint_canvas.h b/third_party/blink/renderer/platform/graphics/test/mock_paint_canvas.h
@@ -98,7 +98,7 @@ class MockPaintCanvas : public cc::PaintCanvas {
   MOCK_METHOD1(drawPicture, void(sk_sp<const PaintRecord> record));
   MOCK_CONST_METHOD0(isClipEmpty, bool());
   MOCK_CONST_METHOD0(isClipRect, bool());
-  MOCK_CONST_METHOD0(getTotalMatrix, const SkMatrix&());
+  MOCK_CONST_METHOD0(getTotalMatrix, SkMatrix());
 
   MOCK_METHOD3(Annotate,
                void(AnnotationType type,