third_party/mojo/src/mojo/public/java/bindings/src/org/chromium/mojo/bindings/Encoder.java - Issue 1101303002: Update mojo sdk to rev e7270700d671fa8e458b4d8c9e47f7bcfb65da0b

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 1101303002: Update mojo sdk to rev e7270700d671fa8e458b4d8c9e47f7bcfb65da0b (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Actualy provide a default TaskTracker impl Created 5 years, 8 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 | « third_party/mojo/src/mojo/public/interfaces/bindings/tests/test_unions.mojom ('k') | third_party/mojo/src/mojo/public/java/bindings/src/org/chromium/mojo/bindings/Interface.java » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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 94f444570ac7425388df2ac3a998e5271da24b30..23a618885cf8735fa772ef070937c30144626f5b 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

@@ -4,6 +4,7 @@

package org.chromium.mojo.bindings;

+import org.chromium.mojo.bindings.Interface.AbstractProxy.HandlerImpl;

import org.chromium.mojo.bindings.Struct.DataHeader;

import org.chromium.mojo.system.Core;

import org.chromium.mojo.system.Handle;

@@ -261,9 +262,9 @@ public class Encoder {

}

// If the instance is a proxy, pass the proxy's handle instead of creating a new stub.

if (v instanceof Interface.AbstractProxy) {

- Interface.AbstractProxy proxy = (Interface.AbstractProxy) v;

- if (proxy.getMessageReceiver() instanceof HandleOwner) {

- encode(((HandleOwner<?>) proxy.getMessageReceiver()).passHandle(), offset,

+ HandlerImpl handler = ((Interface.AbstractProxy) v).getProxyHandler();

+ if (handler.getMessageReceiver() instanceof HandleOwner) {

+ encode(((HandleOwner<?>) handler.getMessageReceiver()).passHandle(), offset,

nullable);

return;

}