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

Unified Diff: mojo/public/cpp/bindings/array_traits_stl.h

Issue 2199623002: Revert of Mojo C++ bindings: make ipc/ mojom targets to use STL string/vector types (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 5 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ipc/ipc_message_pipe_reader.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: mojo/public/cpp/bindings/array_traits_stl.h
diff --git a/mojo/public/cpp/bindings/array_traits_stl.h b/mojo/public/cpp/bindings/array_traits_stl.h
index e6ef4e72819c8beb788fff7dcf05ec422451bbe0..9054a920190cd455890b3263e366c1811b3ce574 100644
--- a/mojo/public/cpp/bindings/array_traits_stl.h
+++ b/mojo/public/cpp/bindings/array_traits_stl.h
@@ -7,7 +7,6 @@
#include <vector>
-#include "build/build_config.h"
#include "mojo/public/cpp/bindings/array_traits.h"
namespace mojo {
@@ -43,23 +42,16 @@
return input[index];
}
- static inline bool Resize(std::vector<T>& input, size_t size) {
-#if defined(OS_MACOSX) || defined(OS_ANDROID)
- // This is a hack to make compilers for Mac and Android happy. They
- // currently don't allow resizing types like
- // std::vector<std::vector<MoveOnlyType>>.
- // Because the deserialization code doesn't care about the original contents
- // of |input|, we discard them directly.
- //
- // The "inline" keyword of this method matters. Without it, we have observed
- // significant perf regression with some tests on Mac. crbug.com/631415
+ static bool Resize(std::vector<T>& input, size_t size) {
if (input.size() != size) {
+ // This is a hack to make compilers for Mac and Android happy. They
+ // currently don't allow resizing types like
+ // std::vector<std::vector<MoveOnlyType>>.
+ // Because the deserialization code doesn't care about the original
+ // contents of |input|, we discard them directly.
std::vector<T> temp(size);
input.swap(temp);
}
-#else
- input.resize(size);
-#endif
return true;
}
« no previous file with comments | « ipc/ipc_message_pipe_reader.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698