From 5d53c27a4c31fd368bed4d97761ff53d96d00f36 Mon Sep 17 00:00:00 2001 From: Vicamo Yang Date: Mon, 13 Jan 2014 10:44:44 +0800 Subject: [PATCH] Bug 934125 - 2.b/3: fix alignment. r=gene for f in `git show --name-only | grep ^dom/`; do [ -n "`grep -e '\w\+: function([^)]*\$' $f`" ] && echo $f; done | xargs sh -c 'rvim "$@" = RIL.PDU_PID_REPLACE_SHORT_MESSAGE_TYPE_1 && aMessageRecord.pid <= RIL.PDU_PID_REPLACE_SHORT_MESSAGE_TYPE_7) || @@ -1732,9 +1731,8 @@ MobileMessageDB.prototype = { }); }, - realSaveRecord: function(aTransaction, aMessageStore, - aParticipantStore, aThreadStore, - aMessageRecord, aAddresses) { + realSaveRecord: function(aTransaction, aMessageStore, aParticipantStore, + aThreadStore, aMessageRecord, aAddresses) { let self = this; this.findThreadRecordByParticipants(aThreadStore, aParticipantStore, aAddresses, true, @@ -1880,8 +1878,8 @@ MobileMessageDB.prototype = { } }, - updateMessageDeliveryById: function( - id, type, receiver, delivery, deliveryStatus, envelopeId, callback) { + updateMessageDeliveryById: function(id, type, receiver, delivery, + deliveryStatus, envelopeId, callback) { if (DEBUG) { debug("Setting message's delivery by " + type + " = "+ id + " receiver: " + receiver @@ -2020,11 +2018,8 @@ MobileMessageDB.prototype = { threadParticipants = threadParticipants.concat(slicedReceivers); }, - updateThreadByMessageChange: function(messageStore, - threadStore, - threadId, - messageId, - messageRead) { + updateThreadByMessageChange: function(messageStore, threadStore, threadId, + messageId, messageRead) { threadStore.get(threadId).onsuccess = function(event) { // This must exist. let threadRecord = event.target.result; @@ -2224,8 +2219,8 @@ MobileMessageDB.prototype = { this.saveRecord(aMessage, addresses, aCallback); }, - setMessageDeliveryByMessageId: function( - messageId, receiver, delivery, deliveryStatus, envelopeId, callback) { + setMessageDeliveryByMessageId: function(messageId, receiver, delivery, + deliveryStatus, envelopeId, callback) { this.updateMessageDeliveryById(messageId, "messageId", receiver, delivery, deliveryStatus, envelopeId, callback); @@ -2233,13 +2228,13 @@ MobileMessageDB.prototype = { }, setMessageDeliveryStatusByEnvelopeId: function(aEnvelopeId, aReceiver, - aDeliveryStatus, aCallback) { + aDeliveryStatus, aCallback) { this.updateMessageDeliveryById(aEnvelopeId, "envelopeId", aReceiver, null, aDeliveryStatus, null, aCallback); }, setMessageReadStatusByEnvelopeId: function(aEnvelopeId, aReceiver, - aReadStatus, aCallback) { + aReadStatus, aCallback) { if (DEBUG) { debug("Setting message's read status by envelopeId = " + aEnvelopeId + ", receiver: " + aReceiver + ", readStatus: " + aReadStatus); @@ -2645,8 +2640,7 @@ let FilterSearcherHelper = { * Result colletor function. It takes three parameters -- txn, message * id, and message timestamp. */ - filterTimestamp: function(startDate, endDate, direction, txn, - collect) { + filterTimestamp: function(startDate, endDate, direction, txn, collect) { let range = null; if (startDate != null && endDate != null) { range = IDBKeyRange.bound(startDate.getTime(), endDate.getTime()); diff --git a/dom/system/gonk/NetworkManager.js b/dom/system/gonk/NetworkManager.js index cfbd5bb7c67..f4f62cab362 100644 --- a/dom/system/gonk/NetworkManager.js +++ b/dom/system/gonk/NetworkManager.js @@ -787,9 +787,7 @@ NetworkManager.prototype = { }, // Enable/disable USB tethering by sending commands to netd. - setUSBTethering: function(enable, - tetheringInterface, - callback) { + setUSBTethering: function(enable, tetheringInterface, callback) { let params = this.getUSBTetheringParameters(enable, tetheringInterface); if (params === null) { diff --git a/dom/system/gonk/RILContentHelper.js b/dom/system/gonk/RILContentHelper.js index eaa3904babc..9d87827a4f8 100644 --- a/dom/system/gonk/RILContentHelper.js +++ b/dom/system/gonk/RILContentHelper.js @@ -426,10 +426,7 @@ DOMMMIError.prototype = { classID: DOMMMIERROR_CID, contractID: "@mozilla.org/dom/mmi-error;1", QueryInterface: XPCOMUtils.generateQI([Ci.nsISupports]), - __init: function(serviceCode, - name, - message, - additionalInformation) { + __init: function(serviceCode, name, message, additionalInformation) { this.__DOM_IMPL__.init(name, message); this.serviceCode = serviceCode; this.additionalInformation = additionalInformation; @@ -951,9 +948,7 @@ RILContentHelper.prototype = { return request; }, - getCardLockRetryCount: function(clientId, - window, - lockType) { + getCardLockRetryCount: function(clientId, window, lockType) { if (window == null) { throw Components.Exception("Can't get window object", Cr.NS_ERROR_UNEXPECTED); @@ -1021,10 +1016,8 @@ RILContentHelper.prototype = { }); }, - sendStkMenuSelection: function(clientId, - window, - itemIdentifier, - helpRequested) { + sendStkMenuSelection: function(clientId, window, itemIdentifier, + helpRequested) { if (window == null) { throw Components.Exception("Can't get window object", Cr.NS_ERROR_UNEXPECTED); @@ -1038,9 +1031,7 @@ RILContentHelper.prototype = { }); }, - sendStkTimerExpiration: function(clientId, - window, - timer) { + sendStkTimerExpiration: function(clientId, window, timer) { if (window == null) { throw Components.Exception("Can't get window object", Cr.NS_ERROR_UNEXPECTED); @@ -1977,8 +1968,7 @@ RILContentHelper.prototype = { this.fireRequestSuccess(message.requestId, contact); }, - handleVoicemailNotification: function(clientId, - message) { + handleVoicemailNotification: function(clientId, message) { let changed = false; if (!this.voicemailStatuses[clientId]) { this.voicemailStatuses[clientId] = new VoicemailStatus(clientId); diff --git a/dom/system/gonk/RadioInterfaceLayer.js b/dom/system/gonk/RadioInterfaceLayer.js index c18caf86c45..368ca1db337 100644 --- a/dom/system/gonk/RadioInterfaceLayer.js +++ b/dom/system/gonk/RadioInterfaceLayer.js @@ -2843,8 +2843,7 @@ RadioInterface.prototype = { }).bind(this)); }, - setCallingLineIdRestriction: function(target, - message) { + setCallingLineIdRestriction: function(target, message) { if (DEBUG) { this.debug("setCallingLineIdRestriction: " + JSON.stringify(message)); } @@ -3719,8 +3718,7 @@ RadioInterface.prototype = { reason: reason }); }, - sendWorkerMessage: function(rilMessageType, message, - callback) { + sendWorkerMessage: function(rilMessageType, message, callback) { this.workerMessenger.send(rilMessageType, message, function(response) { return callback.handleResponse(response); }); diff --git a/dom/system/gonk/ril_worker.js b/dom/system/gonk/ril_worker.js index 53479f80c92..b6ab36e48d9 100644 --- a/dom/system/gonk/ril_worker.js +++ b/dom/system/gonk/ril_worker.js @@ -9522,9 +9522,7 @@ let ICCPDUHelper = { * @param alphaId Alpha Identifier to be written. * @param number Dialling Number to be written. */ - writeAlphaIdDiallingNumber: function(recordSize, - alphaId, - number) { + writeAlphaIdDiallingNumber: function(recordSize, alphaId, number) { // Write String length let strLen = recordSize * 2; Buf.writeInt32(strLen); diff --git a/dom/telephony/gonk/TelephonyProvider.js b/dom/telephony/gonk/TelephonyProvider.js index 17556c97b81..0000eaf43d8 100644 --- a/dom/telephony/gonk/TelephonyProvider.js +++ b/dom/telephony/gonk/TelephonyProvider.js @@ -199,8 +199,7 @@ TelephonyProvider.prototype = { * Track the active call and update the audio system as its state changes. */ _activeCall: null, - _updateCallAudioState: function(aCall, - aConferenceState) { + _updateCallAudioState: function(aCall, aConferenceState) { if (aConferenceState === nsITelephonyProvider.CALL_STATE_CONNECTED) { this._activeCall = new ConferenceCall(aConferenceState); gAudioManager.phoneState = nsIAudioManager.PHONE_STATE_IN_CALL; @@ -378,8 +377,7 @@ TelephonyProvider.prototype = { this._listeners.splice(index, 1); }, - _enumerateCallsForClient: function(aClientId, - aListener) { + _enumerateCallsForClient: function(aClientId, aListener) { if (DEBUG) debug("Enumeration of calls for client " + aClientId); let deferred = Promise.defer(); diff --git a/dom/voicemail/test/marionette/pdu_builder.js b/dom/voicemail/test/marionette/pdu_builder.js index 71bedf1e8ed..d257477fabb 100644 --- a/dom/voicemail/test/marionette/pdu_builder.js +++ b/dom/voicemail/test/marionette/pdu_builder.js @@ -44,11 +44,8 @@ let PDUBuilder = { } }, - writeStringAsSeptets: function(message, - paddingBits, - langIndex, - langShiftIndex) - { + writeStringAsSeptets: function(message, paddingBits, langIndex, + langShiftIndex) { const langTable = RIL.PDU_NL_LOCKING_SHIFT_TABLES[langIndex]; const langShiftTable = RIL.PDU_NL_SINGLE_SHIFT_TABLES[langShiftIndex];