From 1a6e99b23dedc2cd6845697f00bbf089e51c73e0 Mon Sep 17 00:00:00 2001
From: Brian Osman <brianosman@google.com>
Date: Tue, 21 Apr 2020 08:46:57 -0400
Subject: [PATCH] Remove legacy version of SkCanvas::didConcat44
 (flutter/engine#17828)

Builds flags have been switched, so the old versions aren't needed any
longer.
---
 engine/src/flutter/shell/common/canvas_spy.cc | 4 ----
 engine/src/flutter/shell/common/canvas_spy.h  | 4 ----
 engine/src/flutter/testing/mock_canvas.cc     | 7 -------
 engine/src/flutter/testing/mock_canvas.h      | 4 ----
 4 files changed, 19 deletions(-)

diff --git a/engine/src/flutter/shell/common/canvas_spy.cc b/engine/src/flutter/shell/common/canvas_spy.cc
index 4b6301690c5..b9b97098e91 100644
--- a/engine/src/flutter/shell/common/canvas_spy.cc
+++ b/engine/src/flutter/shell/common/canvas_spy.cc
@@ -53,11 +53,7 @@ void DidDrawCanvas::willRestore() {}
 
 void DidDrawCanvas::didConcat(const SkMatrix& matrix) {}
 
-#ifdef SK_SUPPORT_LEGACY_DIDCONCAT44
-void DidDrawCanvas::didConcat44(const SkScalar[]) {}
-#else
 void DidDrawCanvas::didConcat44(const SkM44&) {}
-#endif
 
 void DidDrawCanvas::didScale(SkScalar, SkScalar) {}
 
diff --git a/engine/src/flutter/shell/common/canvas_spy.h b/engine/src/flutter/shell/common/canvas_spy.h
index 594cd5224f0..0526a9375d0 100644
--- a/engine/src/flutter/shell/common/canvas_spy.h
+++ b/engine/src/flutter/shell/common/canvas_spy.h
@@ -71,11 +71,7 @@ class DidDrawCanvas final : public SkCanvasVirtualEnforcer<SkNoDrawCanvas> {
 
   // |SkCanvasVirtualEnforcer<SkNoDrawCanvas>|
   void didConcat(const SkMatrix&) override;
-#ifdef SK_SUPPORT_LEGACY_DIDCONCAT44
-  void didConcat44(const SkScalar[]) override;
-#else
   void didConcat44(const SkM44&) override;
-#endif
   void didScale(SkScalar, SkScalar) override;
   void didTranslate(SkScalar, SkScalar) override;
 
diff --git a/engine/src/flutter/testing/mock_canvas.cc b/engine/src/flutter/testing/mock_canvas.cc
index a29d0d77e99..8c021ffe9fd 100644
--- a/engine/src/flutter/testing/mock_canvas.cc
+++ b/engine/src/flutter/testing/mock_canvas.cc
@@ -60,17 +60,10 @@ void MockCanvas::didConcat(const SkMatrix& matrix) {
   draw_calls_.emplace_back(DrawCall{current_layer_, ConcatMatrixData{matrix}});
 }
 
-#ifdef SK_SUPPORT_LEGACY_DIDCONCAT44
-void MockCanvas::didConcat44(const SkScalar matrix[]) {
-  SkM44 m44 = SkM44::ColMajor(matrix);
-  draw_calls_.emplace_back(DrawCall{current_layer_, ConcatMatrix44Data{m44}});
-}
-#else
 void MockCanvas::didConcat44(const SkM44& matrix) {
   draw_calls_.emplace_back(
       DrawCall{current_layer_, ConcatMatrix44Data{matrix}});
 }
-#endif
 
 void MockCanvas::didScale(SkScalar x, SkScalar y) {
   SkMatrix m;
diff --git a/engine/src/flutter/testing/mock_canvas.h b/engine/src/flutter/testing/mock_canvas.h
index 72f5f1f9ad8..2836ccaba2c 100644
--- a/engine/src/flutter/testing/mock_canvas.h
+++ b/engine/src/flutter/testing/mock_canvas.h
@@ -145,11 +145,7 @@ class MockCanvas : public SkCanvasVirtualEnforcer<SkCanvas> {
   void willRestore() override;
   void didRestore() override {}
   void didConcat(const SkMatrix& matrix) override;
-#ifdef SK_SUPPORT_LEGACY_DIDCONCAT44
-  void didConcat44(const SkScalar matrix[]) override;
-#else
   void didConcat44(const SkM44&) override;
-#endif
   void didScale(SkScalar x, SkScalar y) override;
   void didTranslate(SkScalar x, SkScalar y) override;
   void didSetMatrix(const SkMatrix& matrix) override;