Rolls cc and webkit_compositor up to 127340

webkit/compositor/WebTransformOperationsTest.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/WebTransformOperations.h>
 
+#include "CCGeometryTestUtils.h"
+#include <gtest/gtest.h>
 #include <public/WebTransformationMatrix.h>
-
-#include "CCLayerTreeTestCommon.h"
-
-#include <gtest/gtest.h>
 #include <wtf/OwnPtr.h>
 #include <wtf/PassOwnPtr.h>
 #include <wtf/Vector.h>
 
 using namespace std;
 using namespace WebKit;
 
 TEST(WebTransformOperationTest, transformTypesAreUnique)
 {
     Vector<OwnPtr<WebTransformOperations> > transforms;
@@ skipping 586 matching lines @@
 
         double progress = 0.5;
 
         WebTransformationMatrix expected;
         expected.applyPerspective(500 + 0.5 * numeric_limits<double>::max());
 
         EXPECT_TRANSFORMATION_MATRIX_EQ(expected, identityOperations[i]->blend(operations, progress));
     }
 }