OLD | NEW |
1 // Copyright 2011 The Chromium Authors. All rights reserved. | 1 // Copyright 2011 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/trees/layer_tree_host_impl.h" | 5 #include "cc/trees/layer_tree_host_impl.h" |
6 | 6 |
7 #include <cmath> | 7 #include <cmath> |
8 | 8 |
9 #include "base/bind.h" | 9 #include "base/bind.h" |
10 #include "base/command_line.h" | 10 #include "base/command_line.h" |
(...skipping 5559 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
5570 | 5570 |
5571 SetupScrollAndContentsLayers(gfx::Size(100, 100)); | 5571 SetupScrollAndContentsLayers(gfx::Size(100, 100)); |
5572 | 5572 |
5573 const gfx::Transform external_transform; | 5573 const gfx::Transform external_transform; |
5574 const gfx::Rect external_viewport; | 5574 const gfx::Rect external_viewport; |
5575 const gfx::Rect external_clip; | 5575 const gfx::Rect external_clip; |
5576 const bool resourceless_software_draw = true; | 5576 const bool resourceless_software_draw = true; |
5577 host_impl_->SetExternalDrawConstraints(external_transform, | 5577 host_impl_->SetExternalDrawConstraints(external_transform, |
5578 external_viewport, | 5578 external_viewport, |
5579 external_clip, | 5579 external_clip, |
| 5580 external_viewport, |
| 5581 external_transform, |
5580 resourceless_software_draw); | 5582 resourceless_software_draw); |
5581 | 5583 |
5582 EXPECT_EQ(0, software_device->frames_began_); | 5584 EXPECT_EQ(0, software_device->frames_began_); |
5583 EXPECT_EQ(0, software_device->frames_ended_); | 5585 EXPECT_EQ(0, software_device->frames_ended_); |
5584 | 5586 |
5585 DrawFrame(); | 5587 DrawFrame(); |
5586 | 5588 |
5587 EXPECT_EQ(1, software_device->frames_began_); | 5589 EXPECT_EQ(1, software_device->frames_began_); |
5588 EXPECT_EQ(1, software_device->frames_ended_); | 5590 EXPECT_EQ(1, software_device->frames_ended_); |
5589 | 5591 |
(...skipping 13 matching lines...) Expand all Loading... |
5603 EXPECT_TRUE(CreateHostImpl(DefaultSettings(), | 5605 EXPECT_TRUE(CreateHostImpl(DefaultSettings(), |
5604 scoped_ptr<OutputSurface>(output_surface))); | 5606 scoped_ptr<OutputSurface>(output_surface))); |
5605 | 5607 |
5606 const gfx::Transform external_transform; | 5608 const gfx::Transform external_transform; |
5607 const gfx::Rect external_viewport; | 5609 const gfx::Rect external_viewport; |
5608 const gfx::Rect external_clip; | 5610 const gfx::Rect external_clip; |
5609 const bool resourceless_software_draw = true; | 5611 const bool resourceless_software_draw = true; |
5610 host_impl_->SetExternalDrawConstraints(external_transform, | 5612 host_impl_->SetExternalDrawConstraints(external_transform, |
5611 external_viewport, | 5613 external_viewport, |
5612 external_clip, | 5614 external_clip, |
| 5615 external_viewport, |
| 5616 external_transform, |
5613 resourceless_software_draw); | 5617 resourceless_software_draw); |
5614 | 5618 |
5615 // SolidColorLayerImpl will be drawn. | 5619 // SolidColorLayerImpl will be drawn. |
5616 scoped_ptr<SolidColorLayerImpl> root_layer = | 5620 scoped_ptr<SolidColorLayerImpl> root_layer = |
5617 SolidColorLayerImpl::Create(host_impl_->active_tree(), 1); | 5621 SolidColorLayerImpl::Create(host_impl_->active_tree(), 1); |
5618 | 5622 |
5619 // VideoLayerImpl will not be drawn. | 5623 // VideoLayerImpl will not be drawn. |
5620 FakeVideoFrameProvider provider; | 5624 FakeVideoFrameProvider provider; |
5621 scoped_ptr<VideoLayerImpl> video_layer = | 5625 scoped_ptr<VideoLayerImpl> video_layer = |
5622 VideoLayerImpl::Create(host_impl_->active_tree(), 2, &provider); | 5626 VideoLayerImpl::Create(host_impl_->active_tree(), 2, &provider); |
(...skipping 1024 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
6647 const gfx::Size layer_size(100, 100); | 6651 const gfx::Size layer_size(100, 100); |
6648 gfx::Transform external_transform; | 6652 gfx::Transform external_transform; |
6649 const gfx::Rect external_viewport(layer_size); | 6653 const gfx::Rect external_viewport(layer_size); |
6650 const gfx::Rect external_clip(layer_size); | 6654 const gfx::Rect external_clip(layer_size); |
6651 const bool resourceless_software_draw = false; | 6655 const bool resourceless_software_draw = false; |
6652 LayerImpl* layer = SetupScrollAndContentsLayers(layer_size); | 6656 LayerImpl* layer = SetupScrollAndContentsLayers(layer_size); |
6653 | 6657 |
6654 host_impl_->SetExternalDrawConstraints(external_transform, | 6658 host_impl_->SetExternalDrawConstraints(external_transform, |
6655 external_viewport, | 6659 external_viewport, |
6656 external_clip, | 6660 external_clip, |
| 6661 external_viewport, |
| 6662 external_transform, |
6657 resourceless_software_draw); | 6663 resourceless_software_draw); |
6658 DrawFrame(); | 6664 DrawFrame(); |
6659 EXPECT_TRANSFORMATION_MATRIX_EQ( | 6665 EXPECT_TRANSFORMATION_MATRIX_EQ( |
6660 external_transform, layer->draw_properties().target_space_transform); | 6666 external_transform, layer->draw_properties().target_space_transform); |
6661 | 6667 |
6662 external_transform.Translate(20, 20); | 6668 external_transform.Translate(20, 20); |
6663 host_impl_->SetExternalDrawConstraints(external_transform, | 6669 host_impl_->SetExternalDrawConstraints(external_transform, |
6664 external_viewport, | 6670 external_viewport, |
6665 external_clip, | 6671 external_clip, |
| 6672 external_viewport, |
| 6673 external_transform, |
6666 resourceless_software_draw); | 6674 resourceless_software_draw); |
6667 DrawFrame(); | 6675 DrawFrame(); |
6668 EXPECT_TRANSFORMATION_MATRIX_EQ( | 6676 EXPECT_TRANSFORMATION_MATRIX_EQ( |
6669 external_transform, layer->draw_properties().target_space_transform); | 6677 external_transform, layer->draw_properties().target_space_transform); |
6670 } | 6678 } |
6671 | 6679 |
6672 TEST_F(LayerTreeHostImplTest, ScrollAnimated) { | 6680 TEST_F(LayerTreeHostImplTest, ScrollAnimated) { |
6673 SetupScrollAndContentsLayers(gfx::Size(100, 150)); | 6681 SetupScrollAndContentsLayers(gfx::Size(100, 150)); |
6674 host_impl_->SetViewportSize(gfx::Size(50, 50)); | 6682 host_impl_->SetViewportSize(gfx::Size(50, 50)); |
6675 DrawFrame(); | 6683 DrawFrame(); |
(...skipping 75 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
6751 layer_pairs.clear(); | 6759 layer_pairs.clear(); |
6752 host_impl_->GetPictureLayerImplPairs(&layer_pairs); | 6760 host_impl_->GetPictureLayerImplPairs(&layer_pairs); |
6753 EXPECT_EQ(1u, layer_pairs.size()); | 6761 EXPECT_EQ(1u, layer_pairs.size()); |
6754 | 6762 |
6755 EXPECT_EQ(active_layer.get(), layer_pairs[0].active); | 6763 EXPECT_EQ(active_layer.get(), layer_pairs[0].active); |
6756 EXPECT_EQ(pending_layer.get(), layer_pairs[0].pending); | 6764 EXPECT_EQ(pending_layer.get(), layer_pairs[0].pending); |
6757 } | 6765 } |
6758 | 6766 |
6759 } // namespace | 6767 } // namespace |
6760 } // namespace cc | 6768 } // namespace cc |
OLD | NEW |