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

Side by Side Diff: cc/output/copy_output_request.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/output/copy_output_request.h ('k') | cc/output/copy_output_result.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 "cc/output/copy_output_request.h" 5 #include "cc/output/copy_output_request.h"
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "base/callback_helpers.h" 8 #include "base/callback_helpers.h"
9 #include "base/logging.h" 9 #include "base/logging.h"
10 #include "base/trace_event/trace_event.h" 10 #include "base/trace_event/trace_event.h"
11 #include "cc/output/copy_output_result.h" 11 #include "cc/output/copy_output_result.h"
12 #include "cc/resources/texture_mailbox.h" 12 #include "cc/resources/texture_mailbox.h"
13 #include "third_party/skia/include/core/SkBitmap.h" 13 #include "third_party/skia/include/core/SkBitmap.h"
14 14
15 namespace cc { 15 namespace cc {
16 16
17 // static 17 // static
18 scoped_ptr<CopyOutputRequest> CopyOutputRequest::CreateRelayRequest( 18 std::unique_ptr<CopyOutputRequest> CopyOutputRequest::CreateRelayRequest(
19 const CopyOutputRequest& original_request, 19 const CopyOutputRequest& original_request,
20 const CopyOutputRequestCallback& result_callback) { 20 const CopyOutputRequestCallback& result_callback) {
21 scoped_ptr<CopyOutputRequest> relay = CreateRequest(result_callback); 21 std::unique_ptr<CopyOutputRequest> relay = CreateRequest(result_callback);
22 relay->force_bitmap_result_ = original_request.force_bitmap_result_; 22 relay->force_bitmap_result_ = original_request.force_bitmap_result_;
23 relay->has_area_ = original_request.has_area_; 23 relay->has_area_ = original_request.has_area_;
24 relay->area_ = original_request.area_; 24 relay->area_ = original_request.area_;
25 relay->has_texture_mailbox_ = original_request.has_texture_mailbox_; 25 relay->has_texture_mailbox_ = original_request.has_texture_mailbox_;
26 relay->texture_mailbox_ = original_request.texture_mailbox_; 26 relay->texture_mailbox_ = original_request.texture_mailbox_;
27 return relay; 27 return relay;
28 } 28 }
29 29
30 CopyOutputRequest::CopyOutputRequest() 30 CopyOutputRequest::CopyOutputRequest()
31 : source_(nullptr), 31 : source_(nullptr),
(...skipping 11 matching lines...) Expand all
43 result_callback_(result_callback) { 43 result_callback_(result_callback) {
44 DCHECK(!result_callback_.is_null()); 44 DCHECK(!result_callback_.is_null());
45 TRACE_EVENT_ASYNC_BEGIN0("cc", "CopyOutputRequest", this); 45 TRACE_EVENT_ASYNC_BEGIN0("cc", "CopyOutputRequest", this);
46 } 46 }
47 47
48 CopyOutputRequest::~CopyOutputRequest() { 48 CopyOutputRequest::~CopyOutputRequest() {
49 if (!result_callback_.is_null()) 49 if (!result_callback_.is_null())
50 SendResult(CopyOutputResult::CreateEmptyResult()); 50 SendResult(CopyOutputResult::CreateEmptyResult());
51 } 51 }
52 52
53 void CopyOutputRequest::SendResult(scoped_ptr<CopyOutputResult> result) { 53 void CopyOutputRequest::SendResult(std::unique_ptr<CopyOutputResult> result) {
54 bool success = !result->IsEmpty(); 54 bool success = !result->IsEmpty();
55 base::ResetAndReturn(&result_callback_).Run(std::move(result)); 55 base::ResetAndReturn(&result_callback_).Run(std::move(result));
56 TRACE_EVENT_ASYNC_END1("cc", "CopyOutputRequest", this, "success", success); 56 TRACE_EVENT_ASYNC_END1("cc", "CopyOutputRequest", this, "success", success);
57 } 57 }
58 58
59 void CopyOutputRequest::SendEmptyResult() { 59 void CopyOutputRequest::SendEmptyResult() {
60 SendResult(CopyOutputResult::CreateEmptyResult()); 60 SendResult(CopyOutputResult::CreateEmptyResult());
61 } 61 }
62 62
63 void CopyOutputRequest::SendBitmapResult(scoped_ptr<SkBitmap> bitmap) { 63 void CopyOutputRequest::SendBitmapResult(std::unique_ptr<SkBitmap> bitmap) {
64 SendResult(CopyOutputResult::CreateBitmapResult(std::move(bitmap))); 64 SendResult(CopyOutputResult::CreateBitmapResult(std::move(bitmap)));
65 } 65 }
66 66
67 void CopyOutputRequest::SendTextureResult( 67 void CopyOutputRequest::SendTextureResult(
68 const gfx::Size& size, 68 const gfx::Size& size,
69 const TextureMailbox& texture_mailbox, 69 const TextureMailbox& texture_mailbox,
70 scoped_ptr<SingleReleaseCallback> release_callback) { 70 std::unique_ptr<SingleReleaseCallback> release_callback) {
71 DCHECK(texture_mailbox.IsTexture()); 71 DCHECK(texture_mailbox.IsTexture());
72 SendResult(CopyOutputResult::CreateTextureResult( 72 SendResult(CopyOutputResult::CreateTextureResult(
73 size, texture_mailbox, std::move(release_callback))); 73 size, texture_mailbox, std::move(release_callback)));
74 } 74 }
75 75
76 void CopyOutputRequest::SetTextureMailbox( 76 void CopyOutputRequest::SetTextureMailbox(
77 const TextureMailbox& texture_mailbox) { 77 const TextureMailbox& texture_mailbox) {
78 DCHECK(!force_bitmap_result_); 78 DCHECK(!force_bitmap_result_);
79 DCHECK(texture_mailbox.IsTexture()); 79 DCHECK(texture_mailbox.IsTexture());
80 has_texture_mailbox_ = true; 80 has_texture_mailbox_ = true;
81 texture_mailbox_ = texture_mailbox; 81 texture_mailbox_ = texture_mailbox;
82 } 82 }
83 83
84 } // namespace cc 84 } // namespace cc
OLDNEW
« no previous file with comments | « cc/output/copy_output_request.h ('k') | cc/output/copy_output_result.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698