Bug 788549: Fix matrix animations (patch hunk got lost in rebasing) r=dbaron
authorDavid Zbarsky <dzbarsky@gmail.com>
Sun, 02 Jun 2013 13:35:17 -0700
changeset 133773 5103d37775cebe0b201da4ddc22f1084ce5c5d8e
parent 133736 198e38876f7e06d49be862710f76881f79abf1d7
child 133774 5a21e83107b0120ba790ff71c0db6afba45dc7b4
push id24771
push userryanvm@gmail.com
push dateMon, 03 Jun 2013 19:56:31 +0000
treeherdermozilla-central@e8a328c3e5bb [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersdbaron
bugs788549
milestone24.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 788549: Fix matrix animations (patch hunk got lost in rebasing) r=dbaron
layout/base/nsDisplayList.cpp
--- a/layout/base/nsDisplayList.cpp
+++ b/layout/base/nsDisplayList.cpp
@@ -212,27 +212,27 @@ static void AddTransformFunctions(nsCSSV
         break;
       }
       case eCSSKeyword_matrix:
       {
         gfx3DMatrix matrix;
         matrix._11 = array->Item(1).GetFloatValue();
         matrix._12 = array->Item(2).GetFloatValue();
         matrix._13 = 0;
-        matrix._14 = array->Item(5).GetFloatValue();
+        matrix._14 = 0;
         matrix._21 = array->Item(3).GetFloatValue();
         matrix._22 = array->Item(4).GetFloatValue();
         matrix._23 = 0;
-        matrix._24 = array->Item(6).GetFloatValue();
+        matrix._24 = 0;
         matrix._31 = 0;
         matrix._32 = 0;
         matrix._33 = 1;
         matrix._34 = 0;
-        matrix._41 = 0;
-        matrix._42 = 0;
+        matrix._41 = array->Item(5).GetFloatValue();
+        matrix._42 = array->Item(6).GetFloatValue();
         matrix._43 = 0;
         matrix._44 = 1;
         aFunctions.AppendElement(TransformMatrix(matrix));
         break;
       }
       case eCSSKeyword_matrix3d:
       {
         gfx3DMatrix matrix;