Revert "Use 2d matrix for transform to work around Safari clipping bug (

flutter#15976)" This reverts commit 79affca.
NoamDev · Feb 27, 2020 · 703fa34 · 703fa34
1 parent f48117c
commit 703fa34
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 42 deletions.
diff --git a/lib/web_ui/lib/src/engine/util.dart b/lib/web_ui/lib/src/engine/util.dart
@@ -77,14 +77,7 @@ void setElementTransform(html.Element element, Float64List matrix4) {
   final bool isHighDevicePixelRatioScreen =
       EngineWindow.browserDevicePixelRatio > 1.0;
 
-  if (transformKind == TransformKind.scaleAndTranslate2d) {
-    final String cssTransform = float64ListToCssTransform2d(matrix4);
-    element.style
-      ..transformOrigin = '0 0 0'
-      ..transform = cssTransform
-      ..top = null
-      ..left = null;
-  } else if (transformKind == TransformKind.complex || isHighDevicePixelRatioScreen) {
+  if (transformKind == TransformKind.complex || isHighDevicePixelRatioScreen) {
     final String cssTransform = float64ListToCssTransform3d(matrix4);
     element.style
       ..transformOrigin = '0 0 0'
@@ -114,9 +107,6 @@ enum TransformKind {
   /// No effect.
   identity,
 
-  /// A transform that contains only 2d scale and transform.
-  scaleAndTranslate2d,
-
   /// A translation along either X or Y axes, or both.
   translation2d,
 
@@ -133,13 +123,12 @@ TransformKind transformKindOf(Float64List matrix) {
 
   // If matrix contains scaling, rotation, z translation or
   // perspective transform, it is not considered simple.
-  final bool isSimple2dTransform =
-      // m[0] - scale x is simple
+  final bool isSimpleTransform = m[0] == 1.0 &&
       m[1] == 0.0 &&
       m[2] == 0.0 &&
       m[3] == 0.0 &&
       m[4] == 0.0 &&
-      // m[5] - scale y is simple
+      m[5] == 1.0 &&
       m[6] == 0.0 &&
       m[7] == 0.0 &&
       m[8] == 0.0 &&
@@ -151,19 +140,15 @@ TransformKind transformKindOf(Float64List matrix) {
       m[14] == 0.0 && // z translation is NOT simple
       m[15] == 1.0;
 
-  if (!isSimple2dTransform) {
+  if (!isSimpleTransform) {
     return TransformKind.complex;
   }
 
-  if (m[0] == 1.0 && m[5] == 1.0) {
-    if (ty != 0.0 || tx != 0.0) {
-      return TransformKind.translation2d;
-    } else {
-      return TransformKind.identity;
-    }
-  } else {
-    return TransformKind.scaleAndTranslate2d;
+  if (ty != 0.0 || tx != 0.0) {
+    return TransformKind.translation2d;
   }
+
+  return TransformKind.identity;
 }
 
 /// Returns `true` is the [matrix] describes an identity transformation.
@@ -172,38 +157,29 @@ bool isIdentityFloat64ListTransform(Float64List matrix) {
   return transformKindOf(matrix) == TransformKind.identity;
 }
 
-/// Converts [matrix] to CSS transform value.
-String float64ListToCssTransform2d(Float64List matrix) {
-  assert (transformKindOf(matrix) == TransformKind.scaleAndTranslate2d);
-  return 'matrix(${matrix[0]},0,0,${matrix[5]},${matrix[12]},${matrix[13]})';
-}
-
 /// Converts [matrix] to CSS transform value.
 String float64ListToCssTransform(Float64List matrix) {
   assert(matrix.length == 16);
   final Float64List m = matrix;
-  if (m[1] == 0.0 &&
+  if (m[0] == 1.0 &&
+      m[1] == 0.0 &&
       m[2] == 0.0 &&
       m[3] == 0.0 &&
       m[4] == 0.0 &&
+      m[5] == 1.0 &&
       m[6] == 0.0 &&
       m[7] == 0.0 &&
       m[8] == 0.0 &&
       m[9] == 0.0 &&
       m[10] == 1.0 &&
       m[11] == 0.0 &&
-      // 12 can be anything (translation)
-      // 13 can be anything (translation)
+      // 12 can be anything
+      // 13 can be anything
       m[14] == 0.0 &&
       m[15] == 1.0) {
     final double tx = m[12];
     final double ty = m[13];
-    if (m[0] == 1.0 &&
-          m[5] == 1.0) {
-        return 'translate(${tx}px, ${ty}px)';
-    } else {
-      return 'matrix(${m[0]},0,0,${m[5]},${tx},${ty})';
-    }
+    return 'translate(${tx}px, ${ty}px)';
   } else {
     return 'matrix3d(${m[0]},${m[1]},${m[2]},${m[3]},${m[4]},${m[5]},${m[6]},${m[7]},${m[8]},${m[9]},${m[10]},${m[11]},${m[12]},${m[13]},${m[14]},${m[15]})';
   }

diff --git a/lib/web_ui/test/engine/util_test.dart b/lib/web_ui/test/engine/util_test.dart
@@ -12,7 +12,6 @@ final Float64List identityTransform = Matrix4.identity().storage;
 final Float64List xTranslation = (Matrix4.identity()..translate(10)).storage;
 final Float64List yTranslation = (Matrix4.identity()..translate(0, 10)).storage;
 final Float64List zTranslation = (Matrix4.identity()..translate(0, 0, 10)).storage;
-final Float64List scaleAndTransform2d = (Matrix4.identity()..scale(2, 3, 1)..translate(4, 5, 0)).storage;
 
 void main() {
   test('transformKindOf and isIdentityFloat64ListTransform identify matrix kind', () {
@@ -27,8 +26,5 @@ void main() {
 
     expect(transformKindOf(zTranslation), TransformKind.complex);
     expect(isIdentityFloat64ListTransform(zTranslation), isFalse);
-
-    expect(transformKindOf(scaleAndTransform2d), TransformKind.scaleAndTranslate2d);
-    expect(isIdentityFloat64ListTransform(scaleAndTransform2d), isFalse);
   });
 }