зеркало из https://github.com/mozilla/gecko-dev.git
Bug 1090803 - rename makeReadOnlyNDEF to makeReadOnly in MozNFCTag. r=smaug, dimi
This commit is contained in:
Родитель
a3372e10aa
Коммит
e0d3a4b820
|
@ -53,7 +53,7 @@ const NFCCONTENTHELPER_CID =
|
||||||
const NFC_IPC_MSG_NAMES = [
|
const NFC_IPC_MSG_NAMES = [
|
||||||
"NFC:ReadNDEFResponse",
|
"NFC:ReadNDEFResponse",
|
||||||
"NFC:WriteNDEFResponse",
|
"NFC:WriteNDEFResponse",
|
||||||
"NFC:MakeReadOnlyNDEFResponse",
|
"NFC:MakeReadOnlyResponse",
|
||||||
"NFC:ConnectResponse",
|
"NFC:ConnectResponse",
|
||||||
"NFC:CloseResponse",
|
"NFC:CloseResponse",
|
||||||
"NFC:CheckP2PRegistrationResponse",
|
"NFC:CheckP2PRegistrationResponse",
|
||||||
|
@ -168,7 +168,7 @@ NfcContentHelper.prototype = {
|
||||||
let requestId = btoa(this.getRequestId(request));
|
let requestId = btoa(this.getRequestId(request));
|
||||||
this._requestMap[requestId] = this._window;
|
this._requestMap[requestId] = this._window;
|
||||||
|
|
||||||
cpmm.sendAsyncMessage("NFC:MakeReadOnlyNDEF", {
|
cpmm.sendAsyncMessage("NFC:MakeReadOnly", {
|
||||||
requestId: requestId,
|
requestId: requestId,
|
||||||
sessionToken: sessionToken
|
sessionToken: sessionToken
|
||||||
});
|
});
|
||||||
|
@ -338,7 +338,7 @@ NfcContentHelper.prototype = {
|
||||||
case "NFC:ConnectResponse": // Fall through.
|
case "NFC:ConnectResponse": // Fall through.
|
||||||
case "NFC:CloseResponse":
|
case "NFC:CloseResponse":
|
||||||
case "NFC:WriteNDEFResponse":
|
case "NFC:WriteNDEFResponse":
|
||||||
case "NFC:MakeReadOnlyNDEFResponse":
|
case "NFC:MakeReadOnlyResponse":
|
||||||
case "NFC:NotifySendFileStatusResponse":
|
case "NFC:NotifySendFileStatusResponse":
|
||||||
case "NFC:ConfigResponse":
|
case "NFC:ConfigResponse":
|
||||||
if (result.errorMsg) {
|
if (result.errorMsg) {
|
||||||
|
|
|
@ -70,7 +70,7 @@ const NFC_IPC_READ_PERM_MSG_NAMES = [
|
||||||
|
|
||||||
const NFC_IPC_WRITE_PERM_MSG_NAMES = [
|
const NFC_IPC_WRITE_PERM_MSG_NAMES = [
|
||||||
"NFC:WriteNDEF",
|
"NFC:WriteNDEF",
|
||||||
"NFC:MakeReadOnlyNDEF",
|
"NFC:MakeReadOnly",
|
||||||
"NFC:SendFile",
|
"NFC:SendFile",
|
||||||
"NFC:RegisterPeerReadyTarget",
|
"NFC:RegisterPeerReadyTarget",
|
||||||
"NFC:UnregisterPeerReadyTarget"
|
"NFC:UnregisterPeerReadyTarget"
|
||||||
|
@ -565,7 +565,7 @@ Nfc.prototype = {
|
||||||
case "ConnectResponse": // Fall through.
|
case "ConnectResponse": // Fall through.
|
||||||
case "CloseResponse":
|
case "CloseResponse":
|
||||||
case "ReadNDEFResponse":
|
case "ReadNDEFResponse":
|
||||||
case "MakeReadOnlyNDEFResponse":
|
case "MakeReadOnlyResponse":
|
||||||
case "WriteNDEFResponse":
|
case "WriteNDEFResponse":
|
||||||
this.sendNfcResponse(message);
|
this.sendNfcResponse(message);
|
||||||
break;
|
break;
|
||||||
|
@ -640,8 +640,8 @@ Nfc.prototype = {
|
||||||
message.data.isP2P = SessionHelper.isP2PSession(message.data.sessionId);
|
message.data.isP2P = SessionHelper.isP2PSession(message.data.sessionId);
|
||||||
this.sendToNfcService("writeNDEF", message.data);
|
this.sendToNfcService("writeNDEF", message.data);
|
||||||
break;
|
break;
|
||||||
case "NFC:MakeReadOnlyNDEF":
|
case "NFC:MakeReadOnly":
|
||||||
this.sendToNfcService("makeReadOnlyNDEF", message.data);
|
this.sendToNfcService("makeReadOnly", message.data);
|
||||||
break;
|
break;
|
||||||
case "NFC:Connect":
|
case "NFC:Connect":
|
||||||
this.sendToNfcService("connect", message.data);
|
this.sendToNfcService("connect", message.data);
|
||||||
|
|
|
@ -16,7 +16,7 @@ enum NfcRequest {
|
||||||
CloseReq,
|
CloseReq,
|
||||||
ReadNDEFReq,
|
ReadNDEFReq,
|
||||||
WriteNDEFReq,
|
WriteNDEFReq,
|
||||||
MakeReadOnlyNDEFReq,
|
MakeReadOnlyReq,
|
||||||
};
|
};
|
||||||
|
|
||||||
enum NfcResponse {
|
enum NfcResponse {
|
||||||
|
|
|
@ -19,14 +19,14 @@ using namespace mozilla::dom;
|
||||||
static const char* kConfigRequest = "config";
|
static const char* kConfigRequest = "config";
|
||||||
static const char* kReadNDEFRequest = "readNDEF";
|
static const char* kReadNDEFRequest = "readNDEF";
|
||||||
static const char* kWriteNDEFRequest = "writeNDEF";
|
static const char* kWriteNDEFRequest = "writeNDEF";
|
||||||
static const char* kMakeReadOnlyNDEFRequest = "makeReadOnlyNDEF";
|
static const char* kMakeReadOnlyRequest = "makeReadOnly";
|
||||||
static const char* kConnectRequest = "connect";
|
static const char* kConnectRequest = "connect";
|
||||||
static const char* kCloseRequest = "close";
|
static const char* kCloseRequest = "close";
|
||||||
|
|
||||||
static const char* kConfigResponse = "ConfigResponse";
|
static const char* kConfigResponse = "ConfigResponse";
|
||||||
static const char* kReadNDEFResponse = "ReadNDEFResponse";
|
static const char* kReadNDEFResponse = "ReadNDEFResponse";
|
||||||
static const char* kWriteNDEFResponse = "WriteNDEFResponse";
|
static const char* kWriteNDEFResponse = "WriteNDEFResponse";
|
||||||
static const char* kMakeReadOnlyNDEFResponse = "MakeReadOnlyNDEFResponse";
|
static const char* kMakeReadOnlyResponse = "MakeReadOnlyResponse";
|
||||||
static const char* kConnectResponse = "ConnectResponse";
|
static const char* kConnectResponse = "ConnectResponse";
|
||||||
static const char* kCloseResponse = "CloseResponse";
|
static const char* kCloseResponse = "CloseResponse";
|
||||||
|
|
||||||
|
@ -49,9 +49,9 @@ NfcMessageHandler::Marshall(Parcel& aParcel, const CommandOptions& aOptions)
|
||||||
} else if (!strcmp(type, kWriteNDEFRequest)) {
|
} else if (!strcmp(type, kWriteNDEFRequest)) {
|
||||||
result = WriteNDEFRequest(aParcel, aOptions);
|
result = WriteNDEFRequest(aParcel, aOptions);
|
||||||
mPendingReqQueue.AppendElement(NfcRequest::WriteNDEFReq);
|
mPendingReqQueue.AppendElement(NfcRequest::WriteNDEFReq);
|
||||||
} else if (!strcmp(type, kMakeReadOnlyNDEFRequest)) {
|
} else if (!strcmp(type, kMakeReadOnlyRequest)) {
|
||||||
result = MakeReadOnlyNDEFRequest(aParcel, aOptions);
|
result = MakeReadOnlyRequest(aParcel, aOptions);
|
||||||
mPendingReqQueue.AppendElement(NfcRequest::MakeReadOnlyNDEFReq);
|
mPendingReqQueue.AppendElement(NfcRequest::MakeReadOnlyReq);
|
||||||
} else if (!strcmp(type, kConnectRequest)) {
|
} else if (!strcmp(type, kConnectRequest)) {
|
||||||
result = ConnectRequest(aParcel, aOptions);
|
result = ConnectRequest(aParcel, aOptions);
|
||||||
mPendingReqQueue.AppendElement(NfcRequest::ConnectReq);
|
mPendingReqQueue.AppendElement(NfcRequest::ConnectReq);
|
||||||
|
@ -114,8 +114,8 @@ NfcMessageHandler::GeneralResponse(const Parcel& aParcel, EventOptions& aOptions
|
||||||
case NfcRequest::WriteNDEFReq:
|
case NfcRequest::WriteNDEFReq:
|
||||||
type = kWriteNDEFResponse;
|
type = kWriteNDEFResponse;
|
||||||
break;
|
break;
|
||||||
case NfcRequest::MakeReadOnlyNDEFReq:
|
case NfcRequest::MakeReadOnlyReq:
|
||||||
type = kMakeReadOnlyNDEFResponse;
|
type = kMakeReadOnlyResponse;
|
||||||
break;
|
break;
|
||||||
case NfcRequest::ConnectReq:
|
case NfcRequest::ConnectReq:
|
||||||
type = kConnectResponse;
|
type = kConnectResponse;
|
||||||
|
@ -202,9 +202,9 @@ NfcMessageHandler::WriteNDEFRequest(Parcel& aParcel, const CommandOptions& aOpti
|
||||||
}
|
}
|
||||||
|
|
||||||
bool
|
bool
|
||||||
NfcMessageHandler::MakeReadOnlyNDEFRequest(Parcel& aParcel, const CommandOptions& aOptions)
|
NfcMessageHandler::MakeReadOnlyRequest(Parcel& aParcel, const CommandOptions& aOptions)
|
||||||
{
|
{
|
||||||
aParcel.writeInt32(NfcRequest::MakeReadOnlyNDEFReq);
|
aParcel.writeInt32(NfcRequest::MakeReadOnlyReq);
|
||||||
aParcel.writeInt32(aOptions.mSessionId);
|
aParcel.writeInt32(aOptions.mSessionId);
|
||||||
mRequestIdQueue.AppendElement(aOptions.mRequestId);
|
mRequestIdQueue.AppendElement(aOptions.mRequestId);
|
||||||
return true;
|
return true;
|
||||||
|
|
|
@ -30,7 +30,7 @@ private:
|
||||||
bool ReadNDEFRequest(android::Parcel& aParcel, const CommandOptions& options);
|
bool ReadNDEFRequest(android::Parcel& aParcel, const CommandOptions& options);
|
||||||
bool ReadNDEFResponse(const android::Parcel& aParcel, EventOptions& aOptions);
|
bool ReadNDEFResponse(const android::Parcel& aParcel, EventOptions& aOptions);
|
||||||
bool WriteNDEFRequest(android::Parcel& aParcel, const CommandOptions& options);
|
bool WriteNDEFRequest(android::Parcel& aParcel, const CommandOptions& options);
|
||||||
bool MakeReadOnlyNDEFRequest(android::Parcel& aParcel, const CommandOptions& options);
|
bool MakeReadOnlyRequest(android::Parcel& aParcel, const CommandOptions& options);
|
||||||
bool ConnectRequest(android::Parcel& aParcel, const CommandOptions& options);
|
bool ConnectRequest(android::Parcel& aParcel, const CommandOptions& options);
|
||||||
bool CloseRequest(android::Parcel& aParcel, const CommandOptions& options);
|
bool CloseRequest(android::Parcel& aParcel, const CommandOptions& options);
|
||||||
|
|
||||||
|
|
|
@ -77,7 +77,7 @@ interface nsINfcContentHelper : nsISupports
|
||||||
|
|
||||||
nsIDOMDOMRequest readNDEF(in DOMString sessionToken);
|
nsIDOMDOMRequest readNDEF(in DOMString sessionToken);
|
||||||
nsIDOMDOMRequest writeNDEF(in nsIVariant records, in DOMString sessionToken);
|
nsIDOMDOMRequest writeNDEF(in nsIVariant records, in DOMString sessionToken);
|
||||||
nsIDOMDOMRequest makeReadOnlyNDEF(in DOMString sessionToken);
|
nsIDOMDOMRequest makeReadOnly(in DOMString sessionToken);
|
||||||
|
|
||||||
nsIDOMDOMRequest connect(in unsigned long techType, in DOMString sessionToken);
|
nsIDOMDOMRequest connect(in unsigned long techType, in DOMString sessionToken);
|
||||||
nsIDOMDOMRequest close(in DOMString sessionToken);
|
nsIDOMDOMRequest close(in DOMString sessionToken);
|
||||||
|
|
|
@ -75,11 +75,11 @@ MozNFCTagImpl.prototype = {
|
||||||
return this._nfcContentHelper.writeNDEF(records, this.session);
|
return this._nfcContentHelper.writeNDEF(records, this.session);
|
||||||
},
|
},
|
||||||
|
|
||||||
makeReadOnlyNDEF: function makeReadOnlyNDEF() {
|
makeReadOnly: function makeReadOnly() {
|
||||||
if (this.isLost) {
|
if (this.isLost) {
|
||||||
throw new this._window.DOMError("InvalidStateError", "NFCTag object is invalid");
|
throw new this._window.DOMError("InvalidStateError", "NFCTag object is invalid");
|
||||||
}
|
}
|
||||||
return this._nfcContentHelper.makeReadOnlyNDEF(this.session);
|
return this._nfcContentHelper.makeReadOnly(this.session);
|
||||||
},
|
},
|
||||||
|
|
||||||
classID: Components.ID("{4e1e2e90-3137-11e3-aa6e-0800200c9a66}"),
|
classID: Components.ID("{4e1e2e90-3137-11e3-aa6e-0800200c9a66}"),
|
||||||
|
|
|
@ -73,7 +73,7 @@ interface MozNFCTag {
|
||||||
DOMRequest writeNDEF(sequence<MozNDEFRecord> records);
|
DOMRequest writeNDEF(sequence<MozNDEFRecord> records);
|
||||||
|
|
||||||
[Throws]
|
[Throws]
|
||||||
DOMRequest makeReadOnlyNDEF();
|
DOMRequest makeReadOnly();
|
||||||
};
|
};
|
||||||
|
|
||||||
// Mozilla Only
|
// Mozilla Only
|
||||||
|
|
Загрузка…
Ссылка в новой задаче