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

Unified Diff: extensions/renderer/resources/serial_service.js

Issue 889283002: Remove Client= from device/serial/data_stream.mojom. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: This time without racing message pipes Created 5 years, 10 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 | « extensions/renderer/resources/data_sender.js ('k') | extensions/test/data/data_receiver_unittest.js » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: extensions/renderer/resources/serial_service.js
diff --git a/extensions/renderer/resources/serial_service.js b/extensions/renderer/resources/serial_service.js
index d0f29761b03adc47d4b8dda17b4a88c814e22aec..21efb7b9e8463442e172ffd4f7d3036d85ace5fd 100644
--- a/extensions/renderer/resources/serial_service.js
+++ b/extensions/renderer/resources/serial_service.js
@@ -134,14 +134,16 @@ define('serial_service', [
clientOptions.bufferSize = options.bufferSize;
};
- function Connection(connection, router, receivePipe, sendPipe, id, options) {
+ function Connection(connection, router, receivePipe, receiveClientPipe,
+ sendPipe, id, options) {
var state = new serialization.ConnectionState();
state.connectionId = id;
updateClientOptions(state, options);
var receiver = new dataReceiver.DataReceiver(
- receivePipe, state.bufferSize, serialMojom.ReceiveError.DISCONNECTED);
- var sender = new dataSender.DataSender(
- sendPipe, state.bufferSize, serialMojom.SendError.DISCONNECTED);
+ receivePipe, receiveClientPipe, state.bufferSize,
+ serialMojom.ReceiveError.DISCONNECTED);
+ var sender = new dataSender.DataSender(sendPipe, state.bufferSize,
+ serialMojom.SendError.DISCONNECTED);
this.init_(state,
connection,
router,
@@ -188,11 +190,13 @@ define('serial_service', [
var pipe = core.createMessagePipe();
var sendPipe = core.createMessagePipe();
var receivePipe = core.createMessagePipe();
+ var receivePipeClient = core.createMessagePipe();
service.connect(path,
serviceOptions,
pipe.handle0,
sendPipe.handle0,
- receivePipe.handle0);
+ receivePipe.handle0,
+ receivePipeClient.handle0);
var router = new routerModule.Router(pipe.handle1);
var connection = new serialMojom.Connection.proxyClass(router);
return connection.getInfo().then(convertServiceInfo).then(function(info) {
@@ -201,6 +205,7 @@ define('serial_service', [
router.close();
core.close(sendPipe.handle1);
core.close(receivePipe.handle1);
+ core.close(receivePipeClient.handle1);
throw e;
}).then(function(results) {
var info = results[0];
@@ -208,6 +213,7 @@ define('serial_service', [
var serialConnectionClient = new Connection(connection,
router,
receivePipe.handle1,
+ receivePipeClient.handle1,
sendPipe.handle1,
id,
options);
« no previous file with comments | « extensions/renderer/resources/data_sender.js ('k') | extensions/test/data/data_receiver_unittest.js » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698