wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 934125 - 2.b/3: fix alignment. r=gene

Browse Source 
for f in `git show --name-only | grep ^dom/`; do
  [ -n "`grep -e '\w\+: function([^)]*\$' $f`" ] && echo $f;
done | xargs sh -c 'rvim "$@" </dev/tty' asdf
This commit is contained in:
Vicamo Yang 2014-01-13 10:44:44 +08:00
parent 91e5172240
commit 5d53c27a4c
8 changed files with 51 additions and 91 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
dom/mobilemessage/src/gonk/MmsService.js
View File

@ -542,8 +542,7 @@ XPCOMUtils.defineLazyGetter(this, "gMmsTransactionHelper", function() {
* A callback function that takes two arguments: one for http
* status, the other for wrapped PDU data for further parsing.
*/
sendRequest: function(mmsConnection, method, url, istream,
callback) {
sendRequest: function(mmsConnection, method, url, istream, callback) {
// TODO: bug 810226 - Support GPRS bearer for MMS transmission and reception.
let cancellable = {
callback: callback,
@ -615,8 +614,8 @@ XPCOMUtils.defineLazyGetter(this, "gMmsTransactionHelper", function() {
return cancellable;
},
sendHttpRequest: function(mmsConnection, method, url,
istream, proxyFilter, callback) {
sendHttpRequest: function(mmsConnection, method, url, istream, proxyFilter,
callback) {
let releaseMmsConnectionAndCallback = function(httpStatus, data) {
gpps.unregisterFilter(proxyFilter);
// Always release the MMS network connection before callback.
@ -765,9 +764,8 @@ XPCOMUtils.defineLazyGetter(this, "gMmsTransactionHelper", function() {
return true;
},
translateHttpStatusToMmsStatus: function(httpStatus,
cancelledReason,
defaultStatus) {
translateHttpStatusToMmsStatus: function(httpStatus, cancelledReason,
defaultStatus) {
switch(httpStatus) {
case _HTTP_STATUS_USER_CANCELLED:
return cancelledReason;
@ -1449,9 +1447,8 @@ MmsService.prototype = {
* @param intermediate
* Intermediate MMS message parsed from PDU.
*/
convertIntermediateToSavable: function(mmsConnection,
intermediate,
retrievalMode) {
convertIntermediateToSavable: function(mmsConnection, intermediate,
retrievalMode) {
intermediate.type = "mms";
intermediate.delivery = DELIVERY_NOT_DOWNLOADED;
@ -1499,9 +1496,7 @@ MmsService.prototype = {
* The indexedDB savable MMS message, which is going to be
* merged with the extra retrieval confirmation.
*/
mergeRetrievalConfirmation: function(mmsConnection,
intermediate,
savable) {
mergeRetrievalConfirmation: function(mmsConnection, intermediate, savable) {
// Prepare timestamp/sentTimestamp.
savable.timestamp = Date.now();
savable.sentTimestamp = intermediate.headers["date"].getTime();
@ -1546,8 +1541,8 @@ MmsService.prototype = {
* @param aDomMessage
* The nsIDOMMozMmsMessage object.
*/
retrieveMessage: function(aMmsConnection, aContentLocation,
aCallback, aDomMessage) {
retrieveMessage: function(aMmsConnection, aContentLocation, aCallback,
aDomMessage) {
// Notifying observers an MMS message is retrieving.
Services.obs.notifyObservers(aDomMessage, kSmsRetrievingObserverTopic, null);
@ -1623,11 +1618,8 @@ MmsService.prototype = {
/**
* Callback for retrieveMessage.
*/
retrieveMessageCallback: function(mmsConnection,
wish,
savableMessage,
mmsStatus,
retrievedMessage) {
retrieveMessageCallback: function(mmsConnection, wish, savableMessage,
mmsStatus, retrievedMessage) {
if (DEBUG) debug("retrievedMessage = " + JSON.stringify(retrievedMessage));
let transactionId = savableMessage.headers["x-mms-transaction-id"];
@ -1704,11 +1696,8 @@ MmsService.prototype = {
/**
* Callback for saveReceivedMessage.
*/
saveReceivedMessageCallback: function(mmsConnection,
retrievalMode,
savableMessage,
rv,
domMessage) {
saveReceivedMessageCallback: function(mmsConnection, retrievalMode,
savableMessage, rv, domMessage) {
let success = Components.isSuccessCode(rv);
if (!success) {
// At this point we could send a message to content to notify the
@ -1774,8 +1763,7 @@ MmsService.prototype = {
* @param notification
* The parsed MMS message object.
*/
handleNotificationIndication: function(serviceId,
notification) {
handleNotificationIndication: function(serviceId, notification) {
let transactionId = notification.headers["x-mms-transaction-id"];
gMobileMessageDatabaseService.getMessageRecordByTransactionId(transactionId,
(function(aRv, aMessageRecord) {
@ -1961,8 +1949,7 @@ MmsService.prototype = {
* name-parameter of Content-Type header nor filename parameter of Content-Disposition
* header is available, Content-Location header SHALL be used if available.
*/
createSavableFromParams: function(aMmsConnection,
aParams, aMessage) {
createSavableFromParams: function(aMmsConnection, aParams, aMessage) {
if (DEBUG) debug("createSavableFromParams: aParams: " + JSON.stringify(aParams));
let isAddrValid = true;

48
dom/mobilemessage/src/gonk/MobileMessageDB.jsm
View File

@ -1294,8 +1294,7 @@ MobileMessageDB.prototype = {
};
},
matchParsedPhoneNumbers: function(addr1, parsedAddr1,
addr2, parsedAddr2) {
matchParsedPhoneNumbers: function(addr1, parsedAddr1, addr2, parsedAddr2) {
if ((parsedAddr1.internationalNumber &&
parsedAddr1.internationalNumber === parsedAddr2.internationalNumber) ||
(parsedAddr1.nationalNumber &&
@ -1423,8 +1422,8 @@ MobileMessageDB.prototype = {
}
},
findParticipantRecordByAddress: function(
aParticipantStore, aAddress, aCreate, aCallback) {
findParticipantRecordByAddress: function(aParticipantStore, aAddress,
aCreate, aCallback) {
if (DEBUG) {
debug("findParticipantRecordByAddress("
+ JSON.stringify(aAddress) + ", " + aCreate + ")");
@ -1528,8 +1527,8 @@ MobileMessageDB.prototype = {
}).bind(this);
},
findParticipantIdsByAddresses: function(
aParticipantStore, aAddresses, aCreate, aSkipNonexistent, aCallback) {
findParticipantIdsByAddresses: function(aParticipantStore, aAddresses,
aCreate, aSkipNonexistent, aCallback) {
if (DEBUG) {
debug("findParticipantIdsByAddresses("
+ JSON.stringify(aAddresses) + ", "
@ -1571,9 +1570,9 @@ MobileMessageDB.prototype = {
}) (0, []);
},
findThreadRecordByParticipants: function(
aThreadStore, aParticipantStore, aAddresses,
aCreateParticipants, aCallback) {
findThreadRecordByParticipants: function(aThreadStore, aParticipantStore,
aAddresses, aCreateParticipants,
aCallback) {
if (DEBUG) {
debug("findThreadRecordByParticipants(" + JSON.stringify(aAddresses)
+ ", " + aCreateParticipants + ")");
@ -1670,8 +1669,8 @@ MobileMessageDB.prototype = {
},
replaceShortMessageOnSave: function(aTransaction, aMessageStore,
aParticipantStore, aThreadStore,
aMessageRecord, aAddresses) {
aParticipantStore, aThreadStore,
aMessageRecord, aAddresses) {
let isReplaceTypePid = (aMessageRecord.pid) &&
((aMessageRecord.pid >= 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());

4
dom/system/gonk/NetworkManager.js
View File

@ -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) {

22
dom/system/gonk/RILContentHelper.js
View File

@ -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);

6
dom/system/gonk/RadioInterfaceLayer.js
View File

@ -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);
});

4
dom/system/gonk/ril_worker.js
View File

@ -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);

6
dom/telephony/gonk/TelephonyProvider.js
View File

@ -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();

7
dom/voicemail/test/marionette/pdu_builder.js
View File

@ -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];