Commit Graph

214 Commits

Author SHA1 Message Date
Yoshi Huang
eb8482eec3 Bug 1133390 - onfocuschanged(false) will be notified twice. r=dimi
From 1c1b9ad0570901cc2c9ce6bce1bbeda210c1e1ca Mon Sep 17 00:00:00 2001
---
 dom/nfc/gonk/Nfc.js | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)
2015-02-16 11:13:18 +08:00
Yoshi Huang
9596e5bbf0 Bug 1131508 - Remove ConnectResponse and CloseResponse from NfcContentHelper. r=dimi 2015-02-10 17:48:16 +08:00
Yoshi Huang
5fdb7b6d6d Bug 1131454 - Don't add transceive req into RequestQueue in NfcMessageHandler. r=dlee 2015-02-10 14:19:38 +08:00
Yoshi Huang
3d6373abad Bug 1127726 - Cannot receive NDEF from another NFC Peer. r=vchang 2015-01-30 16:10:12 +08:00
Yoshi Huang
a04b632dab Bug 1126653 - don't send nfc-manager-tech-lost if the foreground has received ontag/peerfound. r=dimi 2015-01-28 10:48:17 +08:00
Yoshi Huang
346e483a75 Bug 1120315 - Part 3: notify tag/peerlost when lost focus. r=dimi
From 14b18a83041d65c0cf111d20279668e665dd0d56 Mon Sep 17 00:00:00 2001
---
 dom/nfc/NfcContentHelper.js     |  3 +++
 dom/nfc/gonk/Nfc.js             | 24 ++++++++++++++++++++++--
 dom/nfc/gonk/nfc_consts.js      |  1 +
 dom/nfc/nsINfcContentHelper.idl | 10 +++++++++-
 dom/nfc/nsNfc.js                | 16 ++++++++++++++++
 5 files changed, 51 insertions(+), 3 deletions(-)
2015-01-26 18:58:52 +08:00
Yoshi Huang
01ea1ea1be Bug 1120315 - Part 2: s/change/changed/. r=dimi
From 86ab7fbe1d409c9f8f7082499179e0632101a61b Mon Sep 17 00:00:00 2001
---
 dom/nfc/NfcContentHelper.js     | 4 ++--
 dom/nfc/gonk/Nfc.js             | 6 +++---
 dom/nfc/gonk/nfc_consts.js      | 2 +-
 dom/nfc/nsINfcContentHelper.idl | 4 ++--
 dom/nfc/nsNfc.js                | 2 +-
 5 files changed, 9 insertions(+), 9 deletions(-)
2015-01-26 18:13:36 +08:00
Yoshi Huang
8fc659bf30 Bug 1120315 - Part 1: revert Bug 1082445. r=dimi 2015-01-26 17:27:57 +08:00
Yoshi Huang
9f90a20a21 Bug 1082443 - B2G NFC: event fallback to System app if the foreground app cannot handle it. r=smaug, dimi 2014-12-11 17:42:35 +08:00
Dimi Lee
76ea8c7b9f Bug 1082440 - B2G NFC: Dispatch NFC events to foreground app. r=yoshi 2015-01-23 11:35:03 +08:00
Dimi Lee
a09be7bb0a Bug 1105666 - [BrowserAPI] Add an API to indicate this iframe could receive NFC event. r=smaug, kanru, yoshi 2015-01-22 17:40:17 +08:00
Yoshi Huang
86e65bebb0 Bug 1093517 - remove impl for connect and close of MozNFCTag. r=dimi
From 8d41372b81f36efced2f46bfa8428eb12688ffd7 Mon Sep 17 00:00:00 2001
---
 dom/nfc/NfcContentHelper.js        | 27 ++-------------------------
 dom/nfc/gonk/Nfc.js                | 12 +-----------
 dom/nfc/gonk/NfcGonkMessage.h      |  4 +---
 dom/nfc/gonk/NfcMessageHandler.cpp | 35 -----------------------------------
 dom/nfc/gonk/NfcMessageHandler.h   |  2 --
 dom/nfc/nsINfcContentHelper.idl    | 30 +-----------------------------
 6 files changed, 5 insertions(+), 105 deletions(-)
2015-01-15 15:41:43 +08:00
Yoshi Huang
a3c2b470b3 Bug 1121840 - Use Cu.cloneInto for the result of NFCTag.transceive. r=dimi 2015-01-15 14:55:25 +08:00
Yoshi Huang
2fe2c60a92 Bug 1121818 - Reject promise with instance of 'Error'. r=dimi
From da865c1cd62df020eba8515c3e19b962ccddd322 Mon Sep 17 00:00:00 2001
---
 dom/nfc/nsNfc.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
