Rolls cc and webkit_compositor up to 127340

webkit/compositor/WebTransformationMatrixTest.cpp

 // Copyright 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "config.h"
 
 #include <public/WebTransformationMatrix.h>
 
-#include "CCLayerTreeTestCommon.h"
+#include "CCGeometryTestUtils.h"
 #include <gtest/gtest.h>
 #include <wtf/MathExtras.h>
 
 #define EXPECT_ROW1_EQ(a, b, c, d, matrix)      \
     EXPECT_FLOAT_EQ((a), (matrix).m11());       \
     EXPECT_FLOAT_EQ((b), (matrix).m21());       \
     EXPECT_FLOAT_EQ((c), (matrix).m31());       \
     EXPECT_FLOAT_EQ((d), (matrix).m41());
 
 #define EXPECT_ROW2_EQ(a, b, c, d, matrix)      \
@@ skipping 1276 matching lines @@
     normalizationMatrix.setM11(1 / expectedEndOfAnimation.m44());
     normalizationMatrix.setM22(1 / expectedEndOfAnimation.m44());
     normalizationMatrix.setM33(1 / expectedEndOfAnimation.m44());
     normalizationMatrix.setM44(1 / expectedEndOfAnimation.m44());
     normalizedExpectedEndOfAnimation.multiply(normalizationMatrix);
 
     EXPECT_TRANSFORMATION_MATRIX_EQ(normalizedExpectedEndOfAnimation, to);
 }
 
 } // namespace