OLD | NEW |
1 // Copyright 2016 The Chromium Authors. All rights reserved. | 1 // Copyright 2016 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 "compositor_state_deserializer.h" | 5 #include "compositor_state_deserializer.h" |
6 | 6 |
| 7 #include "base/memory/ptr_util.h" |
7 #include "base/run_loop.h" | 8 #include "base/run_loop.h" |
8 #include "cc/animation/animation_host.h" | 9 #include "cc/animation/animation_host.h" |
9 #include "cc/blimp/client_picture_cache.h" | 10 #include "cc/blimp/client_picture_cache.h" |
10 #include "cc/blimp/compositor_proto_state.h" | 11 #include "cc/blimp/compositor_proto_state.h" |
11 #include "cc/blimp/layer_tree_host_remote.h" | 12 #include "cc/blimp/layer_tree_host_remote.h" |
12 #include "cc/layers/content_layer_client.h" | 13 #include "cc/layers/content_layer_client.h" |
13 #include "cc/layers/picture_layer.h" | 14 #include "cc/layers/picture_layer.h" |
14 #include "cc/layers/solid_color_scrollbar_layer.h" | 15 #include "cc/layers/solid_color_scrollbar_layer.h" |
15 #include "cc/playback/display_item_list.h" | 16 #include "cc/playback/display_item_list.h" |
16 #include "cc/playback/drawing_display_item.h" | 17 #include "cc/playback/drawing_display_item.h" |
(...skipping 377 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
394 picture_layer2->id())); | 395 picture_layer2->id())); |
395 scoped_refptr<DisplayItemList> client_display_list2 = | 396 scoped_refptr<DisplayItemList> client_display_list2 = |
396 client_picture_layer2->client()->PaintContentsToDisplayList( | 397 client_picture_layer2->client()->PaintContentsToDisplayList( |
397 ContentLayerClient::PaintingControlSetting::PAINTING_BEHAVIOR_NORMAL); | 398 ContentLayerClient::PaintingControlSetting::PAINTING_BEHAVIOR_NORMAL); |
398 EXPECT_TRUE(AreDisplayListDrawingResultsSame( | 399 EXPECT_TRUE(AreDisplayListDrawingResultsSame( |
399 gfx::Rect(layer_size), display_list.get(), client_display_list2.get())); | 400 gfx::Rect(layer_size), display_list.get(), client_display_list2.get())); |
400 } | 401 } |
401 | 402 |
402 } // namespace | 403 } // namespace |
403 } // namespace cc | 404 } // namespace cc |
OLD | NEW |