Upstream version 5.34.104.0

[platform/framework/web/crosswalk.git] / src / cc / trees / quad_culler_unittest.cc

diff --git a/src/cc/trees/quad_culler_unittest.cc b/src/cc/trees/quad_culler_unittest.cc
index 880035a..ee97319 100644 (file)
--- a/src/cc/trees/quad_culler_unittest.cc
+++ b/src/cc/trees/quad_culler_unittest.cc
@@ -39,10 +39,7 @@ class TestOcclusionTrackerImpl
   DISALLOW_COPY_AND_ASSIGN(TestOcclusionTrackerImpl);
 };
 
-typedef LayerIterator<LayerImpl,
-                      LayerImplList,
-                      RenderSurfaceImpl,
-                      LayerIteratorActions::FrontToBack> LayerIteratorType;
+typedef LayerIterator<LayerImpl> LayerIteratorType;
 
 class QuadCullerTest : public testing::Test {
  public:
@@ -84,7 +81,7 @@ class QuadCullerTest : public testing::Test {
       }
     }
 
-    gfx::Rect rect_in_target = MathUtil::MapClippedRect(
+    gfx::Rect rect_in_target = MathUtil::MapEnclosingClippedRect(
         layer->draw_transform(), layer->visible_content_rect());
     if (!parent) {
       layer->CreateRenderSurface();
@@ -94,7 +91,7 @@ class QuadCullerTest : public testing::Test {
     } else {
       layer->draw_properties().render_target = parent->render_target();
       parent->render_surface()->layer_list().push_back(layer.get());
-      rect_in_target.Union(MathUtil::MapClippedRect(
+      rect_in_target.Union(MathUtil::MapEnclosingClippedRect(
           parent->draw_transform(), parent->visible_content_rect()));
       parent->render_surface()->SetContentRect(rect_in_target);
     }