| 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 423 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 434 ScrollTree* scroll_tree(LayerImpl* layer_impl) { | 434 ScrollTree* scroll_tree(LayerImpl* layer_impl) { |
| 435 return &layer_impl->layer_tree_impl()->property_trees()->scroll_tree; | 435 return &layer_impl->layer_tree_impl()->property_trees()->scroll_tree; |
| 436 } | 436 } |
| 437 | 437 |
| 438 LayerTreeHostImpl& host_impl() { return host_impl_; } | 438 LayerTreeHostImpl& host_impl() { return host_impl_; } |
| 439 | 439 |
| 440 LayerTreeImpl* tree() { return host_impl_.active_tree(); } | 440 LayerTreeImpl* tree() { return host_impl_.active_tree(); } |
| 441 | 441 |
| 442 LayerTreeSettings settings() { | 442 LayerTreeSettings settings() { |
| 443 LayerTreeSettings settings; | 443 LayerTreeSettings settings; |
| 444 settings.verify_clip_tree_calculations = true; |
| 444 return settings; | 445 return settings; |
| 445 } | 446 } |
| 446 | 447 |
| 447 private: | 448 private: |
| 448 FakeImplTaskRunnerProvider task_runner_provider_; | 449 FakeImplTaskRunnerProvider task_runner_provider_; |
| 449 TestSharedBitmapManager shared_bitmap_manager_; | 450 TestSharedBitmapManager shared_bitmap_manager_; |
| 450 TestTaskGraphRunner task_graph_runner_; | 451 TestTaskGraphRunner task_graph_runner_; |
| 451 FakeLayerTreeHostImpl host_impl_; | 452 FakeLayerTreeHostImpl host_impl_; |
| 452 int root_id_; | 453 int root_id_; |
| 453 }; | 454 }; |
| (...skipping 124 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 578 | 579 |
| 579 pending_layer->PushPropertiesTo(layer()); | 580 pending_layer->PushPropertiesTo(layer()); |
| 580 | 581 |
| 581 EXPECT_VECTOR_EQ(gfx::Vector2dF(22, 23), layer()->CurrentScrollOffset()); | 582 EXPECT_VECTOR_EQ(gfx::Vector2dF(22, 23), layer()->CurrentScrollOffset()); |
| 582 EXPECT_VECTOR_EQ(layer()->CurrentScrollOffset(), | 583 EXPECT_VECTOR_EQ(layer()->CurrentScrollOffset(), |
| 583 pending_layer->CurrentScrollOffset()); | 584 pending_layer->CurrentScrollOffset()); |
| 584 } | 585 } |
| 585 | 586 |
| 586 } // namespace | 587 } // namespace |
| 587 } // namespace cc | 588 } // namespace cc |
| OLD | NEW |