cc: Stop using drawableContentRect for occlusion.

cc/delegated_renderer_layer_impl_unittest.cc

 // 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 "cc/delegated_renderer_layer_impl.h"
 
 #include "cc/append_quads_data.h"
 #include "cc/layer_tree_host_impl.h"
 #include "cc/layer_tree_impl.h"
 #include "cc/quad_sink.h"
@@ skipping 404 matching lines @@
         gfx::Rect childPassRect(20, 20, 7, 7);
         gfx::Transform childPassTransform;
         childPassTransform.Scale(0.8, 0.8);
         childPassTransform.Translate(9.0, 9.0);
 
         {
             TestRenderPass* pass = addRenderPass(delegatedRenderPasses, RenderPass::Id(10, 7), childPassRect, gfx::Transform());
             MockQuadCuller quadSink(pass->quad_list, pass->shared_quad_state_list);
             AppendQuadsData data(pass->id);
             SharedQuadState* sharedState = quadSink.useSharedQuadState(SharedQuadState::Create());
-            sharedState->SetAll(childPassTransform, childPassRect, childPassRect, childPassRect, false, 1);
+            sharedState->SetAll(childPassTransform, childPassRect, childPassRect, false, 1);
             scoped_ptr<SolidColorDrawQuad> colorQuad;
 
             colorQuad = SolidColorDrawQuad::Create();
             colorQuad->SetNew(sharedState, gfx::Rect(20, 20, 3, 7), 1u);
             quadSink.append(colorQuad.PassAs<DrawQuad>(), data);
 
             colorQuad = SolidColorDrawQuad::Create();
             colorQuad->SetNew(sharedState, gfx::Rect(23, 20, 4, 7), 1u);
             quadSink.append(colorQuad.PassAs<DrawQuad>(), data);
         }
 
         gfx::Rect passRect(0, 0, 50, 50);
         gfx::Transform passTransform;
         passTransform.Scale(1.5, 1.5);
         passTransform.Translate(7.0, 7.0);
 
         TestRenderPass* pass = addRenderPass(delegatedRenderPasses, RenderPass::Id(9, 6), passRect, gfx::Transform());
         MockQuadCuller quadSink(pass->quad_list, pass->shared_quad_state_list);
         AppendQuadsData data(pass->id);
         SharedQuadState* sharedState = quadSink.useSharedQuadState(SharedQuadState::Create());
-        sharedState->SetAll(passTransform, passRect, passRect, passRect, false, 1);
+        sharedState->SetAll(passTransform, passRect, passRect, false, 1);
         scoped_ptr<SolidColorDrawQuad> colorQuad;
 
         scoped_ptr<RenderPassDrawQuad> renderPassQuad = RenderPassDrawQuad::Create();
         renderPassQuad->SetNew(
             sharedState,
             gfx::Rect(5, 5, 7, 7),
             RenderPass::Id(10, 7),
             false, // is_replica
             0, // mask_resource_id
             childPassRect, // contents_changed_since_last_frame
@@ skipping 67 matching lines @@
     EXPECT_EQ(rootSharedState, rootQuadList[4]->shared_quad_state);
 
     EXPECT_NE(rootQuadList[0]->shared_quad_state, contribQuadList[0]->shared_quad_state);
 
     // The state should be transformed only once.
 
     // The x/y values are: position (20) + transform (8 * 2) = 36
     // 36 - (width / 2) = 36 - 30 / 2 = 21
     // The size is 100 scaled to fit inside the layer's bounds at 30x30 from a frame at 50x50.
     // 100 * 30 / 50 = 60.
-    EXPECT_RECT_EQ(gfx::Rect(21, 21, 60, 60), rootSharedState->clipped_rect_in_target);
     EXPECT_RECT_EQ(gfx::Rect(21, 21, 60, 60), rootSharedState->clip_rect);
     gfx::Transform expected;
     // This is the transform from the layer's space to its target.
     // The position (20) - the width / scale (30 / 2) = 20 - 15 = 5
     expected.Translate(5.0, 5.0);
     expected.Scale(2.0, 2.0);
     expected.Translate(8.0, 8.0);
     // The frame has size 50x50 but the layer's bounds are 30x30.
     expected.Scale(30.0 / 50.0, 30.0 / 50.0);
     // This is the transform within the source frame.
     expected.Scale(1.5, 1.5);
     expected.Translate(7.0, 7.0);
     EXPECT_TRANSFORMATION_MATRIX_EQ(expected, rootSharedState->content_to_target_transform);
 
     // The contributing render pass should not be transformed from its input.
-    EXPECT_RECT_EQ(gfx::Rect(20, 20, 7, 7), contribSharedState->clipped_rect_in_target);
     EXPECT_RECT_EQ(gfx::Rect(20, 20, 7, 7), contribSharedState->clip_rect);
     expected.MakeIdentity();
     expected.Scale(0.8, 0.8);
     expected.Translate(9.0, 9.0);
     EXPECT_TRANSFORMATION_MATRIX_EQ(expected, contribSharedState->content_to_target_transform);
 
     m_hostImpl->drawLayers(frame);
     m_hostImpl->didDrawAllLayers(frame);
 }
 
 TEST_F(DelegatedRendererLayerImplTestSharedData, DisplaySize)
 {
     // Cause the layer to scale its output to be larger than its bounds.
     m_delegatedRendererLayerPtr->setDisplaySize(gfx::Size(40, 40));
     EXPECT_LT(m_delegatedRendererLayerPtr->bounds().width(), 40);
     EXPECT_LT(m_delegatedRendererLayerPtr->bounds().height(), 40);
 
     LayerTreeHostImpl::FrameData frame;
     EXPECT_TRUE(m_hostImpl->prepareToDraw(frame));
 
     ASSERT_EQ(2u, frame.renderPasses.size());
 
     const QuadList& rootQuadList = frame.renderPasses[1]->quad_list;
     ASSERT_EQ(5u, rootQuadList.size());
 
     const SharedQuadState* rootSharedState = rootQuadList[0]->shared_quad_state;
 
     // The results are similar to the SharedData test, but are scaled up by displaySize/bounds, which is 40/30.
-    EXPECT_RECT_EQ(gfx::Rect(21, 21, 80, 80), rootSharedState->clipped_rect_in_target);
     EXPECT_RECT_EQ(gfx::Rect(21, 21, 80, 80), rootSharedState->clip_rect);
     gfx::Transform expected;
     // This is the transform from the layer's space to its target.
     // The position (20) - the width / scale (30 / 2) = 20 - 15 = 5
     expected.Translate(5.0, 5.0);
     expected.Scale(2.0, 2.0);
     expected.Translate(8.0, 8.0);
     // The frame has size 50x50 but the layer's bounds are 30x30.
     expected.Scale(30.0 / 50.0, 30.0 / 50.0);
     // The display size is 40x40 but the bounds are 30x30.
     expected.Scale(40.0 / 30.0, 40.0 / 30.0);
     // This is the transform within the source frame.
     expected.Scale(1.5, 1.5);
     expected.Translate(7.0, 7.0);
     EXPECT_TRANSFORMATION_MATRIX_EQ(expected, rootSharedState->content_to_target_transform);
 
     m_hostImpl->drawLayers(frame);
     m_hostImpl->didDrawAllLayers(frame);
 }
 
 }  // namespace
 }  // namespace cc