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

Unified Diff: third_party/mojo/src/mojo/public/java/bindings/src/org/chromium/mojo/bindings/Connector.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/Connector.java
diff --git a/third_party/mojo/src/mojo/public/java/bindings/src/org/chromium/mojo/bindings/Connector.java b/third_party/mojo/src/mojo/public/java/bindings/src/org/chromium/mojo/bindings/Connector.java
index 1d2404b9069e03037eaf83d779a9c18379bb5601..d4e44ebd2e2df95f59f54831cfd35fbb395ffc59 100644
--- a/third_party/mojo/src/mojo/public/java/bindings/src/org/chromium/mojo/bindings/Connector.java
+++ b/third_party/mojo/src/mojo/public/java/bindings/src/org/chromium/mojo/bindings/Connector.java
@@ -196,7 +196,7 @@ public class Connector implements MessageReceiver, HandleOwner<MessagePipeHandle
* Read all available messages on the owned message pipe.
*/
private void readOutstandingMessages() {
- int result;
+ ResultAnd<Boolean> result;
do {
try {
result = readAndDispatchMessage(mMessagePipeHandle, mIncomingMessageReceiver);
@@ -204,11 +204,11 @@ public class Connector implements MessageReceiver, HandleOwner<MessagePipeHandle
onError(e);
return;
}
- } while (result == MojoResult.OK);
- if (result == MojoResult.SHOULD_WAIT) {
+ } while (result.getValue());
+ if (result.getMojoResult() == MojoResult.SHOULD_WAIT) {
registerAsyncWaiterForRead();
} else {
- onError(new MojoException(result));
+ onError(new MojoException(result.getMojoResult()));
}
}
@@ -226,12 +226,13 @@ public class Connector implements MessageReceiver, HandleOwner<MessagePipeHandle
* @param receiver The {@link MessageReceiver} that will receive the read {@link Message}. Can
* be <code>null</code>, in which case the message is discarded.
*/
- static int readAndDispatchMessage(MessagePipeHandle handle, MessageReceiver receiver) {
+ static ResultAnd<Boolean> readAndDispatchMessage(
+ MessagePipeHandle handle, MessageReceiver receiver) {
// TODO(qsr) Allow usage of a pool of pre-allocated buffer for performance.
ResultAnd<ReadMessageResult> result =
handle.readMessage(null, 0, MessagePipeHandle.ReadFlags.NONE);
if (result.getMojoResult() != MojoResult.RESOURCE_EXHAUSTED) {
- return result.getMojoResult();
+ return new ResultAnd<Boolean>(result.getMojoResult(), false);
}
ReadMessageResult readResult = result.getValue();
assert readResult != null;
@@ -239,8 +240,9 @@ public class Connector implements MessageReceiver, HandleOwner<MessagePipeHandle
result = handle.readMessage(
buffer, readResult.getHandlesCount(), MessagePipeHandle.ReadFlags.NONE);
if (receiver != null && result.getMojoResult() == MojoResult.OK) {
- receiver.accept(new Message(buffer, result.getValue().getHandles()));
+ boolean accepted = receiver.accept(new Message(buffer, result.getValue().getHandles()));
+ return new ResultAnd<Boolean>(result.getMojoResult(), accepted);
}
- return result.getMojoResult();
+ return new ResultAnd<Boolean>(result.getMojoResult(), false);
}
}

Powered by Google App Engine
This is Rietveld 408576698