From 02277ce4a191c56359ebe2c033f59dec4423ad42 Mon Sep 17 00:00:00 2001 From: Boris Chiou Date: Thu, 10 Aug 2017 17:41:47 +0800 Subject: [PATCH] Fix the conversion from Perspective into ComputedMatrix. We convert a perspective function into a ComputedMatrix, but we apply the perspective length to a wrong matrix item. We should put it into m34, instead of m43. m43 is for translate parameter Z. --- .../properties/helpers/animated_properties.mako.rs | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/components/style/properties/helpers/animated_properties.mako.rs b/components/style/properties/helpers/animated_properties.mako.rs index 4b423751d6b..2f11d506f29 100644 --- a/components/style/properties/helpers/animated_properties.mako.rs +++ b/components/style/properties/helpers/animated_properties.mako.rs @@ -1474,11 +1474,17 @@ fn add_weighted_transform_lists(from_list: &[TransformOperation], } } (&TransformOperation::Perspective(fd), - &TransformOperation::Perspective(_td)) => { + &TransformOperation::Perspective(td)) => { let mut fd_matrix = ComputedMatrix::identity(); let mut td_matrix = ComputedMatrix::identity(); - fd_matrix.m43 = -1. / fd.to_f32_px(); - td_matrix.m43 = -1. / _td.to_f32_px(); + if fd.0 > 0 { + fd_matrix.m34 = -1. / fd.to_f32_px(); + } + + if td.0 > 0 { + td_matrix.m34 = -1. / td.to_f32_px(); + } + let sum = fd_matrix.add_weighted(&td_matrix, self_portion, other_portion) .unwrap(); result.push(TransformOperation::Matrix(sum));