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

Unified Diff: mojo/edk/system/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/dispatcher.h ('k') | mojo/edk/system/local_data_pipe_impl.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: mojo/edk/system/dispatcher.cc
diff --git a/mojo/edk/system/dispatcher.cc b/mojo/edk/system/dispatcher.cc
index ea88870b138db018f57506341ea304d9d170f9ee..9433cccde65ea3a1f54506251aee87e729704216 100644
--- a/mojo/edk/system/dispatcher.cc
+++ b/mojo/edk/system/dispatcher.cc
@@ -12,6 +12,7 @@
#include "mojo/edk/system/platform_handle_dispatcher.h"
#include "mojo/edk/system/shared_buffer_dispatcher.h"
+using mojo::embedder::ScopedPlatformHandle;
using mojo::util::MutexLocker;
using mojo::util::RefPtr;
@@ -63,7 +64,7 @@ bool Dispatcher::TransportDataAccess::EndSerializeAndClose(
Channel* channel,
void* destination,
size_t* actual_size,
- embedder::PlatformHandleVector* platform_handles) {
+ std::vector<ScopedPlatformHandle>* platform_handles) {
DCHECK(dispatcher);
return dispatcher->EndSerializeAndClose(channel, destination, actual_size,
platform_handles);
@@ -75,7 +76,7 @@ RefPtr<Dispatcher> Dispatcher::TransportDataAccess::Deserialize(
int32_t type,
const void* source,
size_t size,
- embedder::PlatformHandleVector* platform_handles) {
+ std::vector<ScopedPlatformHandle>* platform_handles) {
switch (static_cast<Dispatcher::Type>(type)) {
case Type::UNKNOWN:
DVLOG(2) << "Deserializing invalid handle";
@@ -412,7 +413,7 @@ bool Dispatcher::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(is_closed_);
// By default, serializing isn't supported, so just close.
@@ -461,7 +462,7 @@ bool Dispatcher::EndSerializeAndClose(
Channel* channel,
void* destination,
size_t* actual_size,
- embedder::PlatformHandleVector* platform_handles) {
+ std::vector<ScopedPlatformHandle>* platform_handles) {
DCHECK(channel);
DCHECK(actual_size);
AssertHasOneRef(); // Only one ref => no need to take the lock.
« no previous file with comments | « mojo/edk/system/dispatcher.h ('k') | mojo/edk/system/local_data_pipe_impl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698