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

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

Issue 1455023002: cc: Replace Pass() with std::move() in some subdirs. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@pass-cc
Patch Set: pass-cc2: . Created 5 years, 1 month 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 | « no previous file | cc/layers/delegated_frame_provider_unittest.cc » ('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 "cc/layers/delegated_frame_provider.h" 5 #include "cc/layers/delegated_frame_provider.h"
6 6
7 #include "cc/layers/delegated_frame_resource_collection.h" 7 #include "cc/layers/delegated_frame_resource_collection.h"
8 #include "cc/layers/delegated_renderer_layer.h" 8 #include "cc/layers/delegated_renderer_layer.h"
9 #include "cc/output/delegated_frame_data.h" 9 #include "cc/output/delegated_frame_data.h"
10 #include "cc/quads/render_pass_draw_quad.h" 10 #include "cc/quads/render_pass_draw_quad.h"
11 11
12 namespace cc { 12 namespace cc {
13 13
14 DelegatedFrameProvider::DelegatedFrameProvider( 14 DelegatedFrameProvider::DelegatedFrameProvider(
15 const scoped_refptr<DelegatedFrameResourceCollection>& resource_collection, 15 const scoped_refptr<DelegatedFrameResourceCollection>& resource_collection,
16 scoped_ptr<DelegatedFrameData> frame) 16 scoped_ptr<DelegatedFrameData> frame)
17 : resource_collection_(resource_collection) { 17 : resource_collection_(resource_collection) {
18 RenderPass* root_pass = frame->render_pass_list.back().get(); 18 RenderPass* root_pass = frame->render_pass_list.back().get();
19 frame_size_ = root_pass->output_rect.size(); 19 frame_size_ = root_pass->output_rect.size();
20 DCHECK(!frame_size_.IsEmpty()); 20 DCHECK(!frame_size_.IsEmpty());
21 SetFrameData(frame.Pass()); 21 SetFrameData(std::move(frame));
22 } 22 }
23 23
24 DelegatedFrameProvider::~DelegatedFrameProvider() { 24 DelegatedFrameProvider::~DelegatedFrameProvider() {
25 ReturnedResourceArray returned; 25 ReturnedResourceArray returned;
26 TransferableResource::ReturnResources(frame_->resource_list, &returned); 26 TransferableResource::ReturnResources(frame_->resource_list, &returned);
27 resource_collection_->UnrefResources(returned); 27 resource_collection_->UnrefResources(returned);
28 } 28 }
29 29
30 void DelegatedFrameProvider::AddObserver(DelegatedRendererLayer* layer) { 30 void DelegatedFrameProvider::AddObserver(DelegatedRendererLayer* layer) {
31 #if DCHECK_IS_ON() 31 #if DCHECK_IS_ON()
(...skipping 22 matching lines...) Expand all
54 scoped_ptr<DelegatedFrameData> frame) { 54 scoped_ptr<DelegatedFrameData> frame) {
55 DCHECK(frame); 55 DCHECK(frame);
56 DCHECK_NE(0u, frame->render_pass_list.size()); 56 DCHECK_NE(0u, frame->render_pass_list.size());
57 57
58 if (frame_) { 58 if (frame_) {
59 ReturnedResourceArray returned; 59 ReturnedResourceArray returned;
60 TransferableResource::ReturnResources(frame_->resource_list, &returned); 60 TransferableResource::ReturnResources(frame_->resource_list, &returned);
61 resource_collection_->UnrefResources(returned); 61 resource_collection_->UnrefResources(returned);
62 } 62 }
63 63
64 frame_ = frame.Pass(); 64 frame_ = std::move(frame);
65 65
66 resource_collection_->ReceivedResources(frame_->resource_list); 66 resource_collection_->ReceivedResources(frame_->resource_list);
67 resource_collection_->RefResources(frame_->resource_list); 67 resource_collection_->RefResources(frame_->resource_list);
68 68
69 RenderPass* root_pass = frame_->render_pass_list.back().get(); 69 RenderPass* root_pass = frame_->render_pass_list.back().get();
70 DCHECK_EQ(frame_size_.ToString(), root_pass->output_rect.size().ToString()) 70 DCHECK_EQ(frame_size_.ToString(), root_pass->output_rect.size().ToString())
71 << "All frames in a single DelegatedFrameProvider must have the same " 71 << "All frames in a single DelegatedFrameProvider must have the same "
72 << "size. Use a new frame provider for frames of a different size."; 72 << "size. Use a new frame provider for frames of a different size.";
73 73
74 for (size_t i = 0; i < observers_.size(); ++i) { 74 for (size_t i = 0; i < observers_.size(); ++i) {
(...skipping 25 matching lines...) Expand all
100 DelegatedFrameProvider::GetReturnResourcesCallbackForImplThread() { 100 DelegatedFrameProvider::GetReturnResourcesCallbackForImplThread() {
101 return resource_collection_->GetReturnResourcesCallbackForImplThread(); 101 return resource_collection_->GetReturnResourcesCallbackForImplThread();
102 } 102 }
103 103
104 void DelegatedFrameProvider::UnrefResourcesOnMainThread( 104 void DelegatedFrameProvider::UnrefResourcesOnMainThread(
105 const ReturnedResourceArray& returned) { 105 const ReturnedResourceArray& returned) {
106 resource_collection_->UnrefResources(returned); 106 resource_collection_->UnrefResources(returned);
107 } 107 }
108 108
109 } // namespace cc 109 } // namespace cc
OLDNEW
« no previous file with comments | « no previous file | cc/layers/delegated_frame_provider_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698