| 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 511 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 522 ScrollTree* scroll_tree(LayerImpl* layer_impl) { | 522 ScrollTree* scroll_tree(LayerImpl* layer_impl) { |
| 523 return &layer_impl->layer_tree_impl()->property_trees()->scroll_tree; | 523 return &layer_impl->layer_tree_impl()->property_trees()->scroll_tree; |
| 524 } | 524 } |
| 525 | 525 |
| 526 LayerTreeHostImpl& host_impl() { return host_impl_; } | 526 LayerTreeHostImpl& host_impl() { return host_impl_; } |
| 527 | 527 |
| 528 LayerTreeImpl* tree() { return host_impl_.active_tree(); } | 528 LayerTreeImpl* tree() { return host_impl_.active_tree(); } |
| 529 | 529 |
| 530 LayerTreeSettings settings() { | 530 LayerTreeSettings settings() { |
| 531 LayerTreeSettings settings; | 531 LayerTreeSettings settings; |
| 532 settings.verify_clip_tree_calculations = true; |
| 532 return settings; | 533 return settings; |
| 533 } | 534 } |
| 534 | 535 |
| 535 private: | 536 private: |
| 536 FakeImplTaskRunnerProvider task_runner_provider_; | 537 FakeImplTaskRunnerProvider task_runner_provider_; |
| 537 TestSharedBitmapManager shared_bitmap_manager_; | 538 TestSharedBitmapManager shared_bitmap_manager_; |
| 538 TestTaskGraphRunner task_graph_runner_; | 539 TestTaskGraphRunner task_graph_runner_; |
| 539 FakeLayerTreeHostImpl host_impl_; | 540 FakeLayerTreeHostImpl host_impl_; |
| 540 int root_id_; | 541 int root_id_; |
| 541 }; | 542 }; |
| (...skipping 124 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 666 | 667 |
| 667 pending_layer->PushPropertiesTo(layer()); | 668 pending_layer->PushPropertiesTo(layer()); |
| 668 | 669 |
| 669 EXPECT_VECTOR_EQ(gfx::Vector2dF(22, 23), layer()->CurrentScrollOffset()); | 670 EXPECT_VECTOR_EQ(gfx::Vector2dF(22, 23), layer()->CurrentScrollOffset()); |
| 670 EXPECT_VECTOR_EQ(layer()->CurrentScrollOffset(), | 671 EXPECT_VECTOR_EQ(layer()->CurrentScrollOffset(), |
| 671 pending_layer->CurrentScrollOffset()); | 672 pending_layer->CurrentScrollOffset()); |
| 672 } | 673 } |
| 673 | 674 |
| 674 } // namespace | 675 } // namespace |
| 675 } // namespace cc | 676 } // namespace cc |
| OLD | NEW |