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

Side by Side Diff: mojo/public/cpp/bindings/lib/serialization.h

Issue 2207763003: Make mojo::internal::Buffer a non-virtual class. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@85_3_inline_validation_context
Patch Set: Created 4 years, 4 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 | « mojo/public/cpp/bindings/lib/message_buffer.cc ('k') | mojo/public/cpp/bindings/message.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 2016 The Chromium Authors. All rights reserved. 1 // Copyright 2016 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 #ifndef MOJO_PUBLIC_CPP_BINDINGS_LIB_SERIALIZATION_H_ 5 #ifndef MOJO_PUBLIC_CPP_BINDINGS_LIB_SERIALIZATION_H_
6 #define MOJO_PUBLIC_CPP_BINDINGS_LIB_SERIALIZATION_H_ 6 #define MOJO_PUBLIC_CPP_BINDINGS_LIB_SERIALIZATION_H_
7 7
8 #include <string.h> 8 #include <string.h>
9 9
10 #include "mojo/public/cpp/bindings/array_traits_carray.h" 10 #include "mojo/public/cpp/bindings/array_traits_carray.h"
11 #include "mojo/public/cpp/bindings/array_traits_standard.h" 11 #include "mojo/public/cpp/bindings/array_traits_standard.h"
12 #include "mojo/public/cpp/bindings/array_traits_stl.h" 12 #include "mojo/public/cpp/bindings/array_traits_stl.h"
13 #include "mojo/public/cpp/bindings/lib/array_serialization.h" 13 #include "mojo/public/cpp/bindings/lib/array_serialization.h"
14 #include "mojo/public/cpp/bindings/lib/fixed_buffer.h" 14 #include "mojo/public/cpp/bindings/lib/buffer.h"
15 #include "mojo/public/cpp/bindings/lib/handle_interface_serialization.h" 15 #include "mojo/public/cpp/bindings/lib/handle_interface_serialization.h"
16 #include "mojo/public/cpp/bindings/lib/map_serialization.h" 16 #include "mojo/public/cpp/bindings/lib/map_serialization.h"
17 #include "mojo/public/cpp/bindings/lib/native_enum_serialization.h" 17 #include "mojo/public/cpp/bindings/lib/native_enum_serialization.h"
18 #include "mojo/public/cpp/bindings/lib/native_struct_serialization.h" 18 #include "mojo/public/cpp/bindings/lib/native_struct_serialization.h"
19 #include "mojo/public/cpp/bindings/lib/string_serialization.h" 19 #include "mojo/public/cpp/bindings/lib/string_serialization.h"
20 #include "mojo/public/cpp/bindings/lib/template_util.h" 20 #include "mojo/public/cpp/bindings/lib/template_util.h"
21 #include "mojo/public/cpp/bindings/map_traits_standard.h" 21 #include "mojo/public/cpp/bindings/map_traits_standard.h"
22 #include "mojo/public/cpp/bindings/map_traits_stl.h" 22 #include "mojo/public/cpp/bindings/map_traits_stl.h"
23 #include "mojo/public/cpp/bindings/string_traits_standard.h" 23 #include "mojo/public/cpp/bindings/string_traits_standard.h"
24 #include "mojo/public/cpp/bindings/string_traits_stl.h" 24 #include "mojo/public/cpp/bindings/string_traits_stl.h"
(...skipping 21 matching lines...) Expand all
46 // result buffer is not properly aligned, we have to do an extra copy. In 46 // result buffer is not properly aligned, we have to do an extra copy. In
47 // practice, this should never happen for mojo::Array (backed by std::vector). 47 // practice, this should never happen for mojo::Array (backed by std::vector).
48 bool need_copy = !IsAligned(result_buffer); 48 bool need_copy = !IsAligned(result_buffer);
49 49
50 if (need_copy) { 50 if (need_copy) {
51 // calloc sets the memory to all zero. 51 // calloc sets the memory to all zero.
52 result_buffer = calloc(size, 1); 52 result_buffer = calloc(size, 1);
53 DCHECK(IsAligned(result_buffer)); 53 DCHECK(IsAligned(result_buffer));
54 } 54 }
55 55
56 FixedBuffer buffer; 56 Buffer buffer;
57 buffer.Initialize(result_buffer, size); 57 buffer.Initialize(result_buffer, size);
58 typename MojomType::Struct::Data_* data = nullptr; 58 typename MojomType::Struct::Data_* data = nullptr;
59 Serialize<MojomType>(*input, &buffer, &data, &context); 59 Serialize<MojomType>(*input, &buffer, &data, &context);
60 60
61 if (need_copy) { 61 if (need_copy) {
62 memcpy(&result.front(), result_buffer, size); 62 memcpy(&result.front(), result_buffer, size);
63 free(result_buffer); 63 free(result_buffer);
64 } 64 }
65 65
66 return result; 66 return result;
(...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after
100 if (need_copy) 100 if (need_copy)
101 free(input_buffer); 101 free(input_buffer);
102 102
103 return result; 103 return result;
104 } 104 }
105 105
106 } // namespace internal 106 } // namespace internal
107 } // namespace mojo 107 } // namespace mojo
108 108
109 #endif // MOJO_PUBLIC_CPP_BINDINGS_LIB_SERIALIZATION_H_ 109 #endif // MOJO_PUBLIC_CPP_BINDINGS_LIB_SERIALIZATION_H_
OLDNEW
« no previous file with comments | « mojo/public/cpp/bindings/lib/message_buffer.cc ('k') | mojo/public/cpp/bindings/message.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698