| 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 405 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 416 return &layer_impl->layer_tree_impl()->property_trees()->scroll_tree; | 416 return &layer_impl->layer_tree_impl()->property_trees()->scroll_tree; |
| 417 } | 417 } |
| 418 | 418 |
| 419 LayerTreeHostImpl& host_impl() { return host_impl_; } | 419 LayerTreeHostImpl& host_impl() { return host_impl_; } |
| 420 | 420 |
| 421 LayerTreeImpl* tree() { return host_impl_.active_tree(); } | 421 LayerTreeImpl* tree() { return host_impl_.active_tree(); } |
| 422 | 422 |
| 423 LayerTreeSettings settings() { | 423 LayerTreeSettings settings() { |
| 424 LayerTreeSettings settings; | 424 LayerTreeSettings settings; |
| 425 settings.verify_clip_tree_calculations = true; | 425 settings.verify_clip_tree_calculations = true; |
| 426 settings.verify_transform_tree_calculations = true; |
| 426 return settings; | 427 return settings; |
| 427 } | 428 } |
| 428 | 429 |
| 429 private: | 430 private: |
| 430 FakeImplTaskRunnerProvider task_runner_provider_; | 431 FakeImplTaskRunnerProvider task_runner_provider_; |
| 431 TestSharedBitmapManager shared_bitmap_manager_; | 432 TestSharedBitmapManager shared_bitmap_manager_; |
| 432 TestTaskGraphRunner task_graph_runner_; | 433 TestTaskGraphRunner task_graph_runner_; |
| 433 FakeLayerTreeHostImpl host_impl_; | 434 FakeLayerTreeHostImpl host_impl_; |
| 434 int root_id_; | 435 int root_id_; |
| 435 }; | 436 }; |
| (...skipping 124 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 560 | 561 |
| 561 pending_layer->PushPropertiesTo(layer()); | 562 pending_layer->PushPropertiesTo(layer()); |
| 562 | 563 |
| 563 EXPECT_VECTOR_EQ(gfx::Vector2dF(22, 23), layer()->CurrentScrollOffset()); | 564 EXPECT_VECTOR_EQ(gfx::Vector2dF(22, 23), layer()->CurrentScrollOffset()); |
| 564 EXPECT_VECTOR_EQ(layer()->CurrentScrollOffset(), | 565 EXPECT_VECTOR_EQ(layer()->CurrentScrollOffset(), |
| 565 pending_layer->CurrentScrollOffset()); | 566 pending_layer->CurrentScrollOffset()); |
| 566 } | 567 } |
| 567 | 568 |
| 568 } // namespace | 569 } // namespace |
| 569 } // namespace cc | 570 } // namespace cc |
| OLD | NEW |