| 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/layers/layer_impl.h" | 5 #include "cc/layers/layer_impl.h" |
| 6 | 6 |
| 7 #include "cc/animation/mutable_properties.h" | 7 #include "cc/animation/mutable_properties.h" |
| 8 #include "cc/layers/painted_scrollbar_layer_impl.h" | 8 #include "cc/layers/painted_scrollbar_layer_impl.h" |
| 9 #include "cc/layers/solid_color_scrollbar_layer_impl.h" | 9 #include "cc/layers/solid_color_scrollbar_layer_impl.h" |
| 10 #include "cc/output/filter_operation.h" | 10 #include "cc/output/filter_operation.h" |
| (...skipping 438 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 449 return &layer_impl->layer_tree_impl()->property_trees()->scroll_tree; | 449 return &layer_impl->layer_tree_impl()->property_trees()->scroll_tree; |
| 450 } | 450 } |
| 451 | 451 |
| 452 LayerTreeHostImpl& host_impl() { return host_impl_; } | 452 LayerTreeHostImpl& host_impl() { return host_impl_; } |
| 453 | 453 |
| 454 LayerTreeImpl* tree() { return host_impl_.active_tree(); } | 454 LayerTreeImpl* tree() { return host_impl_.active_tree(); } |
| 455 | 455 |
| 456 LayerTreeSettings settings() { | 456 LayerTreeSettings settings() { |
| 457 LayerTreeSettings settings; | 457 LayerTreeSettings settings; |
| 458 settings.verify_clip_tree_calculations = true; | 458 settings.verify_clip_tree_calculations = true; |
| 459 settings.verify_visible_rect_calculations = true; |
| 459 settings.verify_transform_tree_calculations = true; | 460 settings.verify_transform_tree_calculations = true; |
| 460 return settings; | 461 return settings; |
| 461 } | 462 } |
| 462 | 463 |
| 463 private: | 464 private: |
| 464 FakeImplTaskRunnerProvider task_runner_provider_; | 465 FakeImplTaskRunnerProvider task_runner_provider_; |
| 465 TestSharedBitmapManager shared_bitmap_manager_; | 466 TestSharedBitmapManager shared_bitmap_manager_; |
| 466 TestTaskGraphRunner task_graph_runner_; | 467 TestTaskGraphRunner task_graph_runner_; |
| 467 FakeLayerTreeHostImpl host_impl_; | 468 FakeLayerTreeHostImpl host_impl_; |
| 468 int root_id_; | 469 int root_id_; |
| (...skipping 125 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 594 | 595 |
| 595 pending_layer->PushPropertiesTo(layer()); | 596 pending_layer->PushPropertiesTo(layer()); |
| 596 | 597 |
| 597 EXPECT_VECTOR_EQ(gfx::Vector2dF(22, 23), layer()->CurrentScrollOffset()); | 598 EXPECT_VECTOR_EQ(gfx::Vector2dF(22, 23), layer()->CurrentScrollOffset()); |
| 598 EXPECT_VECTOR_EQ(layer()->CurrentScrollOffset(), | 599 EXPECT_VECTOR_EQ(layer()->CurrentScrollOffset(), |
| 599 pending_layer->CurrentScrollOffset()); | 600 pending_layer->CurrentScrollOffset()); |
| 600 } | 601 } |
| 601 | 602 |
| 602 } // namespace | 603 } // namespace |
| 603 } // namespace cc | 604 } // namespace cc |
| OLD | NEW |