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

Unified Diff: third_party/mojo/src/mojo/public/java/bindings/src/org/chromium/mojo/bindings/Encoder.java

Issue 1127293003: Update mojo sdk to rev f84766d3b6420b7cf6a113d9d65d73cb5fe18d90 (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: formatting Created 5 years, 7 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
Index: third_party/mojo/src/mojo/public/java/bindings/src/org/chromium/mojo/bindings/Encoder.java
diff --git a/third_party/mojo/src/mojo/public/java/bindings/src/org/chromium/mojo/bindings/Encoder.java b/third_party/mojo/src/mojo/public/java/bindings/src/org/chromium/mojo/bindings/Encoder.java
index 23a618885cf8735fa772ef070937c30144626f5b..c820ac5284583ae93f103bc981d22cfac3dacbbc 100644
--- a/third_party/mojo/src/mojo/public/java/bindings/src/org/chromium/mojo/bindings/Encoder.java
+++ b/third_party/mojo/src/mojo/public/java/bindings/src/org/chromium/mojo/bindings/Encoder.java
@@ -250,10 +250,9 @@ public class Encoder {
*/
public <T extends Interface> void encode(T v, int offset, boolean nullable,
Interface.Manager<T, ?> manager) {
- // Set the version field to 0 for now.
- encode(0, offset + BindingsHelper.SERIALIZED_HANDLE_SIZE);
if (v == null) {
encodeInvalidHandle(offset, nullable);
+ encode(0, offset + BindingsHelper.SERIALIZED_HANDLE_SIZE);
return;
}
if (mEncoderState.core == null) {
@@ -266,6 +265,7 @@ public class Encoder {
if (handler.getMessageReceiver() instanceof HandleOwner) {
encode(((HandleOwner<?>) handler.getMessageReceiver()).passHandle(), offset,
nullable);
+ encode(handler.getVersion(), offset + BindingsHelper.SERIALIZED_HANDLE_SIZE);
return;
}
// If the proxy is not over a message pipe, the default case applies.
@@ -274,6 +274,7 @@ public class Encoder {
mEncoderState.core.createMessagePipe(null);
manager.bind(v, handles.first);
encode(handles.second, offset, nullable);
+ encode(manager.getVersion(), offset + BindingsHelper.SERIALIZED_HANDLE_SIZE);
}
/**

Powered by Google App Engine
This is Rietveld 408576698