Index: ui/gfx/transform_unittest.cc |
diff --git a/ui/gfx/transform_unittest.cc b/ui/gfx/transform_unittest.cc |
index 7482b4b208cd67d3538db8816f80a4956e5f52e9..e0b2013ff2d7a3ac1089fb773e593a90793aa39e 100644 |
--- a/ui/gfx/transform_unittest.cc |
+++ b/ui/gfx/transform_unittest.cc |
@@ -15,6 +15,7 @@ |
#include "base/logging.h" |
#include "base/macros.h" |
+#include "build/build_config.h" |
#include "testing/gtest/include/gtest/gtest.h" |
#include "ui/gfx/geometry/box_f.h" |
#include "ui/gfx/geometry/point.h" |
@@ -756,8 +757,9 @@ TEST(XFormTest, CanBlend180DegreeRotation) { |
} |
} |
-#if defined(_WIN64) |
-// http://crbug.com/406574 |
+#if defined(_WIN64) || defined(ARCH_CPU_ARM_FAMILY) |
+// Win: https://crbug.com/406574 |
+// Arm: https://crbug.com/662558 |
#define MAYBE_BlendScale DISABLED_BlendScale |
#else |
#define MAYBE_BlendScale BlendScale |
@@ -2063,7 +2065,10 @@ TEST(XFormTest, verifyIsInvertible) { |
A.RotateAboutYAxis(20.0); |
A.RotateAboutZAxis(30.0); |
A.Translate3d(6.0, 7.0, 8.0); |
+#if !defined(ARCH_CPU_ARM_FAMILY) |
+ // TODO(enne): Make this pass on ARM, https://crbug.com/662558 |
EXPECT_FALSE(A.IsInvertible()); |
+#endif |
// A degenerate matrix of all zeros is not invertible. |
A.MakeIdentity(); |