2015-01-15 12:17:46 +08:00
Fabrice Desré
0bf0d38504 Bug 1120862 - permission denied to access property 'then' r=allstars 2015-01-15 10:36:10 +08:00
Yoshi Huang
1c112d36f3 Bug 1120881 - MozNFCTag.canBeMadeReadOnly is incorrect. r=dimi
From 554e0cb358165b90abdf03acaf560ccd489f5c45 Mon Sep 17 00:00:00 2001
---
 dom/nfc/nsNfc.js | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)
2015-01-13 18:36:43 +08:00
Dimi Lee
ad99ef915c Bug 916428 - [NFC] APIs for ISO 14443-4 tags (IsoDep Support). r=smaug, r=yoshi 2015-01-13 14:50:24 +08:00
Yoshi Huang
ee2dc4143d Backed out changeset c9a4574f58b5 2015-01-13 11:57:49 +08:00
Dimi Lee
4e40521609 Bug 916428 - [NFC] APIs for ISO 14443-4 tags (IsoDep Support). r=smaug, yoshi 2015-01-13 11:43:49 +08:00
Carsten "Tomcat" Book
91c096e3f5 merge b2g-inbound to mozilla-central a=merge 2015-01-09 14:08:02 +01:00
dlee
680ab4c258 Bug 1109456 - Support NFC tag transceive WebAPI. r=smaug, yoshi
---
 dom/nfc/NfcContentHelper.js        |   33 ++++++++++++++++++++++
 dom/nfc/gonk/Nfc.js                |    7 ++++-
 dom/nfc/gonk/NfcGonkMessage.h      |    2 ++
 dom/nfc/gonk/NfcMessageHandler.cpp |   54 ++++++++++++++++++++++++++++++++++++
 dom/nfc/gonk/NfcMessageHandler.h   |    4 ++-
 dom/nfc/gonk/NfcOptions.h          |   13 +++++++++
 dom/nfc/gonk/NfcService.cpp        |    6 ++++
 dom/nfc/nsINfcContentHelper.idl    |   27 ++++++++++++++++--
 dom/nfc/nsNfc.js                   |   19 +++++++++++++
 dom/webidl/MozNFCTag.webidl        |    6 ++++
 dom/webidl/NfcOptions.webidl       |    6 ++++
 11 files changed, 173 insertions(+), 4 deletions(-)
2015-01-09 10:42:48 +08:00
Yoshi Huang
ca7f1552fe Bug 1116725 - TypeError : isLost is a readonly attribute. r=smaug, dimi 2014-12-31 17:08:17 +08:00
Ehsan Akhgari
4354953b4f Bug 1118486 - Part 1: Use = delete instead of MOZ_DELETE directly; r=Waldo
Most of this patch (with the exception of dom/bindings/Codegen.py) was
generated by the following bash script:

#!/bin/bash

function convert() {
echo "Converting $1 to $2..."
find . ! -wholename "*nsprpub*" \
       ! -wholename "*security/nss*" \
       ! -wholename "*/.hg*" \
       ! -wholename "*/.git*" \
       ! -wholename "obj-*" \
         -type f \
      \( -iname "*.cpp" \
         -o -iname "*.h" \
         -o -iname "*.cc" \
         -o -iname "*.idl" \
         -o -iname "*.ipdl" \
         -o -iname "*.ipdlh" \
         -o -iname "*.mm" \) | \
    xargs -n 1 sed -i -e "s/\b$1\b/$2/g"
}

convert MOZ_DELETE '= delete'
2015-01-08 23:19:05 -05:00
Yoshi Huang
3cbb7f3ffc Bug 1115676 - update contractID for mozNFC. r=smaug, dimi
From 84d5d3ccb88ea78ea65cd38cf5e17da145338d61 Mon Sep 17 00:00:00 2001
---
 dom/nfc/nsNfc.js             | 6 +++---
 dom/nfc/nsNfc.manifest       | 6 +++---
 dom/webidl/MozNFC.webidl     | 2 +-
 dom/webidl/MozNFCPeer.webidl | 2 +-
 dom/webidl/MozNFCTag.webidl  | 2 +-
 5 files changed, 9 insertions(+), 9 deletions(-)
