| OLD | NEW |
| 1 // Copyright 2012 The Chromium Authors. All rights reserved. | 1 // Copyright 2012 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "cc/delegated_renderer_layer_impl.h" | 5 #include "cc/delegated_renderer_layer_impl.h" |
| 6 | 6 |
| 7 #include "cc/append_quads_data.h" | 7 #include "cc/append_quads_data.h" |
| 8 #include "cc/layer_tree_host_impl.h" | 8 #include "cc/layer_tree_host_impl.h" |
| 9 #include "cc/layer_tree_impl.h" | 9 #include "cc/layer_tree_impl.h" |
| 10 #include "cc/quad_sink.h" | 10 #include "cc/quad_sink.h" |
| (...skipping 147 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 158 EXPECT_NE(4, frame.renderPasses[4]->id.layer_id); | 158 EXPECT_NE(4, frame.renderPasses[4]->id.layer_id); |
| 159 EXPECT_EQ(0, frame.renderPasses[4]->id.index); | 159 EXPECT_EQ(0, frame.renderPasses[4]->id.index); |
| 160 | 160 |
| 161 // The DelegatedRendererLayer should have added its RenderPasses to the frame | 161 // The DelegatedRendererLayer should have added its RenderPasses to the frame |
| 162 // in order. | 162 // in order. |
| 163 EXPECT_EQ(gfx::Rect(6, 6, 6, 6).ToString(), | 163 EXPECT_EQ(gfx::Rect(6, 6, 6, 6).ToString(), |
| 164 frame.renderPasses[1]->output_rect.ToString()); | 164 frame.renderPasses[1]->output_rect.ToString()); |
| 165 EXPECT_EQ(gfx::Rect(7, 7, 7, 7).ToString(), | 165 EXPECT_EQ(gfx::Rect(7, 7, 7, 7).ToString(), |
| 166 frame.renderPasses[2]->output_rect.ToString()); | 166 frame.renderPasses[2]->output_rect.ToString()); |
| 167 | 167 |
| 168 host_impl_->drawLayers(frame); | 168 host_impl_->drawLayers(frame, base::TimeTicks::Now()); |
| 169 host_impl_->didDrawAllLayers(frame); | 169 host_impl_->didDrawAllLayers(frame); |
| 170 } | 170 } |
| 171 | 171 |
| 172 TEST_F(DelegatedRendererLayerImplTestSimple, | 172 TEST_F(DelegatedRendererLayerImplTestSimple, |
| 173 AddsQuadsToContributingRenderPasses) { | 173 AddsQuadsToContributingRenderPasses) { |
| 174 LayerTreeHostImpl::FrameData frame; | 174 LayerTreeHostImpl::FrameData frame; |
| 175 EXPECT_TRUE(host_impl_->prepareToDraw(frame)); | 175 EXPECT_TRUE(host_impl_->prepareToDraw(frame)); |
| 176 | 176 |
| 177 // Each non-DelegatedRendererLayer added one RenderPass. The | 177 // Each non-DelegatedRendererLayer added one RenderPass. The |
| 178 // DelegatedRendererLayer added two contributing passes. | 178 // DelegatedRendererLayer added two contributing passes. |
| (...skipping 15 matching lines...) Expand all Loading... |
| 194 // Verify it added the right quads. | 194 // Verify it added the right quads. |
| 195 ASSERT_EQ(2u, frame.renderPasses[2]->quad_list.size()); | 195 ASSERT_EQ(2u, frame.renderPasses[2]->quad_list.size()); |
| 196 EXPECT_EQ(gfx::Rect(0, 0, 7, 7).ToString(), | 196 EXPECT_EQ(gfx::Rect(0, 0, 7, 7).ToString(), |
| 197 frame.renderPasses[2]->quad_list[0]->rect.ToString()); | 197 frame.renderPasses[2]->quad_list[0]->rect.ToString()); |
| 198 EXPECT_EQ(gfx::Rect(6, 6, 6, 6).ToString(), | 198 EXPECT_EQ(gfx::Rect(6, 6, 6, 6).ToString(), |
| 199 frame.renderPasses[2]->quad_list[1]->rect.ToString()); | 199 frame.renderPasses[2]->quad_list[1]->rect.ToString()); |
| 200 ASSERT_EQ(1u, frame.renderPasses[1]->quad_list.size()); | 200 ASSERT_EQ(1u, frame.renderPasses[1]->quad_list.size()); |
| 201 EXPECT_EQ(gfx::Rect(0, 0, 6, 6).ToString(), | 201 EXPECT_EQ(gfx::Rect(0, 0, 6, 6).ToString(), |
| 202 frame.renderPasses[1]->quad_list[0]->rect.ToString()); | 202 frame.renderPasses[1]->quad_list[0]->rect.ToString()); |
| 203 | 203 |
| 204 host_impl_->drawLayers(frame); | 204 host_impl_->drawLayers(frame, base::TimeTicks::Now()); |
| 205 host_impl_->didDrawAllLayers(frame); | 205 host_impl_->didDrawAllLayers(frame); |
| 206 } | 206 } |
| 207 | 207 |
| 208 TEST_F(DelegatedRendererLayerImplTestSimple, AddsQuadsToTargetRenderPass) { | 208 TEST_F(DelegatedRendererLayerImplTestSimple, AddsQuadsToTargetRenderPass) { |
| 209 LayerTreeHostImpl::FrameData frame; | 209 LayerTreeHostImpl::FrameData frame; |
| 210 EXPECT_TRUE(host_impl_->prepareToDraw(frame)); | 210 EXPECT_TRUE(host_impl_->prepareToDraw(frame)); |
| 211 | 211 |
| 212 // Each non-DelegatedRendererLayer added one RenderPass. The | 212 // Each non-DelegatedRendererLayer added one RenderPass. The |
| 213 // DelegatedRendererLayer added two contributing passes. | 213 // DelegatedRendererLayer added two contributing passes. |
| 214 ASSERT_EQ(5u, frame.renderPasses.size()); | 214 ASSERT_EQ(5u, frame.renderPasses.size()); |
| 215 | 215 |
| 216 // The layer's target is the RenderPass from m_layer_after. | 216 // The layer's target is the RenderPass from m_layer_after. |
| 217 EXPECT_EQ(RenderPass::Id(3, 0), frame.renderPasses[3]->id); | 217 EXPECT_EQ(RenderPass::Id(3, 0), frame.renderPasses[3]->id); |
| 218 | 218 |
| 219 // The DelegatedRendererLayer should have added copies of quads in its root | 219 // The DelegatedRendererLayer should have added copies of quads in its root |
| 220 // RenderPass to its target RenderPass. The m_layer_after also adds one quad. | 220 // RenderPass to its target RenderPass. The m_layer_after also adds one quad. |
| 221 ASSERT_EQ(2u, frame.renderPasses[3]->quad_list.size()); | 221 ASSERT_EQ(2u, frame.renderPasses[3]->quad_list.size()); |
| 222 | 222 |
| 223 // Verify it added the right quads. | 223 // Verify it added the right quads. |
| 224 EXPECT_EQ(gfx::Rect(7, 7, 7, 7).ToString(), | 224 EXPECT_EQ(gfx::Rect(7, 7, 7, 7).ToString(), |
| 225 frame.renderPasses[3]->quad_list[0]->rect.ToString()); | 225 frame.renderPasses[3]->quad_list[0]->rect.ToString()); |
| 226 | 226 |
| 227 // Its target layer should have a quad as well. | 227 // Its target layer should have a quad as well. |
| 228 EXPECT_EQ(gfx::Rect(0, 0, 15, 15).ToString(), | 228 EXPECT_EQ(gfx::Rect(0, 0, 15, 15).ToString(), |
| 229 frame.renderPasses[3]->quad_list[1]->rect.ToString()); | 229 frame.renderPasses[3]->quad_list[1]->rect.ToString()); |
| 230 | 230 |
| 231 host_impl_->drawLayers(frame); | 231 host_impl_->drawLayers(frame, base::TimeTicks::Now()); |
| 232 host_impl_->didDrawAllLayers(frame); | 232 host_impl_->didDrawAllLayers(frame); |
| 233 } | 233 } |
| 234 | 234 |
| 235 TEST_F(DelegatedRendererLayerImplTestSimple, | 235 TEST_F(DelegatedRendererLayerImplTestSimple, |
| 236 QuadsFromRootRenderPassAreModifiedForTheTarget) { | 236 QuadsFromRootRenderPassAreModifiedForTheTarget) { |
| 237 LayerTreeHostImpl::FrameData frame; | 237 LayerTreeHostImpl::FrameData frame; |
| 238 EXPECT_TRUE(host_impl_->prepareToDraw(frame)); | 238 EXPECT_TRUE(host_impl_->prepareToDraw(frame)); |
| 239 | 239 |
| 240 // Each non-DelegatedRendererLayer added one RenderPass. The | 240 // Each non-DelegatedRendererLayer added one RenderPass. The |
| 241 // DelegatedRendererLayer added two contributing passes. | 241 // DelegatedRendererLayer added two contributing passes. |
| (...skipping 13 matching lines...) Expand all Loading... |
| 255 // Quads from non-root RenderPasses should not be shifted though. | 255 // Quads from non-root RenderPasses should not be shifted though. |
| 256 ASSERT_EQ(2u, frame.renderPasses[2]->quad_list.size()); | 256 ASSERT_EQ(2u, frame.renderPasses[2]->quad_list.size()); |
| 257 EXPECT_TRANSFORMATION_MATRIX_EQ( | 257 EXPECT_TRANSFORMATION_MATRIX_EQ( |
| 258 gfx::Transform(), frame.renderPasses[2]->quad_list[0]->quadTransform()); | 258 gfx::Transform(), frame.renderPasses[2]->quad_list[0]->quadTransform()); |
| 259 EXPECT_TRANSFORMATION_MATRIX_EQ( | 259 EXPECT_TRANSFORMATION_MATRIX_EQ( |
| 260 gfx::Transform(), frame.renderPasses[2]->quad_list[1]->quadTransform()); | 260 gfx::Transform(), frame.renderPasses[2]->quad_list[1]->quadTransform()); |
| 261 ASSERT_EQ(1u, frame.renderPasses[1]->quad_list.size()); | 261 ASSERT_EQ(1u, frame.renderPasses[1]->quad_list.size()); |
| 262 EXPECT_TRANSFORMATION_MATRIX_EQ( | 262 EXPECT_TRANSFORMATION_MATRIX_EQ( |
| 263 gfx::Transform(), frame.renderPasses[1]->quad_list[0]->quadTransform()); | 263 gfx::Transform(), frame.renderPasses[1]->quad_list[0]->quadTransform()); |
| 264 | 264 |
| 265 host_impl_->drawLayers(frame); | 265 host_impl_->drawLayers(frame, base::TimeTicks::Now()); |
| 266 host_impl_->didDrawAllLayers(frame); | 266 host_impl_->didDrawAllLayers(frame); |
| 267 } | 267 } |
| 268 | 268 |
| 269 TEST_F(DelegatedRendererLayerImplTestSimple, DoesNotOwnARenderSurface) { | 269 TEST_F(DelegatedRendererLayerImplTestSimple, DoesNotOwnARenderSurface) { |
| 270 LayerTreeHostImpl::FrameData frame; | 270 LayerTreeHostImpl::FrameData frame; |
| 271 EXPECT_TRUE(host_impl_->prepareToDraw(frame)); | 271 EXPECT_TRUE(host_impl_->prepareToDraw(frame)); |
| 272 | 272 |
| 273 // If the DelegatedRendererLayer is axis aligned and has opacity 1, then it | 273 // If the DelegatedRendererLayer is axis aligned and has opacity 1, then it |
| 274 // has no need to be a renderSurface for the quads it carries. | 274 // has no need to be a renderSurface for the quads it carries. |
| 275 EXPECT_FALSE(delegated_renderer_layer_->render_surface()); | 275 EXPECT_FALSE(delegated_renderer_layer_->render_surface()); |
| 276 | 276 |
| 277 host_impl_->drawLayers(frame); | 277 host_impl_->drawLayers(frame, base::TimeTicks::Now()); |
| 278 host_impl_->didDrawAllLayers(frame); | 278 host_impl_->didDrawAllLayers(frame); |
| 279 } | 279 } |
| 280 | 280 |
| 281 TEST_F(DelegatedRendererLayerImplTestSimple, DoesOwnARenderSurfaceForOpacity) { | 281 TEST_F(DelegatedRendererLayerImplTestSimple, DoesOwnARenderSurfaceForOpacity) { |
| 282 delegated_renderer_layer_->SetOpacity(0.5f); | 282 delegated_renderer_layer_->SetOpacity(0.5f); |
| 283 | 283 |
| 284 LayerTreeHostImpl::FrameData frame; | 284 LayerTreeHostImpl::FrameData frame; |
| 285 EXPECT_TRUE(host_impl_->prepareToDraw(frame)); | 285 EXPECT_TRUE(host_impl_->prepareToDraw(frame)); |
| 286 | 286 |
| 287 // This test case has quads from multiple layers in the delegated renderer, so | 287 // This test case has quads from multiple layers in the delegated renderer, so |
| 288 // if the DelegatedRendererLayer has opacity < 1, it should end up with a | 288 // if the DelegatedRendererLayer has opacity < 1, it should end up with a |
| 289 // render surface. | 289 // render surface. |
| 290 EXPECT_TRUE(delegated_renderer_layer_->render_surface()); | 290 EXPECT_TRUE(delegated_renderer_layer_->render_surface()); |
| 291 | 291 |
| 292 host_impl_->drawLayers(frame); | 292 host_impl_->drawLayers(frame, base::TimeTicks::Now()); |
| 293 host_impl_->didDrawAllLayers(frame); | 293 host_impl_->didDrawAllLayers(frame); |
| 294 } | 294 } |
| 295 | 295 |
| 296 TEST_F(DelegatedRendererLayerImplTestSimple, | 296 TEST_F(DelegatedRendererLayerImplTestSimple, |
| 297 DoesOwnARenderSurfaceForTransform) { | 297 DoesOwnARenderSurfaceForTransform) { |
| 298 gfx::Transform rotation; | 298 gfx::Transform rotation; |
| 299 rotation.RotateAboutZAxis(30.0); | 299 rotation.RotateAboutZAxis(30.0); |
| 300 delegated_renderer_layer_->SetTransform(rotation); | 300 delegated_renderer_layer_->SetTransform(rotation); |
| 301 | 301 |
| 302 LayerTreeHostImpl::FrameData frame; | 302 LayerTreeHostImpl::FrameData frame; |
| 303 EXPECT_TRUE(host_impl_->prepareToDraw(frame)); | 303 EXPECT_TRUE(host_impl_->prepareToDraw(frame)); |
| 304 | 304 |
| 305 // This test case has quads from multiple layers in the delegated renderer, so | 305 // This test case has quads from multiple layers in the delegated renderer, so |
| 306 // if the DelegatedRendererLayer has opacity < 1, it should end up with a | 306 // if the DelegatedRendererLayer has opacity < 1, it should end up with a |
| 307 // render surface. | 307 // render surface. |
| 308 EXPECT_TRUE(delegated_renderer_layer_->render_surface()); | 308 EXPECT_TRUE(delegated_renderer_layer_->render_surface()); |
| 309 | 309 |
| 310 host_impl_->drawLayers(frame); | 310 host_impl_->drawLayers(frame, base::TimeTicks::Now()); |
| 311 host_impl_->didDrawAllLayers(frame); | 311 host_impl_->didDrawAllLayers(frame); |
| 312 } | 312 } |
| 313 | 313 |
| 314 class DelegatedRendererLayerImplTestOwnSurface | 314 class DelegatedRendererLayerImplTestOwnSurface |
| 315 : public DelegatedRendererLayerImplTestSimple { | 315 : public DelegatedRendererLayerImplTestSimple { |
| 316 public: | 316 public: |
| 317 DelegatedRendererLayerImplTestOwnSurface() | 317 DelegatedRendererLayerImplTestOwnSurface() |
| 318 : DelegatedRendererLayerImplTestSimple() { | 318 : DelegatedRendererLayerImplTestSimple() { |
| 319 delegated_renderer_layer_->SetForceRenderSurface(true); | 319 delegated_renderer_layer_->SetForceRenderSurface(true); |
| 320 } | 320 } |
| (...skipping 26 matching lines...) Expand all Loading... |
| 347 EXPECT_NE(4, frame.renderPasses[5]->id.layer_id); | 347 EXPECT_NE(4, frame.renderPasses[5]->id.layer_id); |
| 348 EXPECT_EQ(0, frame.renderPasses[5]->id.index); | 348 EXPECT_EQ(0, frame.renderPasses[5]->id.index); |
| 349 | 349 |
| 350 // The DelegatedRendererLayer should have added its RenderPasses to the frame | 350 // The DelegatedRendererLayer should have added its RenderPasses to the frame |
| 351 // in order. | 351 // in order. |
| 352 EXPECT_EQ(gfx::Rect(6, 6, 6, 6).ToString(), | 352 EXPECT_EQ(gfx::Rect(6, 6, 6, 6).ToString(), |
| 353 frame.renderPasses[1]->output_rect.ToString()); | 353 frame.renderPasses[1]->output_rect.ToString()); |
| 354 EXPECT_EQ(gfx::Rect(7, 7, 7, 7).ToString(), | 354 EXPECT_EQ(gfx::Rect(7, 7, 7, 7).ToString(), |
| 355 frame.renderPasses[2]->output_rect.ToString()); | 355 frame.renderPasses[2]->output_rect.ToString()); |
| 356 | 356 |
| 357 host_impl_->drawLayers(frame); | 357 host_impl_->drawLayers(frame, base::TimeTicks::Now()); |
| 358 host_impl_->didDrawAllLayers(frame); | 358 host_impl_->didDrawAllLayers(frame); |
| 359 } | 359 } |
| 360 | 360 |
| 361 TEST_F(DelegatedRendererLayerImplTestOwnSurface, | 361 TEST_F(DelegatedRendererLayerImplTestOwnSurface, |
| 362 AddsQuadsToContributingRenderPasses) { | 362 AddsQuadsToContributingRenderPasses) { |
| 363 LayerTreeHostImpl::FrameData frame; | 363 LayerTreeHostImpl::FrameData frame; |
| 364 EXPECT_TRUE(host_impl_->prepareToDraw(frame)); | 364 EXPECT_TRUE(host_impl_->prepareToDraw(frame)); |
| 365 | 365 |
| 366 // Each non-DelegatedRendererLayer added one RenderPass. The | 366 // Each non-DelegatedRendererLayer added one RenderPass. The |
| 367 // DelegatedRendererLayer added two contributing passes and its owned surface | 367 // DelegatedRendererLayer added two contributing passes and its owned surface |
| (...skipping 16 matching lines...) Expand all Loading... |
| 384 // Verify it added the right quads. | 384 // Verify it added the right quads. |
| 385 ASSERT_EQ(2u, frame.renderPasses[2]->quad_list.size()); | 385 ASSERT_EQ(2u, frame.renderPasses[2]->quad_list.size()); |
| 386 EXPECT_EQ(gfx::Rect(0, 0, 7, 7).ToString(), | 386 EXPECT_EQ(gfx::Rect(0, 0, 7, 7).ToString(), |
| 387 frame.renderPasses[2]->quad_list[0]->rect.ToString()); | 387 frame.renderPasses[2]->quad_list[0]->rect.ToString()); |
| 388 EXPECT_EQ(gfx::Rect(6, 6, 6, 6).ToString(), | 388 EXPECT_EQ(gfx::Rect(6, 6, 6, 6).ToString(), |
| 389 frame.renderPasses[2]->quad_list[1]->rect.ToString()); | 389 frame.renderPasses[2]->quad_list[1]->rect.ToString()); |
| 390 ASSERT_EQ(1u, frame.renderPasses[1]->quad_list.size()); | 390 ASSERT_EQ(1u, frame.renderPasses[1]->quad_list.size()); |
| 391 EXPECT_EQ(gfx::Rect(0, 0, 6, 6).ToString(), | 391 EXPECT_EQ(gfx::Rect(0, 0, 6, 6).ToString(), |
| 392 frame.renderPasses[1]->quad_list[0]->rect.ToString()); | 392 frame.renderPasses[1]->quad_list[0]->rect.ToString()); |
| 393 | 393 |
| 394 host_impl_->drawLayers(frame); | 394 host_impl_->drawLayers(frame, base::TimeTicks::Now()); |
| 395 host_impl_->didDrawAllLayers(frame); | 395 host_impl_->didDrawAllLayers(frame); |
| 396 } | 396 } |
| 397 | 397 |
| 398 TEST_F(DelegatedRendererLayerImplTestOwnSurface, AddsQuadsToTargetRenderPass) { | 398 TEST_F(DelegatedRendererLayerImplTestOwnSurface, AddsQuadsToTargetRenderPass) { |
| 399 LayerTreeHostImpl::FrameData frame; | 399 LayerTreeHostImpl::FrameData frame; |
| 400 EXPECT_TRUE(host_impl_->prepareToDraw(frame)); | 400 EXPECT_TRUE(host_impl_->prepareToDraw(frame)); |
| 401 | 401 |
| 402 // Each non-DelegatedRendererLayer added one RenderPass. The | 402 // Each non-DelegatedRendererLayer added one RenderPass. The |
| 403 // DelegatedRendererLayer added two contributing passes and its owned surface | 403 // DelegatedRendererLayer added two contributing passes and its owned surface |
| 404 // added one pass. | 404 // added one pass. |
| 405 ASSERT_EQ(6u, frame.renderPasses.size()); | 405 ASSERT_EQ(6u, frame.renderPasses.size()); |
| 406 | 406 |
| 407 // The layer's target is the RenderPass owned by itself. | 407 // The layer's target is the RenderPass owned by itself. |
| 408 EXPECT_EQ(RenderPass::Id(4, 0), frame.renderPasses[3]->id); | 408 EXPECT_EQ(RenderPass::Id(4, 0), frame.renderPasses[3]->id); |
| 409 | 409 |
| 410 // The DelegatedRendererLayer should have added copies of quads in its root | 410 // The DelegatedRendererLayer should have added copies of quads in its root |
| 411 // RenderPass to its target RenderPass. | 411 // RenderPass to its target RenderPass. |
| 412 // The m_layer_after also adds one quad. | 412 // The m_layer_after also adds one quad. |
| 413 ASSERT_EQ(1u, frame.renderPasses[3]->quad_list.size()); | 413 ASSERT_EQ(1u, frame.renderPasses[3]->quad_list.size()); |
| 414 | 414 |
| 415 // Verify it added the right quads. | 415 // Verify it added the right quads. |
| 416 EXPECT_EQ(gfx::Rect(7, 7, 7, 7).ToString(), | 416 EXPECT_EQ(gfx::Rect(7, 7, 7, 7).ToString(), |
| 417 frame.renderPasses[3]->quad_list[0]->rect.ToString()); | 417 frame.renderPasses[3]->quad_list[0]->rect.ToString()); |
| 418 | 418 |
| 419 host_impl_->drawLayers(frame); | 419 host_impl_->drawLayers(frame, base::TimeTicks::Now()); |
| 420 host_impl_->didDrawAllLayers(frame); | 420 host_impl_->didDrawAllLayers(frame); |
| 421 } | 421 } |
| 422 | 422 |
| 423 TEST_F(DelegatedRendererLayerImplTestOwnSurface, | 423 TEST_F(DelegatedRendererLayerImplTestOwnSurface, |
| 424 QuadsFromRootRenderPassAreNotModifiedForTheTarget) { | 424 QuadsFromRootRenderPassAreNotModifiedForTheTarget) { |
| 425 LayerTreeHostImpl::FrameData frame; | 425 LayerTreeHostImpl::FrameData frame; |
| 426 EXPECT_TRUE(host_impl_->prepareToDraw(frame)); | 426 EXPECT_TRUE(host_impl_->prepareToDraw(frame)); |
| 427 | 427 |
| 428 // Each non-DelegatedRendererLayer added one RenderPass. The | 428 // Each non-DelegatedRendererLayer added one RenderPass. The |
| 429 // DelegatedRendererLayer added two contributing passes and its owned surface | 429 // DelegatedRendererLayer added two contributing passes and its owned surface |
| (...skipping 11 matching lines...) Expand all Loading... |
| 441 // Quads from non-root RenderPasses should not be shifted either. | 441 // Quads from non-root RenderPasses should not be shifted either. |
| 442 ASSERT_EQ(2u, frame.renderPasses[2]->quad_list.size()); | 442 ASSERT_EQ(2u, frame.renderPasses[2]->quad_list.size()); |
| 443 EXPECT_TRANSFORMATION_MATRIX_EQ( | 443 EXPECT_TRANSFORMATION_MATRIX_EQ( |
| 444 gfx::Transform(), frame.renderPasses[2]->quad_list[0]->quadTransform()); | 444 gfx::Transform(), frame.renderPasses[2]->quad_list[0]->quadTransform()); |
| 445 EXPECT_TRANSFORMATION_MATRIX_EQ( | 445 EXPECT_TRANSFORMATION_MATRIX_EQ( |
| 446 gfx::Transform(), frame.renderPasses[2]->quad_list[1]->quadTransform()); | 446 gfx::Transform(), frame.renderPasses[2]->quad_list[1]->quadTransform()); |
| 447 ASSERT_EQ(1u, frame.renderPasses[1]->quad_list.size()); | 447 ASSERT_EQ(1u, frame.renderPasses[1]->quad_list.size()); |
| 448 EXPECT_TRANSFORMATION_MATRIX_EQ( | 448 EXPECT_TRANSFORMATION_MATRIX_EQ( |
| 449 gfx::Transform(), frame.renderPasses[1]->quad_list[0]->quadTransform()); | 449 gfx::Transform(), frame.renderPasses[1]->quad_list[0]->quadTransform()); |
| 450 | 450 |
| 451 host_impl_->drawLayers(frame); | 451 host_impl_->drawLayers(frame, base::TimeTicks::Now()); |
| 452 host_impl_->didDrawAllLayers(frame); | 452 host_impl_->didDrawAllLayers(frame); |
| 453 } | 453 } |
| 454 | 454 |
| 455 class DelegatedRendererLayerImplTestTransform | 455 class DelegatedRendererLayerImplTestTransform |
| 456 : public DelegatedRendererLayerImplTest { | 456 : public DelegatedRendererLayerImplTest { |
| 457 public: | 457 public: |
| 458 void SetUpTest() { | 458 void SetUpTest() { |
| 459 scoped_ptr<LayerImpl> root_layer = LayerImpl::Create( | 459 scoped_ptr<LayerImpl> root_layer = LayerImpl::Create( |
| 460 host_impl_->activeTree(), 1); | 460 host_impl_->activeTree(), 1); |
| 461 scoped_ptr<FakeDelegatedRendererLayerImpl> delegated_renderer_layer = | 461 scoped_ptr<FakeDelegatedRendererLayerImpl> delegated_renderer_layer = |
| (...skipping 208 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 670 EXPECT_EQ(gfx::Rect(21, 21, 3, 3).ToString(), | 670 EXPECT_EQ(gfx::Rect(21, 21, 3, 3).ToString(), |
| 671 contrib_delegated_shared_quad_state->clip_rect.ToString()); | 671 contrib_delegated_shared_quad_state->clip_rect.ToString()); |
| 672 EXPECT_FALSE(contrib_delegated_shared_quad_state->is_clipped); | 672 EXPECT_FALSE(contrib_delegated_shared_quad_state->is_clipped); |
| 673 expected.MakeIdentity(); | 673 expected.MakeIdentity(); |
| 674 expected.Scale(0.8, 0.8); | 674 expected.Scale(0.8, 0.8); |
| 675 expected.Translate(9.0, 9.0); | 675 expected.Translate(9.0, 9.0); |
| 676 EXPECT_TRANSFORMATION_MATRIX_EQ( | 676 EXPECT_TRANSFORMATION_MATRIX_EQ( |
| 677 expected, | 677 expected, |
| 678 contrib_delegated_shared_quad_state->content_to_target_transform); | 678 contrib_delegated_shared_quad_state->content_to_target_transform); |
| 679 | 679 |
| 680 host_impl_->drawLayers(frame); | 680 host_impl_->drawLayers(frame, base::TimeTicks::Now()); |
| 681 host_impl_->didDrawAllLayers(frame); | 681 host_impl_->didDrawAllLayers(frame); |
| 682 } | 682 } |
| 683 | 683 |
| 684 TEST_F(DelegatedRendererLayerImplTestTransform, QuadsClipped_NoSurface) { | 684 TEST_F(DelegatedRendererLayerImplTestTransform, QuadsClipped_NoSurface) { |
| 685 root_delegated_render_pass_is_clipped_ = true; | 685 root_delegated_render_pass_is_clipped_ = true; |
| 686 SetUpTest(); | 686 SetUpTest(); |
| 687 | 687 |
| 688 LayerTreeHostImpl::FrameData frame; | 688 LayerTreeHostImpl::FrameData frame; |
| 689 EXPECT_TRUE(host_impl_->prepareToDraw(frame)); | 689 EXPECT_TRUE(host_impl_->prepareToDraw(frame)); |
| 690 | 690 |
| (...skipping 38 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 729 EXPECT_EQ(gfx::Rect(21, 21, 3, 3).ToString(), | 729 EXPECT_EQ(gfx::Rect(21, 21, 3, 3).ToString(), |
| 730 contrib_delegated_shared_quad_state->clip_rect.ToString()); | 730 contrib_delegated_shared_quad_state->clip_rect.ToString()); |
| 731 EXPECT_FALSE(contrib_delegated_shared_quad_state->is_clipped); | 731 EXPECT_FALSE(contrib_delegated_shared_quad_state->is_clipped); |
| 732 expected.MakeIdentity(); | 732 expected.MakeIdentity(); |
| 733 expected.Scale(0.8, 0.8); | 733 expected.Scale(0.8, 0.8); |
| 734 expected.Translate(9.0, 9.0); | 734 expected.Translate(9.0, 9.0); |
| 735 EXPECT_TRANSFORMATION_MATRIX_EQ( | 735 EXPECT_TRANSFORMATION_MATRIX_EQ( |
| 736 expected, | 736 expected, |
| 737 contrib_delegated_shared_quad_state->content_to_target_transform); | 737 contrib_delegated_shared_quad_state->content_to_target_transform); |
| 738 | 738 |
| 739 host_impl_->drawLayers(frame); | 739 host_impl_->drawLayers(frame, base::TimeTicks::Now()); |
| 740 host_impl_->didDrawAllLayers(frame); | 740 host_impl_->didDrawAllLayers(frame); |
| 741 } | 741 } |
| 742 | 742 |
| 743 TEST_F(DelegatedRendererLayerImplTestTransform, QuadsUnclipped_Surface) { | 743 TEST_F(DelegatedRendererLayerImplTestTransform, QuadsUnclipped_Surface) { |
| 744 root_delegated_render_pass_is_clipped_ = false; | 744 root_delegated_render_pass_is_clipped_ = false; |
| 745 SetUpTest(); | 745 SetUpTest(); |
| 746 | 746 |
| 747 delegated_renderer_layer_->SetForceRenderSurface(true); | 747 delegated_renderer_layer_->SetForceRenderSurface(true); |
| 748 | 748 |
| 749 LayerTreeHostImpl::FrameData frame; | 749 LayerTreeHostImpl::FrameData frame; |
| (...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 784 EXPECT_EQ(gfx::Rect(21, 21, 3, 3).ToString(), | 784 EXPECT_EQ(gfx::Rect(21, 21, 3, 3).ToString(), |
| 785 contrib_delegated_shared_quad_state->clip_rect.ToString()); | 785 contrib_delegated_shared_quad_state->clip_rect.ToString()); |
| 786 EXPECT_FALSE(contrib_delegated_shared_quad_state->is_clipped); | 786 EXPECT_FALSE(contrib_delegated_shared_quad_state->is_clipped); |
| 787 expected.MakeIdentity(); | 787 expected.MakeIdentity(); |
| 788 expected.Scale(0.8, 0.8); | 788 expected.Scale(0.8, 0.8); |
| 789 expected.Translate(9.0, 9.0); | 789 expected.Translate(9.0, 9.0); |
| 790 EXPECT_TRANSFORMATION_MATRIX_EQ( | 790 EXPECT_TRANSFORMATION_MATRIX_EQ( |
| 791 expected, | 791 expected, |
| 792 contrib_delegated_shared_quad_state->content_to_target_transform); | 792 contrib_delegated_shared_quad_state->content_to_target_transform); |
| 793 | 793 |
| 794 host_impl_->drawLayers(frame); | 794 host_impl_->drawLayers(frame, base::TimeTicks::Now()); |
| 795 host_impl_->didDrawAllLayers(frame); | 795 host_impl_->didDrawAllLayers(frame); |
| 796 } | 796 } |
| 797 | 797 |
| 798 TEST_F(DelegatedRendererLayerImplTestTransform, QuadsClipped_Surface) { | 798 TEST_F(DelegatedRendererLayerImplTestTransform, QuadsClipped_Surface) { |
| 799 root_delegated_render_pass_is_clipped_ = true; | 799 root_delegated_render_pass_is_clipped_ = true; |
| 800 SetUpTest(); | 800 SetUpTest(); |
| 801 | 801 |
| 802 delegated_renderer_layer_->SetForceRenderSurface(true); | 802 delegated_renderer_layer_->SetForceRenderSurface(true); |
| 803 | 803 |
| 804 LayerTreeHostImpl::FrameData frame; | 804 LayerTreeHostImpl::FrameData frame; |
| (...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 838 EXPECT_EQ(gfx::Rect(21, 21, 3, 3).ToString(), | 838 EXPECT_EQ(gfx::Rect(21, 21, 3, 3).ToString(), |
| 839 contrib_delegated_shared_quad_state->clip_rect.ToString()); | 839 contrib_delegated_shared_quad_state->clip_rect.ToString()); |
| 840 EXPECT_FALSE(contrib_delegated_shared_quad_state->is_clipped); | 840 EXPECT_FALSE(contrib_delegated_shared_quad_state->is_clipped); |
| 841 expected.MakeIdentity(); | 841 expected.MakeIdentity(); |
| 842 expected.Scale(0.8, 0.8); | 842 expected.Scale(0.8, 0.8); |
| 843 expected.Translate(9.0, 9.0); | 843 expected.Translate(9.0, 9.0); |
| 844 EXPECT_TRANSFORMATION_MATRIX_EQ( | 844 EXPECT_TRANSFORMATION_MATRIX_EQ( |
| 845 expected, | 845 expected, |
| 846 contrib_delegated_shared_quad_state->content_to_target_transform); | 846 contrib_delegated_shared_quad_state->content_to_target_transform); |
| 847 | 847 |
| 848 host_impl_->drawLayers(frame); | 848 host_impl_->drawLayers(frame, base::TimeTicks::Now()); |
| 849 host_impl_->didDrawAllLayers(frame); | 849 host_impl_->didDrawAllLayers(frame); |
| 850 } | 850 } |
| 851 | 851 |
| 852 class DelegatedRendererLayerImplTestClip | 852 class DelegatedRendererLayerImplTestClip |
| 853 : public DelegatedRendererLayerImplTest { | 853 : public DelegatedRendererLayerImplTest { |
| 854 public: | 854 public: |
| 855 void SetUpTest() { | 855 void SetUpTest() { |
| 856 scoped_ptr<LayerImpl> root_layer = | 856 scoped_ptr<LayerImpl> root_layer = |
| 857 LayerImpl::Create(host_impl_->activeTree(), 1); | 857 LayerImpl::Create(host_impl_->activeTree(), 1); |
| 858 scoped_ptr<FakeDelegatedRendererLayerImpl> delegated_renderer_layer = | 858 scoped_ptr<FakeDelegatedRendererLayerImpl> delegated_renderer_layer = |
| (...skipping 158 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1017 const SharedQuadState* contrib_delegated_shared_quad_state = | 1017 const SharedQuadState* contrib_delegated_shared_quad_state = |
| 1018 contrib_delegated_quad_list[0]->shared_quad_state; | 1018 contrib_delegated_quad_list[0]->shared_quad_state; |
| 1019 | 1019 |
| 1020 // When the quads don't have a clip of their own, the clip rect is set to | 1020 // When the quads don't have a clip of their own, the clip rect is set to |
| 1021 // the drawableContentRect of the delegated renderer layer. | 1021 // the drawableContentRect of the delegated renderer layer. |
| 1022 EXPECT_EQ(gfx::Rect(20, 20, 50, 50).ToString(), | 1022 EXPECT_EQ(gfx::Rect(20, 20, 50, 50).ToString(), |
| 1023 root_delegated_shared_quad_state->clip_rect.ToString()); | 1023 root_delegated_shared_quad_state->clip_rect.ToString()); |
| 1024 // Quads are clipped to the delegated renderer layer. | 1024 // Quads are clipped to the delegated renderer layer. |
| 1025 EXPECT_TRUE(root_delegated_shared_quad_state->is_clipped); | 1025 EXPECT_TRUE(root_delegated_shared_quad_state->is_clipped); |
| 1026 | 1026 |
| 1027 host_impl_->drawLayers(frame); | 1027 host_impl_->drawLayers(frame, base::TimeTicks::Now()); |
| 1028 host_impl_->didDrawAllLayers(frame); | 1028 host_impl_->didDrawAllLayers(frame); |
| 1029 } | 1029 } |
| 1030 | 1030 |
| 1031 TEST_F(DelegatedRendererLayerImplTestClip, | 1031 TEST_F(DelegatedRendererLayerImplTestClip, |
| 1032 QuadsClipped_LayerUnclipped_NoSurface) { | 1032 QuadsClipped_LayerUnclipped_NoSurface) { |
| 1033 root_delegated_render_pass_is_clipped_ = true; | 1033 root_delegated_render_pass_is_clipped_ = true; |
| 1034 clip_delegated_renderer_layer_ = false; | 1034 clip_delegated_renderer_layer_ = false; |
| 1035 SetUpTest(); | 1035 SetUpTest(); |
| 1036 | 1036 |
| 1037 LayerTreeHostImpl::FrameData frame; | 1037 LayerTreeHostImpl::FrameData frame; |
| (...skipping 10 matching lines...) Expand all Loading... |
| 1048 root_delegated_quad_list[0]->shared_quad_state; | 1048 root_delegated_quad_list[0]->shared_quad_state; |
| 1049 const SharedQuadState* contrib_delegated_shared_quad_state = | 1049 const SharedQuadState* contrib_delegated_shared_quad_state = |
| 1050 contrib_delegated_quad_list[0]->shared_quad_state; | 1050 contrib_delegated_quad_list[0]->shared_quad_state; |
| 1051 | 1051 |
| 1052 // When the quads have a clip of their own, it is used. | 1052 // When the quads have a clip of their own, it is used. |
| 1053 EXPECT_EQ(gfx::Rect(25, 25, 40, 40).ToString(), | 1053 EXPECT_EQ(gfx::Rect(25, 25, 40, 40).ToString(), |
| 1054 root_delegated_shared_quad_state->clip_rect.ToString()); | 1054 root_delegated_shared_quad_state->clip_rect.ToString()); |
| 1055 // Quads came with a clip rect. | 1055 // Quads came with a clip rect. |
| 1056 EXPECT_TRUE(root_delegated_shared_quad_state->is_clipped); | 1056 EXPECT_TRUE(root_delegated_shared_quad_state->is_clipped); |
| 1057 | 1057 |
| 1058 host_impl_->drawLayers(frame); | 1058 host_impl_->drawLayers(frame, base::TimeTicks::Now()); |
| 1059 host_impl_->didDrawAllLayers(frame); | 1059 host_impl_->didDrawAllLayers(frame); |
| 1060 } | 1060 } |
| 1061 | 1061 |
| 1062 TEST_F(DelegatedRendererLayerImplTestClip, | 1062 TEST_F(DelegatedRendererLayerImplTestClip, |
| 1063 QuadsUnclipped_LayerClipped_NoSurface) { | 1063 QuadsUnclipped_LayerClipped_NoSurface) { |
| 1064 root_delegated_render_pass_is_clipped_ = false; | 1064 root_delegated_render_pass_is_clipped_ = false; |
| 1065 clip_delegated_renderer_layer_ = true; | 1065 clip_delegated_renderer_layer_ = true; |
| 1066 SetUpTest(); | 1066 SetUpTest(); |
| 1067 | 1067 |
| 1068 LayerTreeHostImpl::FrameData frame; | 1068 LayerTreeHostImpl::FrameData frame; |
| (...skipping 11 matching lines...) Expand all Loading... |
| 1080 contrib_delegated_quad_list[0]->shared_quad_state; | 1080 contrib_delegated_quad_list[0]->shared_quad_state; |
| 1081 | 1081 |
| 1082 // When the quads don't have a clip of their own, the clip rect is set to | 1082 // When the quads don't have a clip of their own, the clip rect is set to |
| 1083 // the drawableContentRect of the delegated renderer layer. When the layer | 1083 // the drawableContentRect of the delegated renderer layer. When the layer |
| 1084 // is clipped, that should be seen in the quads' clip_rect. | 1084 // is clipped, that should be seen in the quads' clip_rect. |
| 1085 EXPECT_EQ(gfx::Rect(21, 27, 23, 21).ToString(), | 1085 EXPECT_EQ(gfx::Rect(21, 27, 23, 21).ToString(), |
| 1086 root_delegated_shared_quad_state->clip_rect.ToString()); | 1086 root_delegated_shared_quad_state->clip_rect.ToString()); |
| 1087 // Quads are clipped to the delegated renderer layer. | 1087 // Quads are clipped to the delegated renderer layer. |
| 1088 EXPECT_TRUE(root_delegated_shared_quad_state->is_clipped); | 1088 EXPECT_TRUE(root_delegated_shared_quad_state->is_clipped); |
| 1089 | 1089 |
| 1090 host_impl_->drawLayers(frame); | 1090 host_impl_->drawLayers(frame, base::TimeTicks::Now()); |
| 1091 host_impl_->didDrawAllLayers(frame); | 1091 host_impl_->didDrawAllLayers(frame); |
| 1092 } | 1092 } |
| 1093 | 1093 |
| 1094 TEST_F(DelegatedRendererLayerImplTestClip, | 1094 TEST_F(DelegatedRendererLayerImplTestClip, |
| 1095 QuadsClipped_LayerClipped_NoSurface) { | 1095 QuadsClipped_LayerClipped_NoSurface) { |
| 1096 root_delegated_render_pass_is_clipped_ = true; | 1096 root_delegated_render_pass_is_clipped_ = true; |
| 1097 clip_delegated_renderer_layer_ = true; | 1097 clip_delegated_renderer_layer_ = true; |
| 1098 SetUpTest(); | 1098 SetUpTest(); |
| 1099 | 1099 |
| 1100 LayerTreeHostImpl::FrameData frame; | 1100 LayerTreeHostImpl::FrameData frame; |
| (...skipping 10 matching lines...) Expand all Loading... |
| 1111 const SharedQuadState* contrib_delegated_shared_quad_state = | 1111 const SharedQuadState* contrib_delegated_shared_quad_state = |
| 1112 contrib_delegated_quad_list[0]->shared_quad_state; | 1112 contrib_delegated_quad_list[0]->shared_quad_state; |
| 1113 | 1113 |
| 1114 // When the quads have a clip of their own, it is used, but it is | 1114 // When the quads have a clip of their own, it is used, but it is |
| 1115 // combined with the clip rect of the delegated renderer layer. | 1115 // combined with the clip rect of the delegated renderer layer. |
| 1116 EXPECT_EQ(gfx::Rect(25, 27, 19, 21).ToString(), | 1116 EXPECT_EQ(gfx::Rect(25, 27, 19, 21).ToString(), |
| 1117 root_delegated_shared_quad_state->clip_rect.ToString()); | 1117 root_delegated_shared_quad_state->clip_rect.ToString()); |
| 1118 // Quads came with a clip rect. | 1118 // Quads came with a clip rect. |
| 1119 EXPECT_TRUE(root_delegated_shared_quad_state->is_clipped); | 1119 EXPECT_TRUE(root_delegated_shared_quad_state->is_clipped); |
| 1120 | 1120 |
| 1121 host_impl_->drawLayers(frame); | 1121 host_impl_->drawLayers(frame, base::TimeTicks::Now()); |
| 1122 host_impl_->didDrawAllLayers(frame); | 1122 host_impl_->didDrawAllLayers(frame); |
| 1123 } | 1123 } |
| 1124 | 1124 |
| 1125 TEST_F(DelegatedRendererLayerImplTestClip, | 1125 TEST_F(DelegatedRendererLayerImplTestClip, |
| 1126 QuadsUnclipped_LayerUnclipped_Surface) { | 1126 QuadsUnclipped_LayerUnclipped_Surface) { |
| 1127 root_delegated_render_pass_is_clipped_ = false; | 1127 root_delegated_render_pass_is_clipped_ = false; |
| 1128 clip_delegated_renderer_layer_ = false; | 1128 clip_delegated_renderer_layer_ = false; |
| 1129 SetUpTest(); | 1129 SetUpTest(); |
| 1130 | 1130 |
| 1131 delegated_renderer_layer_->SetForceRenderSurface(true); | 1131 delegated_renderer_layer_->SetForceRenderSurface(true); |
| (...skipping 10 matching lines...) Expand all Loading... |
| 1142 const SharedQuadState* root_delegated_shared_quad_state = | 1142 const SharedQuadState* root_delegated_shared_quad_state = |
| 1143 root_delegated_quad_list[0]->shared_quad_state; | 1143 root_delegated_quad_list[0]->shared_quad_state; |
| 1144 const SharedQuadState* contrib_delegated_shared_quad_state = | 1144 const SharedQuadState* contrib_delegated_shared_quad_state = |
| 1145 contrib_delegated_quad_list[0]->shared_quad_state; | 1145 contrib_delegated_quad_list[0]->shared_quad_state; |
| 1146 | 1146 |
| 1147 // When the layer owns a surface, the quads don't need to be clipped | 1147 // When the layer owns a surface, the quads don't need to be clipped |
| 1148 // further than they already specify. If they aren't clipped, then their | 1148 // further than they already specify. If they aren't clipped, then their |
| 1149 // clip rect is ignored, and they are not set as clipped. | 1149 // clip rect is ignored, and they are not set as clipped. |
| 1150 EXPECT_FALSE(root_delegated_shared_quad_state->is_clipped); | 1150 EXPECT_FALSE(root_delegated_shared_quad_state->is_clipped); |
| 1151 | 1151 |
| 1152 host_impl_->drawLayers(frame); | 1152 host_impl_->drawLayers(frame, base::TimeTicks::Now()); |
| 1153 host_impl_->didDrawAllLayers(frame); | 1153 host_impl_->didDrawAllLayers(frame); |
| 1154 } | 1154 } |
| 1155 | 1155 |
| 1156 TEST_F(DelegatedRendererLayerImplTestClip, | 1156 TEST_F(DelegatedRendererLayerImplTestClip, |
| 1157 QuadsClipped_LayerUnclipped_Surface) { | 1157 QuadsClipped_LayerUnclipped_Surface) { |
| 1158 root_delegated_render_pass_is_clipped_ = true; | 1158 root_delegated_render_pass_is_clipped_ = true; |
| 1159 clip_delegated_renderer_layer_ = false; | 1159 clip_delegated_renderer_layer_ = false; |
| 1160 SetUpTest(); | 1160 SetUpTest(); |
| 1161 | 1161 |
| 1162 delegated_renderer_layer_->SetForceRenderSurface(true); | 1162 delegated_renderer_layer_->SetForceRenderSurface(true); |
| 1163 | 1163 |
| 1164 LayerTreeHostImpl::FrameData frame; | 1164 LayerTreeHostImpl::FrameData frame; |
| 1165 EXPECT_TRUE(host_impl_->prepareToDraw(frame)); | 1165 EXPECT_TRUE(host_impl_->prepareToDraw(frame)); |
| 1166 | 1166 |
| 1167 ASSERT_EQ(3u, frame.renderPasses.size()); | 1167 ASSERT_EQ(3u, frame.renderPasses.size()); |
| 1168 const QuadList& contrib_delegated_quad_list = frame.renderPasses[0]->quad_list
; | 1168 const QuadList& contrib_delegated_quad_list = frame.renderPasses[0]->quad_list
; |
| 1169 ASSERT_EQ(2u, contrib_delegated_quad_list.size()); | 1169 ASSERT_EQ(2u, contrib_delegated_quad_list.size()); |
| 1170 const QuadList& root_delegated_quad_list = frame.renderPasses[1]->quad_list; | 1170 const QuadList& root_delegated_quad_list = frame.renderPasses[1]->quad_list; |
| 1171 ASSERT_EQ(5u, root_delegated_quad_list.size()); | 1171 ASSERT_EQ(5u, root_delegated_quad_list.size()); |
| 1172 const SharedQuadState* root_delegated_shared_quad_state = root_delegated_quad_
list[0]->shared_quad_state; | 1172 const SharedQuadState* root_delegated_shared_quad_state = root_delegated_quad_
list[0]->shared_quad_state; |
| 1173 const SharedQuadState* contrib_delegated_shared_quad_state = | 1173 const SharedQuadState* contrib_delegated_shared_quad_state = |
| 1174 contrib_delegated_quad_list[0]->shared_quad_state; | 1174 contrib_delegated_quad_list[0]->shared_quad_state; |
| 1175 | 1175 |
| 1176 // When the quads have a clip of their own, it is used. | 1176 // When the quads have a clip of their own, it is used. |
| 1177 EXPECT_EQ(gfx::Rect(5, 5, 40, 40).ToString(), | 1177 EXPECT_EQ(gfx::Rect(5, 5, 40, 40).ToString(), |
| 1178 root_delegated_shared_quad_state->clip_rect.ToString()); | 1178 root_delegated_shared_quad_state->clip_rect.ToString()); |
| 1179 // Quads came with a clip rect. | 1179 // Quads came with a clip rect. |
| 1180 EXPECT_TRUE(root_delegated_shared_quad_state->is_clipped); | 1180 EXPECT_TRUE(root_delegated_shared_quad_state->is_clipped); |
| 1181 | 1181 |
| 1182 host_impl_->drawLayers(frame); | 1182 host_impl_->drawLayers(frame, base::TimeTicks::Now()); |
| 1183 host_impl_->didDrawAllLayers(frame); | 1183 host_impl_->didDrawAllLayers(frame); |
| 1184 } | 1184 } |
| 1185 | 1185 |
| 1186 TEST_F(DelegatedRendererLayerImplTestClip, | 1186 TEST_F(DelegatedRendererLayerImplTestClip, |
| 1187 QuadsUnclipped_LayerClipped_Surface) { | 1187 QuadsUnclipped_LayerClipped_Surface) { |
| 1188 root_delegated_render_pass_is_clipped_ = false; | 1188 root_delegated_render_pass_is_clipped_ = false; |
| 1189 clip_delegated_renderer_layer_ = true; | 1189 clip_delegated_renderer_layer_ = true; |
| 1190 SetUpTest(); | 1190 SetUpTest(); |
| 1191 | 1191 |
| 1192 delegated_renderer_layer_->SetForceRenderSurface(true); | 1192 delegated_renderer_layer_->SetForceRenderSurface(true); |
| (...skipping 10 matching lines...) Expand all Loading... |
| 1203 const SharedQuadState* root_delegated_shared_quad_state = | 1203 const SharedQuadState* root_delegated_shared_quad_state = |
| 1204 root_delegated_quad_list[0]->shared_quad_state; | 1204 root_delegated_quad_list[0]->shared_quad_state; |
| 1205 const SharedQuadState* contrib_delegated_shared_quad_state = | 1205 const SharedQuadState* contrib_delegated_shared_quad_state = |
| 1206 contrib_delegated_quad_list[0]->shared_quad_state; | 1206 contrib_delegated_quad_list[0]->shared_quad_state; |
| 1207 | 1207 |
| 1208 // When the layer owns a surface, the quads don't need to be clipped | 1208 // When the layer owns a surface, the quads don't need to be clipped |
| 1209 // further than they already specify. If they aren't clipped, then their | 1209 // further than they already specify. If they aren't clipped, then their |
| 1210 // clip rect is ignored, and they are not set as clipped. | 1210 // clip rect is ignored, and they are not set as clipped. |
| 1211 EXPECT_FALSE(root_delegated_shared_quad_state->is_clipped); | 1211 EXPECT_FALSE(root_delegated_shared_quad_state->is_clipped); |
| 1212 | 1212 |
| 1213 host_impl_->drawLayers(frame); | 1213 host_impl_->drawLayers(frame, base::TimeTicks::Now()); |
| 1214 host_impl_->didDrawAllLayers(frame); | 1214 host_impl_->didDrawAllLayers(frame); |
| 1215 } | 1215 } |
| 1216 | 1216 |
| 1217 TEST_F(DelegatedRendererLayerImplTestClip, QuadsClipped_LayerClipped_Surface) { | 1217 TEST_F(DelegatedRendererLayerImplTestClip, QuadsClipped_LayerClipped_Surface) { |
| 1218 root_delegated_render_pass_is_clipped_ = true; | 1218 root_delegated_render_pass_is_clipped_ = true; |
| 1219 clip_delegated_renderer_layer_ = true; | 1219 clip_delegated_renderer_layer_ = true; |
| 1220 SetUpTest(); | 1220 SetUpTest(); |
| 1221 | 1221 |
| 1222 delegated_renderer_layer_->SetForceRenderSurface(true); | 1222 delegated_renderer_layer_->SetForceRenderSurface(true); |
| 1223 | 1223 |
| (...skipping 12 matching lines...) Expand all Loading... |
| 1236 contrib_delegated_quad_list[0]->shared_quad_state; | 1236 contrib_delegated_quad_list[0]->shared_quad_state; |
| 1237 | 1237 |
| 1238 // When the quads have a clip of their own, it is used, but it is | 1238 // When the quads have a clip of their own, it is used, but it is |
| 1239 // combined with the clip rect of the delegated renderer layer. If the | 1239 // combined with the clip rect of the delegated renderer layer. If the |
| 1240 // layer owns a surface, then it does not have a clip rect of its own. | 1240 // layer owns a surface, then it does not have a clip rect of its own. |
| 1241 EXPECT_EQ(gfx::Rect(5, 5, 40, 40).ToString(), | 1241 EXPECT_EQ(gfx::Rect(5, 5, 40, 40).ToString(), |
| 1242 root_delegated_shared_quad_state->clip_rect.ToString()); | 1242 root_delegated_shared_quad_state->clip_rect.ToString()); |
| 1243 // Quads came with a clip rect. | 1243 // Quads came with a clip rect. |
| 1244 EXPECT_TRUE(root_delegated_shared_quad_state->is_clipped); | 1244 EXPECT_TRUE(root_delegated_shared_quad_state->is_clipped); |
| 1245 | 1245 |
| 1246 host_impl_->drawLayers(frame); | 1246 host_impl_->drawLayers(frame, base::TimeTicks::Now()); |
| 1247 host_impl_->didDrawAllLayers(frame); | 1247 host_impl_->didDrawAllLayers(frame); |
| 1248 } | 1248 } |
| 1249 | 1249 |
| 1250 } // namespace | 1250 } // namespace |
| 1251 } // namespace cc | 1251 } // namespace cc |
| OLD | NEW |