Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-29 07:42:04 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1073421 - B2G NFC: remove NDEF_Formatable and NDEF_Writable. r=smaug, dimi

Browse Source
This commit is contained in:
Yoshi Huang 2014-10-15 15:47:42 +08:00
parent 6ccb7125cf
commit a829a03949
3 changed files with 1 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dom/nfc/gonk/NfcGonkMessage.h
View File

@ -8,7 +8,7 @@
namespace mozilla { namespace mozilla {
#define NFCD_MAJOR_VERSION 1 #define NFCD_MAJOR_VERSION 1
#define NFCD_MINOR_VERSION 11 #define NFCD_MINOR_VERSION 12
enum NfcRequest { enum NfcRequest {
ConfigReq = 0, ConfigReq = 0,

16
dom/nfc/nsNfc.js
View File

@ -31,20 +31,6 @@ function MozNFCTag() {
this._nfcContentHelper = Cc["@mozilla.org/nfc/content-helper;1"] this._nfcContentHelper = Cc["@mozilla.org/nfc/content-helper;1"]
.getService(Ci.nsINfcContentHelper); .getService(Ci.nsINfcContentHelper);
this.session = null; this.session = null;
// Map WebIDL declared enum map names to integer
this._techTypesMap = [];
this._techTypesMap['NFC_A'] = 0;
this._techTypesMap['NFC_B'] = 1;
this._techTypesMap['NFC_ISO_DEP'] = 2;
this._techTypesMap['NFC_F'] = 3;
this._techTypesMap['NFC_V'] = 4;
this._techTypesMap['NDEF'] = 5;
this._techTypesMap['NDEF_FORMATABLE'] = 6;
this._techTypesMap['MIFARE_CLASSIC'] = 7;
this._techTypesMap['MIFARE_ULTRALIGHT'] = 8;
this._techTypesMap['NFC_BARCODE'] = 9;
this._techTypesMap['P2P'] = 10;
} }
MozNFCTag.prototype = { MozNFCTag.prototype = {
_nfcContentHelper: null, _nfcContentHelper: null,
@ -55,8 +41,6 @@ MozNFCTag.prototype = {
this.session = aSessionToken; this.session = aSessionToken;
}, },
_techTypesMap: null,
// NFCTag interface: // NFCTag interface:
readNDEF: function readNDEF() { readNDEF: function readNDEF() {
return this._nfcContentHelper.readNDEF(this._window, this.session); return this._nfcContentHelper.readNDEF(this._window, this.session);

2
dom/webidl/MozNFCTag.webidl
View File

@ -10,8 +10,6 @@
enum NFCTechType { enum NFCTechType {
"NDEF", "NDEF",
"NDEF_WRITABLE",
"NDEF_FORMATABLE",
"P2P", "P2P",
"NFC_A", "NFC_A",
"NFC_B", "NFC_B",