| 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 292 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 303 VERIFY_NO_NEEDS_UPDATE_DRAW_PROPERTIES( | 303 VERIFY_NO_NEEDS_UPDATE_DRAW_PROPERTIES( |
| 304 layer->SetScrollDelta(arbitrary_vector2d)); | 304 layer->SetScrollDelta(arbitrary_vector2d)); |
| 305 VERIFY_NEEDS_UPDATE_DRAW_PROPERTIES(layer->PushScrollOffsetFromMainThread( | 305 VERIFY_NEEDS_UPDATE_DRAW_PROPERTIES(layer->PushScrollOffsetFromMainThread( |
| 306 gfx::ScrollOffset(arbitrary_vector2d))); | 306 gfx::ScrollOffset(arbitrary_vector2d))); |
| 307 VERIFY_NO_NEEDS_UPDATE_DRAW_PROPERTIES(layer->PushScrollOffsetFromMainThread( | 307 VERIFY_NO_NEEDS_UPDATE_DRAW_PROPERTIES(layer->PushScrollOffsetFromMainThread( |
| 308 gfx::ScrollOffset(arbitrary_vector2d))); | 308 gfx::ScrollOffset(arbitrary_vector2d))); |
| 309 | 309 |
| 310 // Unrelated functions, always set to new values, always set needs update. | 310 // Unrelated functions, always set to new values, always set needs update. |
| 311 VERIFY_NEEDS_UPDATE_DRAW_PROPERTIES( | 311 VERIFY_NEEDS_UPDATE_DRAW_PROPERTIES( |
| 312 layer->SetMaskLayer(LayerImpl::Create(host_impl.active_tree(), 4))); | 312 layer->SetMaskLayer(LayerImpl::Create(host_impl.active_tree(), 4))); |
| 313 host_impl.active_tree()->BuildPropertyTreesForTesting(); | |
| 314 VERIFY_NEEDS_UPDATE_DRAW_PROPERTIES(layer->SetMasksToBounds(true)); | 313 VERIFY_NEEDS_UPDATE_DRAW_PROPERTIES(layer->SetMasksToBounds(true)); |
| 315 VERIFY_NEEDS_UPDATE_DRAW_PROPERTIES(layer->SetContentsOpaque(true)); | 314 VERIFY_NEEDS_UPDATE_DRAW_PROPERTIES(layer->SetContentsOpaque(true)); |
| 316 VERIFY_NEEDS_UPDATE_DRAW_PROPERTIES( | 315 VERIFY_NEEDS_UPDATE_DRAW_PROPERTIES( |
| 317 layer->SetReplicaLayer(LayerImpl::Create(host_impl.active_tree(), 5))); | 316 layer->SetReplicaLayer(LayerImpl::Create(host_impl.active_tree(), 5))); |
| 318 VERIFY_NEEDS_UPDATE_DRAW_PROPERTIES(layer->SetPosition(arbitrary_point_f)); | 317 VERIFY_NEEDS_UPDATE_DRAW_PROPERTIES(layer->SetPosition(arbitrary_point_f)); |
| 319 VERIFY_NEEDS_UPDATE_DRAW_PROPERTIES(layer->SetShouldFlattenTransform(false)); | 318 VERIFY_NEEDS_UPDATE_DRAW_PROPERTIES(layer->SetShouldFlattenTransform(false)); |
| 320 VERIFY_NEEDS_UPDATE_DRAW_PROPERTIES(layer->Set3dSortingContextId(1)); | 319 VERIFY_NEEDS_UPDATE_DRAW_PROPERTIES(layer->Set3dSortingContextId(1)); |
| 321 | 320 |
| 322 VERIFY_NEEDS_UPDATE_DRAW_PROPERTIES( | 321 VERIFY_NEEDS_UPDATE_DRAW_PROPERTIES( |
| 323 layer->SetDoubleSided(false)); // constructor initializes it to "true". | 322 layer->SetDoubleSided(false)); // constructor initializes it to "true". |
| (...skipping 397 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 721 | 720 |
| 722 ASSERT_TRUE(layer(IV_SCROLL, ACTIVE)->scrollable()); | 721 ASSERT_TRUE(layer(IV_SCROLL, ACTIVE)->scrollable()); |
| 723 | 722 |
| 724 ASSERT_TRUE(LayerHasScrollbar(OV_SCROLL, ACTIVE)); | 723 ASSERT_TRUE(LayerHasScrollbar(OV_SCROLL, ACTIVE)); |
| 725 ASSERT_TRUE(LayerHasScrollbar(IV_CLIP, ACTIVE)); | 724 ASSERT_TRUE(LayerHasScrollbar(IV_CLIP, ACTIVE)); |
| 726 ASSERT_TRUE(LayerHasScrollbar(IV_SCROLL, ACTIVE)); | 725 ASSERT_TRUE(LayerHasScrollbar(IV_SCROLL, ACTIVE)); |
| 727 } | 726 } |
| 728 | 727 |
| 729 } // namespace | 728 } // namespace |
| 730 } // namespace cc | 729 } // namespace cc |
| OLD | NEW |