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

Side by Side Diff: cc/ipc/copy_output_result_struct_traits.cc

Issue 2670213006: Mojom structs for copy requests / results should map to unique_ptr (Closed)
Patch Set: c Created 3 years, 10 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 2017 The Chromium Authors. All rights reserved. 1 // Copyright 2017 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/ipc/copy_output_result_struct_traits.h" 5 #include "cc/ipc/copy_output_result_struct_traits.h"
6 6
7 namespace mojo { 7 namespace mojo {
8 8
9 // static 9 // static
10 bool StructTraits<cc::mojom::CopyOutputResultDataView, cc::CopyOutputResult>:: 10 bool StructTraits<cc::mojom::CopyOutputResultDataView,
11 Read(cc::mojom::CopyOutputResultDataView data, cc::CopyOutputResult* out) { 11 std::unique_ptr<cc::CopyOutputResult>>::
12 Read(cc::mojom::CopyOutputResultDataView data,
13 std::unique_ptr<cc::CopyOutputResult>* out_p) {
14 std::unique_ptr<cc::CopyOutputResult>& out = *out_p;
15 out = cc::CopyOutputResult::CreateEmptyResult();
12 out->bitmap_ = base::MakeUnique<SkBitmap>(); 16 out->bitmap_ = base::MakeUnique<SkBitmap>();
13 return data.ReadSize(&out->size_) && data.ReadBitmap(out->bitmap_.get()) && 17 return data.ReadSize(&out->size_) && data.ReadBitmap(out->bitmap_.get()) &&
14 data.ReadTextureMailbox(&out->texture_mailbox_); 18 data.ReadTextureMailbox(&out->texture_mailbox_);
15 } 19 }
16 20
17 // static 21 // static
18 const SkBitmap& 22 const SkBitmap& StructTraits<cc::mojom::CopyOutputResultDataView,
19 StructTraits<cc::mojom::CopyOutputResultDataView, cc::CopyOutputResult>::bitmap( 23 std::unique_ptr<cc::CopyOutputResult>>::
20 const cc::CopyOutputResult& result) { 24 bitmap(const std::unique_ptr<cc::CopyOutputResult>& result) {
21 static SkBitmap* null_bitmap = new SkBitmap(); 25 static SkBitmap* null_bitmap = new SkBitmap();
22 if (!result.bitmap_) 26 if (!result->bitmap_)
23 return *null_bitmap; 27 return *null_bitmap;
24 return *result.bitmap_; 28 return *result->bitmap_;
25 } 29 }
26 30
27 } // namespace mojo 31 } // namespace mojo
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698