2014-12-26 20:57:11 +08:00
Yoshi Huang
424c8aeb97 Bug 1115465 - Add id attribute to NFCTag. r=smaug, dimi
From 152d8835dedf6592d274478bac369530f98c3935 Mon Sep 17 00:00:00 2001
---
 dom/nfc/NfcContentHelper.js        |  6 ++++--
 dom/nfc/gonk/NfcGonkMessage.h      |  2 +-
 dom/nfc/gonk/NfcMessageHandler.cpp | 17 +++++++++++------
 dom/nfc/gonk/NfcOptions.h          |  1 +
 dom/nfc/gonk/NfcService.cpp        |  5 +++++
 dom/nfc/nsINfcContentHelper.idl    |  4 +++-
 dom/nfc/nsNfc.js                   |  2 ++
 dom/webidl/MozNFCTag.webidl        |  5 +++++
 dom/webidl/NfcOptions.webidl       |  1 +
 9 files changed, 33 insertions(+), 10 deletions(-)
2014-12-26 16:07:45 +08:00
Yoshi Huang
cb608e67b3 Bug 1115674 - manifest for NfcContentHelper. r=dimi
From ab9028ed8fa698952fac33a0ce99fabb6bf906a7 Mon Sep 17 00:00:00 2001
---
 b2g/installer/package-manifest.in | 1 +
 dom/nfc/NfcContentHelper.manifest | 7 +++++++
 dom/nfc/gonk/Nfc.manifest         | 4 ----
 dom/nfc/moz.build                 | 1 +
 4 files changed, 9 insertions(+), 4 deletions(-)
 create mode 100644 dom/nfc/NfcContentHelper.manifest
2014-12-26 20:41:25 +08:00
Yoshi Huang
c71082f43b Bug 1115468 - Some attrubites of MozNFCTag are null. r=dimi
From bf11cb363f58cce8eff86c6234930a94834b3c11 Mon Sep 17 00:00:00 2001
---
 dom/nfc/NfcContentHelper.js     | 40 ++++++++++++++++++++++++++++------------
 dom/nfc/nsINfcContentHelper.idl | 23 +++++++++++++++++------
 dom/nfc/nsNfc.js                | 38 ++++++++++++++++++++------------------
 3 files changed, 65 insertions(+), 36 deletions(-)
2014-12-26 11:50:12 +08:00
Yoshi Huang
d01e495b3c Bug 1111523 - isP2P and sessionToken shouldn't exist in nfc-manager-tech-discover wrapper. r=dimi 2014-12-15 18:01:34 +08:00
Yoshi Huang
acfdd2727f Bug 1111528 - onpeerfound shouldn't be called when receiving NDEF from another peer. r=dimi 2014-12-15 18:19:25 +08:00
Carsten "Tomcat" Book
bad074f263 Merge mozilla-central to mozilla-inbound on a CLOSED TREE 2014-12-15 15:33:21 +01:00
Yoshi Huang
2d9fedee55 Bug 1111480 - isP2P exists in every response. r=dimi
From 961e2572cf82fdb1ce2b7df912d56d3c1f6df2bd Mon Sep 17 00:00:00 2001
---
 dom/nfc/gonk/NfcOptions.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
2014-12-15 15:28:23 +08:00
Yoshi Huang
9b2e796b7c Bug 1109458 - Let privilege App know if NFC is enabled or not. r=smaug, dimi 2014-12-12 15:13:40 +08:00
Botond Ballo
449bab4daf Bug 1073081 - Fix warnings about macro redefinitions by renaming macros. r=ehsan
--HG--
extra : source : 18294144de5ff84e3a88945f7222e6eb8bbfcb34
2014-12-10 18:20:10 -05:00
Botond Ballo
870235958c Bug 1073081 - Fix -Wunused-result, -Wunused-variable, and -Wunused-but-set-variable warnings. r=ehsan
--HG--
extra : source : a1ac7acfcf14207706eca29be3a20c576c8fae06
2014-11-26 18:13:49 -05:00
Yoshi Huang
019231d273 Bug 1110059 - IDL for NFC system message. r=dimi
From 774da50e697c2d194146d1f0ff748aa6f31fe8dc Mon Sep 17 00:00:00 2001
---
 dom/nfc/gonk/Nfc.js                  | 36 ++++++++++++++++++++++++++++++++++--
 dom/nfc/gonk/nsINfcSystemMessage.idl | 25 +++++++++++++++++++++++++
 dom/nfc/moz.build                    |  1 +
 3 files changed, 60 insertions(+), 2 deletions(-)
 create mode 100644 dom/nfc/gonk/nsINfcSystemMessage.idl
2014-12-11 18:53:27 +08:00
Yoshi Huang
cfbd984cd3 Bug 1108996 - using isP2P in NFCTechDiscoveredWrapper. r=dimi
From 677658217f206423c7f07be926e0e9f28d9b37e6 Mon Sep 17 00:00:00 2001
---
 dom/nfc/nsNfc.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
