Commit Graph

224 Commits

Author SHA1 Message Date
Yoshi Huang
7ac3089480 Bug 933665 - Remove encodeNdefRecords func from NfcContentHelper. r=dimi 2015-03-05 18:58:37 +08:00
Yoshi Huang
d9b5b09720 Bug 1139830 - Make type/id/payload nullable in MozNDEFRecordOptions. r=smaug 2015-03-06 16:23:21 +08:00
Yoshi Huang
44ca356ca2 Bug 1138886 - Structured Clone for MozNDEFRecord. r=smaug
From 9b1bdef0b25b41d0448662ec689a961ae4e8fcd2 Mon Sep 17 00:00:00 2001
---
 dom/base/StructuredCloneTags.h     |   2 +
 dom/base/nsJSEnvironment.cpp       |  29 +++++++++
 dom/nfc/MozNDEFRecord.cpp          | 122 ++++++++++++++++++++++++++++++++++---
 dom/nfc/MozNDEFRecord.h            |  20 ++++--
 js/xpconnect/src/ExportHelpers.cpp |  36 ++++++++++-
 5 files changed, 193 insertions(+), 16 deletions(-)
2015-01-30 15:36:42 +08:00
Yoshi Huang
0eff791629 Bug 1121298 - Part 3. add getAsURI. r=smaug, dimi
From 1b93a62187c24dd176d48021b2a765a19beb453a Mon Sep 17 00:00:00 2001
---
 dom/nfc/MozNDEFRecord.cpp       | 29 +++++++++++++++++++++++++++++
 dom/nfc/MozNDEFRecord.h         |  1 +
 dom/webidl/MozNDEFRecord.webidl |  6 ++++++
 3 files changed, 36 insertions(+)
2015-01-21 17:37:45 +08:00
Yoshi Huang
2387d616de Bug 1121298 - Part 2: Add Constructor(uri) for MozNDEFRecord. r=smaug, dimi 2015-01-29 18:16:26 +08:00
Yoshi Huang
e78e3d10a9 Bug 1121298 - Part 1: refactor MozNDEFRecord cstor. r=smaug, dimi
From f5d558e4dc3b3d1e08de09d1881bbf69a68a5791 Mon Sep 17 00:00:00 2001
---
 dom/nfc/MozNDEFRecord.cpp | 102 +++++++++++++++++++++++++++++-----------------
 dom/nfc/MozNDEFRecord.h   |  21 ++++++----
 2 files changed, 76 insertions(+), 47 deletions(-)
2015-01-07 18:08:21 +08:00
Yoshi Huang
3c9cfd2a18 Bug 1137107 - Part 2: Add NfcResponseType and NfcNotificationType. r=smaug, dimi 2015-02-26 17:23:17 +08:00
Yoshi Huang
4cf97dac15 Bug 1137107 - Part 1: Add NfcRequestType. r=smaug, dimi
From 2c1e87a8e1018f2c1d9f8825e36d1478a8a409bc Mon Sep 17 00:00:00 2001
---
 dom/nfc/gonk/Nfc.js                | 22 ++++++---
 dom/nfc/gonk/NfcGonkMessage.h      |  9 ----
 dom/nfc/gonk/NfcMessageHandler.cpp | 91 +++++++++++++++++++-------------------
 dom/nfc/gonk/NfcOptions.h          |  2 +-
 dom/webidl/NfcOptions.webidl       | 16 ++++++-
 5 files changed, 76 insertions(+), 64 deletions(-)
2015-02-26 13:49:28 +08:00
Dimi Lee
37651c229c Bug 1121900 - [flatfish] build break by "error: undefined reference to 'mozilla::dom::MozIsoDepTech::mTechnology'". r=yoshi 2015-03-04 11:21:49 +08:00
Yoshi Huang
dcb1428e8d Bug 1137101 - Refactor Response/Notification sent from nfcd. r=dimi
From 80bbb263c548a86287bec29c5983e0ca3714a841 Mon Sep 17 00:00:00 2001
---
 dom/nfc/gonk/NfcGonkMessage.h      | 12 +++++----
 dom/nfc/gonk/NfcMessageHandler.cpp | 52 +++++++++++++++++++++++++-------------
 dom/nfc/gonk/NfcMessageHandler.h   |  5 ++--
 3 files changed, 44 insertions(+), 25 deletions(-)
2015-02-16 18:47:58 +08:00
Yoshi Huang
8045419885 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
356de21c14 Bug 1131508 - Remove ConnectResponse and CloseResponse from NfcContentHelper. r=dimi 2015-02-10 17:48:16 +08:00
Yoshi Huang
8bc84aba88 Bug 1131454 - Don't add transceive req into RequestQueue in NfcMessageHandler. r=dlee 2015-02-10 14:19:38 +08:00
Yoshi Huang
1c3ee03b32 Bug 1127726 - Cannot receive NDEF from another NFC Peer. r=vchang 2015-01-30 16:10:12 +08:00
Yoshi Huang
1079afc0c7 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
a0418fb15a 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
c18d34ee83 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
b413034cd7 Bug 1120315 - Part 1: revert Bug 1082445. r=dimi 2015-01-26 17:27:57 +08:00
Yoshi Huang
68eca9fbed 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
5824d37d8b Bug 1082440 - B2G NFC: Dispatch NFC events to foreground app. r=yoshi 2015-01-23 11:35:03 +08:00
Dimi Lee
1b2902b630 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
7b75a9ed87 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
3829546c2a Bug 1121840 - Use Cu.cloneInto for the result of NFCTag.transceive. r=dimi 2015-01-15 14:55:25 +08:00
Yoshi Huang
fb66184555 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é
5c6919ff67 Bug 1120862 - permission denied to access property 'then' r=allstars 2015-01-15 10:36:10 +08:00
Yoshi Huang
e0b9b1ffc6 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
0f2abc9b4f 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
58fcb179a1 Backed out changeset c9a4574f58b5 2015-01-13 11:57:49 +08:00
Dimi Lee
981100e0a1 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
1a341c3f97 merge b2g-inbound to mozilla-central a=merge 2015-01-09 14:08:02 +01:00
dlee
73129bab53 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
4f3f52ebd1 Bug 1116725 - TypeError : isLost is a readonly attribute. r=smaug, dimi 2014-12-31 17:08:17 +08:00
Ehsan Akhgari
b6e35bb4b4 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
7083269cb4 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
602507c295 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
3d1e097a95 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
f144242b70 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
b0548b1e2d 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
0f8a37e350 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
beeb584af9 Merge mozilla-central to mozilla-inbound on a CLOSED TREE 2014-12-15 15:33:21 +01:00
Yoshi Huang
972ef51e6f 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
a19f4a0d84 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
b273018bde 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
8296035077 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
aeb9d94711 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
ce073c1669 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
b5bf4a5cc1 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
0846eb7b58 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
1a9fe93e27 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
3a5eafb895 Bug 1103732 - remove getNFCPeer. r=smaug, dimi 2014-11-26 15:02:36 +08:00