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

Unified Diff: mojo/system/message_in_transit.cc

Issue 190973008: Mojo: Remove implicit scoped_refptr<T> -> T* conversions in mojo/. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 9 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 | « mojo/common/handle_watcher.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: mojo/system/message_in_transit.cc
diff --git a/mojo/system/message_in_transit.cc b/mojo/system/message_in_transit.cc
index 9ac129e7b0d566172558c3fe31c14ac831c22851..8be2f31792486304b21d2e4f849bedf7465416d8 100644
--- a/mojo/system/message_in_transit.cc
+++ b/mojo/system/message_in_transit.cc
@@ -175,7 +175,7 @@ void MessageInTransit::SerializeAndCloseDispatchers(Channel* channel) {
// table, and add to it as we go along.
size_t size = handle_table_size;
for (size_t i = 0; i < dispatchers_->size(); i++) {
- if (Dispatcher* dispatcher = (*dispatchers_)[i]) {
+ if (Dispatcher* dispatcher = (*dispatchers_)[i].get()) {
size += RoundUpMessageAlignment(
Dispatcher::MessageInTransitAccess::GetMaximumSerializedSize(
dispatcher, channel));
@@ -195,10 +195,10 @@ void MessageInTransit::SerializeAndCloseDispatchers(Channel* channel) {
static_cast<HandleTableEntry*>(secondary_buffer_);
size_t current_offset = handle_table_size;
for (size_t i = 0; i < dispatchers_->size(); i++) {
- Dispatcher* dispatcher = (*dispatchers_)[i];
+ Dispatcher* dispatcher = (*dispatchers_)[i].get();
if (!dispatcher) {
COMPILE_ASSERT(Dispatcher::kTypeUnknown == 0,
- need_Dispatcher_kTypeUnknown_to_be_zero);
+ value_of_Dispatcher_kTypeUnknown_must_be_zero);
continue;
}
« no previous file with comments | « mojo/common/handle_watcher.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698