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

Unified Diff: mojo/edk/system/shared_buffer_dispatcher.cc

Issue 1478503003: EDK: Convert most uses of PlatformHandleVector to std::vector<ScopedPlatformHandle>. (Closed) Base URL: https://github.com/domokit/mojo.git@master
Patch Set: 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « mojo/edk/system/shared_buffer_dispatcher.h ('k') | mojo/edk/system/slave_connection_manager.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: mojo/edk/system/shared_buffer_dispatcher.cc
diff --git a/mojo/edk/system/shared_buffer_dispatcher.cc b/mojo/edk/system/shared_buffer_dispatcher.cc
index 8b86d0a46fb1d9d2b772eb7fe75dff48ea94da6b..128708efe57ad13e20fe88b6d5d4c59c81160802 100644
--- a/mojo/edk/system/shared_buffer_dispatcher.cc
+++ b/mojo/edk/system/shared_buffer_dispatcher.cc
@@ -15,6 +15,7 @@
#include "mojo/edk/system/options_validation.h"
#include "mojo/public/c/system/macros.h"
+using mojo::embedder::ScopedPlatformHandle;
using mojo::util::RefPtr;
namespace mojo {
@@ -98,7 +99,7 @@ RefPtr<SharedBufferDispatcher> SharedBufferDispatcher::Deserialize(
Channel* channel,
const void* source,
size_t size,
- embedder::PlatformHandleVector* platform_handles) {
+ std::vector<ScopedPlatformHandle>* platform_handles) {
DCHECK(channel);
if (size != sizeof(SerializedSharedBufferDispatcher)) {
@@ -140,7 +141,7 @@ RefPtr<SharedBufferDispatcher> SharedBufferDispatcher::Deserialize(
}
// Starts off invalid, which is what we want.
- embedder::PlatformHandle platform_handle;
+ ScopedPlatformHandle platform_handle;
// We take ownership of the handle, so we have to invalidate the one in
// |platform_handles|.
std::swap(platform_handle, (*platform_handles)[platform_handle_index]);
@@ -149,7 +150,7 @@ RefPtr<SharedBufferDispatcher> SharedBufferDispatcher::Deserialize(
// closed even if creation fails.
auto shared_buffer =
channel->platform_support()->CreateSharedBufferFromHandle(
- num_bytes, embedder::ScopedPlatformHandle(platform_handle));
+ num_bytes, std::move(platform_handle));
if (!shared_buffer) {
LOG(ERROR)
<< "Invalid serialized shared buffer dispatcher (invalid num_bytes?)";
@@ -267,7 +268,7 @@ bool SharedBufferDispatcher::EndSerializeAndCloseImplNoLock(
Channel* /*channel*/,
void* destination,
size_t* actual_size,
- embedder::PlatformHandleVector* platform_handles) {
+ std::vector<ScopedPlatformHandle>* platform_handles) {
AssertHasOneRef(); // Only one ref => no need to take the lock.
DCHECK(shared_buffer_);
@@ -276,7 +277,7 @@ bool SharedBufferDispatcher::EndSerializeAndCloseImplNoLock(
// If there's only one reference to |shared_buffer_|, then it's ours (and no
// one else can make any more references to it), so we can just take its
// handle.
- embedder::ScopedPlatformHandle platform_handle(
+ ScopedPlatformHandle platform_handle(
shared_buffer_->HasOneRef() ? shared_buffer_->PassPlatformHandle()
: shared_buffer_->DuplicatePlatformHandle());
if (!platform_handle.is_valid()) {
@@ -286,7 +287,7 @@ bool SharedBufferDispatcher::EndSerializeAndCloseImplNoLock(
serialization->num_bytes = shared_buffer_->GetNumBytes();
serialization->platform_handle_index = platform_handles->size();
- platform_handles->push_back(platform_handle.release());
+ platform_handles->push_back(std::move(platform_handle));
*actual_size = sizeof(SerializedSharedBufferDispatcher);
shared_buffer_ = nullptr;
« no previous file with comments | « mojo/edk/system/shared_buffer_dispatcher.h ('k') | mojo/edk/system/slave_connection_manager.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698