2014-12-09 18:51:29 +08:00
Yoshi Huang
ffb0bc5267 Bug 1108005 - Move NFC IPC messages and permission together. r=dimi
From 76b3d82105390ca821df0264e4a7f914950019d2 Mon Sep 17 00:00:00 2001
---
 dom/nfc/gonk/Nfc.js | 115 ++++++++++++++++++----------------------------------
 1 file changed, 40 insertions(+), 75 deletions(-)
2014-12-09 18:56:40 +08:00
Dimi Lee
6dcfe58782 Bug 1082300 - B2G NFC: remove NDEF and P2P from technology list. r=smaug, allstars.chh 2014-12-05 01:38:38 +08:00
Yoshi Huang
0baa955618 Bug 1103732 - Part 2: update test cases. r=dimi
From abdfb00788f359f4ed9bbd502a7e723350e3212d Mon Sep 17 00:00:00 2001
---
 dom/nfc/tests/marionette/test_nfc_peer.js          | 16 ++--------------
 dom/nfc/tests/marionette/test_nfc_peer_sendFile.js |  3 +--
 dom/nfc/tests/marionette/test_nfc_peer_sendndef.js |  5 ++---
 3 files changed, 5 insertions(+), 19 deletions(-)
2014-11-27 15:05:29 +08:00
Yoshi Huang
1e4ab4c8f8 Bug 1103732 - remove getNFCPeer. r=smaug, dimi 2014-11-26 15:02:36 +08:00
Yoshi Huang
7d462fac68 Bug 1048676 - Part 2: Nfc.js and test case change. r=dimi
From 609631024dbcf07d74c13b15ce201b499e6176dd Mon Sep 17 00:00:00 2001
---
 dom/nfc/gonk/Nfc.js                                | 30 +++++++++++-----------
 .../marionette/test_nfc_checkP2PRegistration.js    |  4 +--
 .../tests/marionette/test_nfc_error_messages.js    |  4 +--
 dom/nfc/tests/marionette/test_nfc_peer.js          |  4 ++-
 4 files changed, 22 insertions(+), 20 deletions(-)
2014-11-06 11:21:07 +08:00
Yoshi Huang
215cbc771b Bug 1048676 - Part 1: WebIDL and DOM change. r=smaug, dimi
From 28e46b34f04d20d5f10c14a85e77ec1ac98aad9e Mon Sep 17 00:00:00 2001
---
 dom/apps/PermissionsTable.jsm     | 9 +++++++--
 dom/nfc/nsNfc.js                  | 9 +++++----
 dom/webidl/MozNFC.webidl          | 8 ++------
 dom/webidl/MozNFCPeer.webidl      | 2 +-
 dom/webidl/MozNFCPeerEvent.webidl | 2 +-
 dom/webidl/MozNFCTagEvent.webidl  | 2 +-
 6 files changed, 17 insertions(+), 15 deletions(-)
2014-11-06 11:12:38 +08:00
Dimi Lee
9d7b247d38 Bug 1093483 - Remove NFC_GECKO_ERROR_NOT_ENABLED error from Nfc.js. r=allstars.chh 2014-11-27 17:02:56 +08:00
Yoshi Huang
7b3f960904 Bug 1103730 - Create a nfc-manager-tech-discovered system message. r=dimi 2014-11-17 18:00:14 +08:00
Yoshi Huang
95e6c95056 Bug 1103729 - Create nfc-manager-send-file wrapper. r=dimi 2014-11-17 17:41:18 +08:00
Dimi Lee
47ce7a8a57 Bug 1095322 - Child process should know current rf state of NFC HW. r=allstars.chh 2014-11-25 15:10:34 +08:00
Yoshi Huang
98d7ceef14 Bug 1085296 - B2G NFC: enable debug when either flag is enabled or settings is enabled. r=dimi 2014-11-24 10:10:32 +08:00
Dimi Lee
889cfd218e Bug 996397 - B2G NFC: Replace DOMRequests with Promises. r=smaug, allstars.chh 2014-11-21 17:54:04 +08:00
Yoshi Huang
7497ee7a95 Bug 1082445: B2G NFC: notifiy peer/taglost when app goes to background. r=smaug, dimi 2014-11-19 12:32:47 +08:00
Yoshi Huang
d48625d613 Bug 1097527 - ontag/peerlost shouldn't be fired if App doesn't listen/receive ontag/peerfound. r=smaug, dimi 2014-11-19 11:00:16 +08:00