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

Unified Diff: chrome/browser/resources/cryptotoken/usbgnubbydevice.js

Issue 2939273002: DO NOT SUBMIT: what chrome/browser/resources/ could eventually look like with clang-format (Closed)
Patch Set: Created 3 years, 6 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: chrome/browser/resources/cryptotoken/usbgnubbydevice.js
diff --git a/chrome/browser/resources/cryptotoken/usbgnubbydevice.js b/chrome/browser/resources/cryptotoken/usbgnubbydevice.js
index b97cf9bbc37a3d76ef06040ea7a0bb42408245db..aeaaf85d6b667a7d7b864e860cdc55af2868a454 100644
--- a/chrome/browser/resources/cryptotoken/usbgnubbydevice.js
+++ b/chrome/browser/resources/cryptotoken/usbgnubbydevice.js
@@ -27,10 +27,10 @@ function UsbGnubbyDevice(gnubbies, dev, id, inEndpoint, outEndpoint) {
this.outEndpoint = outEndpoint;
this.txqueue = [];
this.clients = [];
- this.lockCID = 0; // channel ID of client holding a lock, if != 0.
- this.lockMillis = 0; // current lock period.
- this.lockTID = null; // timer id of lock timeout.
- this.closing = false; // device to be closed by receive loop.
+ this.lockCID = 0; // channel ID of client holding a lock, if != 0.
+ this.lockMillis = 0; // current lock period.
+ this.lockTID = null; // timer id of lock timeout.
+ this.closing = false; // device to be closed by receive loop.
this.updating = false; // device firmware is in final stage of updating.
this.inTransferPending = false;
this.outTransferPending = false;
@@ -47,16 +47,16 @@ UsbGnubbyDevice.prototype.destroy = function() {
function closeLowLevelDevice(dev) {
chrome.usb.releaseInterface(dev, 0, function() {
if (chrome.runtime.lastError) {
- console.warn(UTIL_fmt('Device ' + dev.handle +
- ' couldn\'t be released:'));
+ console.warn(
+ UTIL_fmt('Device ' + dev.handle + ' couldn\'t be released:'));
console.warn(UTIL_fmt(chrome.runtime.lastError.message));
return;
}
console.log(UTIL_fmt('Device ' + dev.handle + ' released'));
chrome.usb.closeDevice(dev, function() {
if (chrome.runtime.lastError) {
- console.warn(UTIL_fmt('Device ' + dev.handle +
- ' couldn\'t be closed:'));
+ console.warn(
+ UTIL_fmt('Device ' + dev.handle + ' couldn\'t be closed:'));
console.warn(UTIL_fmt(chrome.runtime.lastError.message));
return;
}
@@ -65,7 +65,8 @@ UsbGnubbyDevice.prototype.destroy = function() {
});
}
- if (!this.dev) return; // Already dead.
+ if (!this.dev)
+ return; // Already dead.
this.gnubbies_.removeOpenDevice(
{namespace: UsbGnubbyDevice.NAMESPACE, device: this.id});
@@ -78,15 +79,16 @@ UsbGnubbyDevice.prototype.destroy = function() {
//
// Use magic CID 0 to address all.
this.publishFrame_(new Uint8Array([
- 0, 0, 0, 0, // broadcast CID
- GnubbyDevice.CMD_ERROR,
- 0, 1, // length
- GnubbyDevice.GONE]).buffer);
+ 0, 0, 0, 0, // broadcast CID
+ GnubbyDevice.CMD_ERROR, 0, 1, // length
+ GnubbyDevice.GONE
+ ]).buffer);
// Set all clients to closed status and remove them.
while (this.clients.length != 0) {
var client = this.clients.shift();
- if (client) client.closed = true;
+ if (client)
+ client.closed = true;
}
if (this.lockTID) {
@@ -136,11 +138,11 @@ UsbGnubbyDevice.prototype.publishFrame_ = function(f) {
remaining.push(client);
} else {
changes = true;
- console.log(UTIL_fmt(
- '[' + Gnubby.hexCid(client.cid) + '] left?'));
+ console.log(UTIL_fmt('[' + Gnubby.hexCid(client.cid) + '] left?'));
}
}
- if (changes) this.clients = remaining;
+ if (changes)
+ this.clients = remaining;
};
/**
@@ -148,8 +150,10 @@ UsbGnubbyDevice.prototype.publishFrame_ = function(f) {
* @private
*/
UsbGnubbyDevice.prototype.readyToUse_ = function() {
- if (this.closing) return false;
- if (!this.dev) return false;
+ if (this.closing)
+ return false;
+ if (!this.dev)
+ return false;
return true;
};
@@ -159,20 +163,25 @@ UsbGnubbyDevice.prototype.readyToUse_ = function() {
* @private
*/
UsbGnubbyDevice.prototype.readOneReply_ = function() {
- if (!this.readyToUse_()) return; // No point in continuing.
- if (this.updating) return; // Do not bother waiting for final update reply.
+ if (!this.readyToUse_())
+ return; // No point in continuing.
+ if (this.updating)
+ return; // Do not bother waiting for final update reply.
var self = this;
function inTransferComplete(x) {
self.inTransferPending = false;
- if (!self.readyToUse_()) return; // No point in continuing.
+ if (!self.readyToUse_())
+ return; // No point in continuing.
if (chrome.runtime.lastError) {
console.warn(UTIL_fmt('in bulkTransfer got lastError: '));
console.warn(UTIL_fmt(chrome.runtime.lastError.message));
- window.setTimeout(function() { self.destroy(); }, 0);
+ window.setTimeout(function() {
+ self.destroy();
+ }, 0);
return;
}
@@ -183,25 +192,25 @@ UsbGnubbyDevice.prototype.readOneReply_ = function() {
self.publishFrame_(x.data);
// Write another pending request, if any.
- window.setTimeout(
- function() {
- self.txqueue.shift(); // Drop sent frame from queue.
- self.writeOneRequest_();
- },
- 0);
+ window.setTimeout(function() {
+ self.txqueue.shift(); // Drop sent frame from queue.
+ self.writeOneRequest_();
+ }, 0);
} else {
console.log(UTIL_fmt('no x.data!'));
console.log(x);
- window.setTimeout(function() { self.destroy(); }, 0);
+ window.setTimeout(function() {
+ self.destroy();
+ }, 0);
}
}
if (this.inTransferPending == false) {
this.inTransferPending = true;
chrome.usb.bulkTransfer(
- /** @type {!chrome.usb.ConnectionHandle} */(this.dev),
- { direction: 'in', endpoint: this.inEndpoint, length: 2048 },
- inTransferComplete);
+ /** @type {!chrome.usb.ConnectionHandle} */ (this.dev),
+ {direction: 'in', endpoint: this.inEndpoint, length: 2048},
+ inTransferComplete);
} else {
throw 'inTransferPending!';
}
@@ -213,7 +222,8 @@ UsbGnubbyDevice.prototype.readOneReply_ = function() {
*/
UsbGnubbyDevice.prototype.registerClient = function(who) {
for (var i = 0; i < this.clients.length; ++i) {
- if (this.clients[i] === who) return; // Already registered.
+ if (this.clients[i] === who)
+ return; // Already registered.
}
this.clients.push(who);
};
@@ -227,11 +237,13 @@ UsbGnubbyDevice.prototype.registerClient = function(who) {
*/
UsbGnubbyDevice.prototype.deregisterClient = function(who) {
var current = this.clients;
- if (current.length == 0) return -1;
+ if (current.length == 0)
+ return -1;
this.clients = [];
for (var i = 0; i < current.length; ++i) {
var client = current[i];
- if (client !== who) this.clients.push(client);
+ if (client !== who)
+ this.clients.push(client);
}
return this.clients.length;
};
@@ -241,7 +253,8 @@ UsbGnubbyDevice.prototype.deregisterClient = function(who) {
* @return {boolean} Whether this device has who as a client.
*/
UsbGnubbyDevice.prototype.hasClient = function(who) {
- if (this.clients.length == 0) return false;
+ if (this.clients.length == 0)
+ return false;
for (var i = 0; i < this.clients.length; ++i) {
if (who === this.clients[i])
return true;
@@ -254,9 +267,11 @@ UsbGnubbyDevice.prototype.hasClient = function(who) {
* @private
*/
UsbGnubbyDevice.prototype.writeOneRequest_ = function() {
- if (!this.readyToUse_()) return; // No point in continuing.
+ if (!this.readyToUse_())
+ return; // No point in continuing.
- if (this.txqueue.length == 0) return; // Nothing to send.
+ if (this.txqueue.length == 0)
+ return; // Nothing to send.
var frame = this.txqueue[0];
@@ -264,23 +279,28 @@ UsbGnubbyDevice.prototype.writeOneRequest_ = function() {
function OutTransferComplete(x) {
self.outTransferPending = false;
- if (!self.readyToUse_()) return; // No point in continuing.
+ if (!self.readyToUse_())
+ return; // No point in continuing.
if (chrome.runtime.lastError) {
console.warn(UTIL_fmt('out bulkTransfer lastError: '));
console.warn(UTIL_fmt(chrome.runtime.lastError.message));
- window.setTimeout(function() { self.destroy(); }, 0);
+ window.setTimeout(function() {
+ self.destroy();
+ }, 0);
return;
}
- window.setTimeout(function() { self.readOneReply_(); }, 0);
+ window.setTimeout(function() {
+ self.readOneReply_();
+ }, 0);
}
var u8 = new Uint8Array(frame);
// See whether this requires scrubbing before logging.
var alternateLog = Gnubby.hasOwnProperty('redactRequestLog') &&
- Gnubby['redactRequestLog'](u8);
+ Gnubby['redactRequestLog'](u8);
if (alternateLog) {
console.log(UTIL_fmt('>' + alternateLog));
} else {
@@ -290,8 +310,8 @@ UsbGnubbyDevice.prototype.writeOneRequest_ = function() {
if (this.outTransferPending == false) {
this.outTransferPending = true;
chrome.usb.bulkTransfer(
- /** @type {!chrome.usb.ConnectionHandle} */(this.dev),
- { direction: 'out', endpoint: this.outEndpoint, data: frame },
+ /** @type {!chrome.usb.ConnectionHandle} */ (this.dev),
+ {direction: 'out', endpoint: this.outEndpoint, data: frame},
OutTransferComplete);
} else {
throw 'outTransferPending!';
@@ -311,17 +331,13 @@ UsbGnubbyDevice.prototype.checkLock_ = function(cid, cmd) {
if (this.lockCID != cid) {
// Some other channel has active lock.
- if (cmd != GnubbyDevice.CMD_SYNC &&
- cmd != GnubbyDevice.CMD_INIT) {
+ if (cmd != GnubbyDevice.CMD_SYNC && cmd != GnubbyDevice.CMD_INIT) {
// Anything but SYNC|INIT gets an immediate busy.
- var busy = new Uint8Array(
- [(cid >> 24) & 255,
- (cid >> 16) & 255,
- (cid >> 8) & 255,
- cid & 255,
- GnubbyDevice.CMD_ERROR,
- 0, 1, // length
- GnubbyDevice.BUSY]);
+ var busy = new Uint8Array([
+ (cid >> 24) & 255, (cid >> 16) & 255, (cid >> 8) & 255, cid & 255,
+ GnubbyDevice.CMD_ERROR, 0, 1, // length
+ GnubbyDevice.BUSY
+ ]);
// Log the synthetic busy too.
console.log(UTIL_fmt('<' + UTIL_BytesToHex(busy)));
this.publishFrame_(busy.buffer);
@@ -366,14 +382,12 @@ UsbGnubbyDevice.prototype.updateLock_ = function(cid, cmd, arg) {
// (re)set the lock timeout if we still hold it.
if (this.lockCID) {
var self = this;
- this.lockTID = window.setTimeout(
- function() {
- console.warn(UTIL_fmt(
- 'lock for CID ' + Gnubby.hexCid(cid) + ' expired!'));
- self.lockTID = null;
- self.lockCID = 0;
- },
- this.lockMillis);
+ this.lockTID = window.setTimeout(function() {
+ console.warn(
+ UTIL_fmt('lock for CID ' + Gnubby.hexCid(cid) + ' expired!'));
+ self.lockTID = null;
+ self.lockCID = 0;
+ }, this.lockMillis);
}
}
};
@@ -386,8 +400,10 @@ UsbGnubbyDevice.prototype.updateLock_ = function(cid, cmd, arg) {
* @param {ArrayBuffer|Uint8Array} data Command argument data
*/
UsbGnubbyDevice.prototype.queueCommand = function(cid, cmd, data) {
- if (!this.dev) return;
- if (!this.checkLock_(cid, cmd)) return;
+ if (!this.dev)
+ return;
+ if (!this.checkLock_(cid, cmd))
+ return;
var u8 = new Uint8Array(data);
var frame = new Uint8Array(u8.length + 7);
@@ -407,14 +423,15 @@ UsbGnubbyDevice.prototype.queueCommand = function(cid, cmd, data) {
var wasEmpty = (this.txqueue.length == 0);
this.txqueue.push(frame.buffer);
- if (wasEmpty) this.writeOneRequest_();
+ if (wasEmpty)
+ this.writeOneRequest_();
};
/**
* @const
*/
UsbGnubbyDevice.WINUSB_VID_PIDS = [
- {'vendorId': 4176, 'productId': 529} // Yubico WinUSB
+ {'vendorId': 4176, 'productId': 529} // Yubico WinUSB
];
/**
@@ -538,8 +555,8 @@ UsbGnubbyDevice.open = function(gnubbies, which, dev, cb) {
if (enumeratedBy) {
dev.enumeratedBy = enumeratedBy;
}
- var gnubby = new UsbGnubbyDevice(gnubbies, nonNullHandle, which,
- inEndpoint, outEndpoint);
+ var gnubby = new UsbGnubbyDevice(
+ gnubbies, nonNullHandle, which, inEndpoint, outEndpoint);
cb(-GnubbyDevice.OK, gnubby);
});
});

Powered by Google App Engine
This is Rietveld 408576698