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