Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(809)

Side by Side Diff: cc/layers/heads_up_display_layer_impl_unittest.cc

Issue 1866203004: Convert //cc from scoped_ptr to std::unique_ptr. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: scopedptrcc: rebase Created 4 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « cc/layers/heads_up_display_layer_impl.cc ('k') | cc/layers/io_surface_layer.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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 <stddef.h> 5 #include <stddef.h>
6 6
7 #include "cc/layers/append_quads_data.h" 7 #include "cc/layers/append_quads_data.h"
8 #include "cc/layers/heads_up_display_layer_impl.h" 8 #include "cc/layers/heads_up_display_layer_impl.h"
9 #include "cc/test/fake_impl_task_runner_provider.h" 9 #include "cc/test/fake_impl_task_runner_provider.h"
10 #include "cc/test/fake_layer_tree_host_impl.h" 10 #include "cc/test/fake_layer_tree_host_impl.h"
11 #include "cc/test/fake_output_surface.h" 11 #include "cc/test/fake_output_surface.h"
12 #include "cc/test/test_shared_bitmap_manager.h" 12 #include "cc/test/test_shared_bitmap_manager.h"
13 #include "cc/test/test_task_graph_runner.h" 13 #include "cc/test/test_task_graph_runner.h"
14 #include "cc/trees/layer_tree_impl.h" 14 #include "cc/trees/layer_tree_impl.h"
15 #include "testing/gtest/include/gtest/gtest.h" 15 #include "testing/gtest/include/gtest/gtest.h"
16 16
17 namespace cc { 17 namespace cc {
18 namespace { 18 namespace {
19 19
20 void CheckDrawLayer(HeadsUpDisplayLayerImpl* layer, 20 void CheckDrawLayer(HeadsUpDisplayLayerImpl* layer,
21 ResourceProvider* resource_provider, 21 ResourceProvider* resource_provider,
22 DrawMode draw_mode) { 22 DrawMode draw_mode) {
23 scoped_ptr<RenderPass> render_pass = RenderPass::Create(); 23 std::unique_ptr<RenderPass> render_pass = RenderPass::Create();
24 AppendQuadsData data; 24 AppendQuadsData data;
25 bool will_draw = layer->WillDraw(draw_mode, resource_provider); 25 bool will_draw = layer->WillDraw(draw_mode, resource_provider);
26 if (will_draw) 26 if (will_draw)
27 layer->AppendQuads(render_pass.get(), &data); 27 layer->AppendQuads(render_pass.get(), &data);
28 layer->UpdateHudTexture(draw_mode, resource_provider); 28 layer->UpdateHudTexture(draw_mode, resource_provider);
29 if (will_draw) 29 if (will_draw)
30 layer->DidDraw(resource_provider); 30 layer->DidDraw(resource_provider);
31 31
32 size_t expected_quad_list_size = will_draw ? 1 : 0; 32 size_t expected_quad_list_size = will_draw ? 1 : 0;
33 EXPECT_EQ(expected_quad_list_size, render_pass->quad_list.size()); 33 EXPECT_EQ(expected_quad_list_size, render_pass->quad_list.size());
34 } 34 }
35 35
36 TEST(HeadsUpDisplayLayerImplTest, ResourcelessSoftwareDrawAfterResourceLoss) { 36 TEST(HeadsUpDisplayLayerImplTest, ResourcelessSoftwareDrawAfterResourceLoss) {
37 FakeImplTaskRunnerProvider task_runner_provider; 37 FakeImplTaskRunnerProvider task_runner_provider;
38 TestSharedBitmapManager shared_bitmap_manager; 38 TestSharedBitmapManager shared_bitmap_manager;
39 TestTaskGraphRunner task_graph_runner; 39 TestTaskGraphRunner task_graph_runner;
40 scoped_ptr<OutputSurface> output_surface = FakeOutputSurface::Create3d(); 40 std::unique_ptr<OutputSurface> output_surface = FakeOutputSurface::Create3d();
41 FakeLayerTreeHostImpl host_impl(&task_runner_provider, &shared_bitmap_manager, 41 FakeLayerTreeHostImpl host_impl(&task_runner_provider, &shared_bitmap_manager,
42 &task_graph_runner); 42 &task_graph_runner);
43 host_impl.CreatePendingTree(); 43 host_impl.CreatePendingTree();
44 host_impl.SetVisible(true); 44 host_impl.SetVisible(true);
45 host_impl.InitializeRenderer(output_surface.get()); 45 host_impl.InitializeRenderer(output_surface.get());
46 scoped_ptr<HeadsUpDisplayLayerImpl> layer_ptr = 46 std::unique_ptr<HeadsUpDisplayLayerImpl> layer_ptr =
47 HeadsUpDisplayLayerImpl::Create(host_impl.pending_tree(), 1); 47 HeadsUpDisplayLayerImpl::Create(host_impl.pending_tree(), 1);
48 layer_ptr->SetBounds(gfx::Size(100, 100)); 48 layer_ptr->SetBounds(gfx::Size(100, 100));
49 49
50 HeadsUpDisplayLayerImpl* layer = layer_ptr.get(); 50 HeadsUpDisplayLayerImpl* layer = layer_ptr.get();
51 51
52 host_impl.pending_tree()->SetRootLayer(std::move(layer_ptr)); 52 host_impl.pending_tree()->SetRootLayer(std::move(layer_ptr));
53 host_impl.pending_tree()->BuildPropertyTreesForTesting(); 53 host_impl.pending_tree()->BuildPropertyTreesForTesting();
54 54
55 // Check regular hardware draw is ok. 55 // Check regular hardware draw is ok.
56 CheckDrawLayer(layer, host_impl.resource_provider(), DRAW_MODE_HARDWARE); 56 CheckDrawLayer(layer, host_impl.resource_provider(), DRAW_MODE_HARDWARE);
57 57
58 // Simulate a resource loss on transitioning to resourceless software mode. 58 // Simulate a resource loss on transitioning to resourceless software mode.
59 layer->ReleaseResources(); 59 layer->ReleaseResources();
60 60
61 // Should skip resourceless software draw and not crash in UpdateHudTexture. 61 // Should skip resourceless software draw and not crash in UpdateHudTexture.
62 CheckDrawLayer(layer, host_impl.resource_provider(), 62 CheckDrawLayer(layer, host_impl.resource_provider(),
63 DRAW_MODE_RESOURCELESS_SOFTWARE); 63 DRAW_MODE_RESOURCELESS_SOFTWARE);
64 } 64 }
65 65
66 } // namespace 66 } // namespace
67 } // namespace cc 67 } // namespace cc
OLDNEW
« no previous file with comments | « cc/layers/heads_up_display_layer_impl.cc ('k') | cc/layers/io_surface_layer.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698