Upstream version 10.39.225.0

[platform/framework/web/crosswalk.git] / src / cc / layers / video_layer_impl_unittest.cc

diff --git a/src/cc/layers/video_layer_impl_unittest.cc b/src/cc/layers/video_layer_impl_unittest.cc
index 03fafc0..2fde495 100644 (file)
--- a/src/cc/layers/video_layer_impl_unittest.cc
+++ b/src/cc/layers/video_layer_impl_unittest.cc
@@ -66,11 +66,8 @@ TEST(VideoLayerImplTest, Occlusion) {
     impl.AppendQuadsWithOcclusion(video_layer_impl, occluded);
 
     size_t partially_occluded_count = 0;
-    LayerTestCommon::VerifyQuadsCoverRectWithOcclusion(
-        impl.quad_list(),
-        gfx::Rect(layer_size),
-        occluded,
-        &partially_occluded_count);
+    LayerTestCommon::VerifyQuadsAreOccluded(
+        impl.quad_list(), occluded, &partially_occluded_count);
     // The layer outputs one quad, which is partially occluded.
     EXPECT_EQ(1u, impl.quad_list().size());
     EXPECT_EQ(1u, partially_occluded_count);
@@ -122,10 +119,10 @@ TEST(VideoLayerImplTest, Rotated0) {
 
   EXPECT_EQ(1u, impl.quad_list().size());
 
-  gfx::Point3F p1(0, impl.quad_list()[0]->rect.height(), 0);
-  gfx::Point3F p2(impl.quad_list()[0]->rect.width(), 0, 0);
-  impl.quad_list()[0]->quadTransform().TransformPoint(&p1);
-  impl.quad_list()[0]->quadTransform().TransformPoint(&p2);
+  gfx::Point3F p1(0, impl.quad_list().front()->rect.height(), 0);
+  gfx::Point3F p2(impl.quad_list().front()->rect.width(), 0, 0);
+  impl.quad_list().front()->quadTransform().TransformPoint(&p1);
+  impl.quad_list().front()->quadTransform().TransformPoint(&p2);
   EXPECT_EQ(gfx::Point3F(0, 50, 0), p1);
   EXPECT_EQ(gfx::Point3F(100, 0, 0), p2);
 }
@@ -158,10 +155,10 @@ TEST(VideoLayerImplTest, Rotated90) {
 
   EXPECT_EQ(1u, impl.quad_list().size());
 
-  gfx::Point3F p1(0, impl.quad_list()[0]->rect.height(), 0);
-  gfx::Point3F p2(impl.quad_list()[0]->rect.width(), 0, 0);
-  impl.quad_list()[0]->quadTransform().TransformPoint(&p1);
-  impl.quad_list()[0]->quadTransform().TransformPoint(&p2);
+  gfx::Point3F p1(0, impl.quad_list().front()->rect.height(), 0);
+  gfx::Point3F p2(impl.quad_list().front()->rect.width(), 0, 0);
+  impl.quad_list().front()->quadTransform().TransformPoint(&p1);
+  impl.quad_list().front()->quadTransform().TransformPoint(&p2);
   EXPECT_EQ(gfx::Point3F(0, 0, 0), p1);
   EXPECT_EQ(gfx::Point3F(100, 50, 0), p2);
 }
@@ -194,10 +191,10 @@ TEST(VideoLayerImplTest, Rotated180) {
 
   EXPECT_EQ(1u, impl.quad_list().size());
 
-  gfx::Point3F p1(0, impl.quad_list()[0]->rect.height(), 0);
-  gfx::Point3F p2(impl.quad_list()[0]->rect.width(), 0, 0);
-  impl.quad_list()[0]->quadTransform().TransformPoint(&p1);
-  impl.quad_list()[0]->quadTransform().TransformPoint(&p2);
+  gfx::Point3F p1(0, impl.quad_list().front()->rect.height(), 0);
+  gfx::Point3F p2(impl.quad_list().front()->rect.width(), 0, 0);
+  impl.quad_list().front()->quadTransform().TransformPoint(&p1);
+  impl.quad_list().front()->quadTransform().TransformPoint(&p2);
   EXPECT_EQ(gfx::Point3F(100, 0, 0), p1);
   EXPECT_EQ(gfx::Point3F(0, 50, 0), p2);
 }
@@ -230,10 +227,10 @@ TEST(VideoLayerImplTest, Rotated270) {
 
   EXPECT_EQ(1u, impl.quad_list().size());
 
-  gfx::Point3F p1(0, impl.quad_list()[0]->rect.height(), 0);
-  gfx::Point3F p2(impl.quad_list()[0]->rect.width(), 0, 0);
-  impl.quad_list()[0]->quadTransform().TransformPoint(&p1);
-  impl.quad_list()[0]->quadTransform().TransformPoint(&p2);
+  gfx::Point3F p1(0, impl.quad_list().front()->rect.height(), 0);
+  gfx::Point3F p2(impl.quad_list().front()->rect.width(), 0, 0);
+  impl.quad_list().front()->quadTransform().TransformPoint(&p1);
+  impl.quad_list().front()->quadTransform().TransformPoint(&p2);
   EXPECT_EQ(gfx::Point3F(100, 50, 0), p1);
   EXPECT_EQ(gfx::Point3F(0, 0, 0), p2);
 }