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

Side by Side Diff: cc/tiles/raster_tile_priority_queue_required.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
OLDNEW
1 // Copyright 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 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/tiles/raster_tile_priority_queue_required.h" 5 #include "cc/tiles/raster_tile_priority_queue_required.h"
6 6
7 #include "cc/tiles/tiling_set_raster_queue_required.h" 7 #include "cc/tiles/tiling_set_raster_queue_required.h"
8 8
9 namespace cc { 9 namespace cc {
10 10
11 namespace { 11 namespace {
12 12
13 void AppendTilingSetRequiredQueues( 13 void AppendTilingSetRequiredQueues(
14 const std::vector<PictureLayerImpl*>& layers, 14 const std::vector<PictureLayerImpl*>& layers,
15 std::vector<scoped_ptr<TilingSetRasterQueueRequired>>* queues) { 15 std::vector<std::unique_ptr<TilingSetRasterQueueRequired>>* queues) {
16 for (auto* layer : layers) { 16 for (auto* layer : layers) {
17 if (!layer->HasValidTilePriorities()) 17 if (!layer->HasValidTilePriorities())
18 continue; 18 continue;
19 19
20 scoped_ptr<TilingSetRasterQueueRequired> tiling_set_queue( 20 std::unique_ptr<TilingSetRasterQueueRequired> tiling_set_queue(
21 new TilingSetRasterQueueRequired( 21 new TilingSetRasterQueueRequired(
22 layer->picture_layer_tiling_set(), 22 layer->picture_layer_tiling_set(),
23 RasterTilePriorityQueueRequired::Type::REQUIRED_FOR_ACTIVATION)); 23 RasterTilePriorityQueueRequired::Type::REQUIRED_FOR_ACTIVATION));
24 if (!tiling_set_queue->IsEmpty()) 24 if (!tiling_set_queue->IsEmpty())
25 queues->push_back(std::move(tiling_set_queue)); 25 queues->push_back(std::move(tiling_set_queue));
26 } 26 }
27 } 27 }
28 28
29 } // namespace 29 } // namespace
30 30
(...skipping 13 matching lines...) Expand all
44 else 44 else
45 BuildRequiredForActivation(active_layers, pending_layers); 45 BuildRequiredForActivation(active_layers, pending_layers);
46 } 46 }
47 47
48 void RasterTilePriorityQueueRequired::BuildRequiredForDraw( 48 void RasterTilePriorityQueueRequired::BuildRequiredForDraw(
49 const std::vector<PictureLayerImpl*>& active_layers) { 49 const std::vector<PictureLayerImpl*>& active_layers) {
50 for (const auto& layer : active_layers) { 50 for (const auto& layer : active_layers) {
51 if (!layer->HasValidTilePriorities()) 51 if (!layer->HasValidTilePriorities())
52 continue; 52 continue;
53 53
54 scoped_ptr<TilingSetRasterQueueRequired> tiling_set_queue( 54 std::unique_ptr<TilingSetRasterQueueRequired> tiling_set_queue(
55 new TilingSetRasterQueueRequired(layer->picture_layer_tiling_set(), 55 new TilingSetRasterQueueRequired(layer->picture_layer_tiling_set(),
56 Type::REQUIRED_FOR_DRAW)); 56 Type::REQUIRED_FOR_DRAW));
57 if (!tiling_set_queue->IsEmpty()) 57 if (!tiling_set_queue->IsEmpty())
58 tiling_set_queues_.push_back(std::move(tiling_set_queue)); 58 tiling_set_queues_.push_back(std::move(tiling_set_queue));
59 } 59 }
60 } 60 }
61 61
62 void RasterTilePriorityQueueRequired::BuildRequiredForActivation( 62 void RasterTilePriorityQueueRequired::BuildRequiredForActivation(
63 const std::vector<PictureLayerImpl*>& active_layers, 63 const std::vector<PictureLayerImpl*>& active_layers,
64 const std::vector<PictureLayerImpl*>& pending_layers) { 64 const std::vector<PictureLayerImpl*>& pending_layers) {
(...skipping 11 matching lines...) Expand all
76 } 76 }
77 77
78 void RasterTilePriorityQueueRequired::Pop() { 78 void RasterTilePriorityQueueRequired::Pop() {
79 DCHECK(!IsEmpty()); 79 DCHECK(!IsEmpty());
80 tiling_set_queues_.back()->Pop(); 80 tiling_set_queues_.back()->Pop();
81 if (tiling_set_queues_.back()->IsEmpty()) 81 if (tiling_set_queues_.back()->IsEmpty())
82 tiling_set_queues_.pop_back(); 82 tiling_set_queues_.pop_back();
83 } 83 }
84 84
85 } // namespace cc 85 } // namespace cc
OLDNEW
« no previous file with comments | « cc/tiles/raster_tile_priority_queue_required.h ('k') | cc/tiles/software_image_decode_controller.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698