Commit Graph

99 Commits

Author SHA1 Message Date
Aryeh Gregor
15ec3ba67b Bug 1053190 - Reduce unnecessary inclusion of nsINode.h in headers; r=ehsan 2014-08-18 17:44:50 +03:00
Yoshi Huang
95dabbf0ba Bug 1054217 - Part 4: Refine Nfc.receiveMessage. r=dimi
From 68d1ccd5d2e0e0f85803e56741ae17ff89c4a2a7 Mon Sep 17 00:00:00 2001
---
 dom/nfc/gonk/Nfc.js | 61 ++++++++++++++++++++++++-----------------------------
 1 file changed, 28 insertions(+), 33 deletions(-)
2014-08-15 17:25:57 +08:00
Yoshi Huang
76ed9bc551 Bug 1054217 - part 3: rename setSessionToken to checkSessionToken. r=dimi 2014-08-18 17:43:28 +08:00
Yoshi Huang
d7ac11ec33 Bug 1054217 - part 2: remove targetsBySessionTokens. r=dimi
From 07ca796ae9e1d8f98d8282c2bc4f68046d311fde Mon Sep 17 00:00:00 2001
---
 dom/nfc/gonk/Nfc.js        | 124 ++++++++++-----------------------------------
 dom/nfc/gonk/nfc_consts.js |   2 +
 2 files changed, 29 insertions(+), 97 deletions(-)
2014-08-15 16:29:55 +08:00
Yoshi Huang
28d58b9bb7 Bug 1054217 - Part 1: Add onPeerLost in gMessageManager. r=dimi
From 1e81ab61d3ff409817415b5e8b610f77461836f8 Mon Sep 17 00:00:00 2001
---
 dom/nfc/gonk/Nfc.js | 28 ++++++++++++++++------------
 1 file changed, 16 insertions(+), 12 deletions(-)
2014-08-15 11:31:52 +08:00
Yoshi Huang
608021a46f Bug 1054119 - B2G NFC: Don't process data from nfcd if error. r=dimi 2014-08-13 18:12:27 +08:00
Ed Morley
000d251175 Merge latest green b2g-inbound changeset and mozilla-central; a=merge 2014-08-15 16:54:17 +01:00
Yoshi Huang
5abc967016 Bug 1053116 - Part 2: add error code in NfcGonkMessages.h. r=dimi 2014-08-15 10:04:51 +08:00
Yoshi Huang
5806e79929 Bug 1053116 - Part 1: update error code in nfc_consts.js. r=dimi 2014-08-15 10:02:01 +08:00
Yoshi Huang
ae558038c0 Bug 1046554 - Part 2: update marionette tests. r=dimi
From d7dafea4dcff00edbe40ee0880ca71b804893622 Mon Sep 17 00:00:00 2001
---
 .../tests/marionette/test_nfc_error_messages.js    | 43 +---------------------
 dom/nfc/tests/marionette/test_nfc_peer.js          | 20 ++++++++--
 2 files changed, 17 insertions(+), 46 deletions(-)
2014-08-11 17:03:52 +08:00
Yoshi Huang
7694e3e977 Bug 1046554 - Part 1: B2G NFC: pass NFCPeerEvent in onpeerready. r=smaug, dimi 2014-07-31 17:11:04 +08:00
Ed Morley
8e433ac98d Backed out changeset 52fc270e59ad (bug 1051754) for intermittent test failures 2014-08-14 17:40:04 +01:00
Garner Lee
f61c289d4c Bug 1050577: [NFC] Techlost not clearing peer appId correctly. r=allstars.chh 2014-08-11 16:03:35 -07:00
Yoshi Huang
f28c154070 Bug 1052311 - B2G NFC: remove warnings from Nfc.js and NfcContentHelper.js. r=dimi 2014-08-12 17:04:51 +08:00
Yoshi Huang
1f36877080 Bug 1051754 - B2G NFC: Add marionette test for peer.sendFile. r=dimi
From 3cfb06874b6e838ad76e1817c7b69df81e0f802b Mon Sep 17 00:00:00 2001
---
 dom/nfc/tests/marionette/head.js                   | 20 +++++++--
 dom/nfc/tests/marionette/manifest.ini              |  1 +
 dom/nfc/tests/marionette/test_nfc_peer_sendFile.js | 49 ++++++++++++++++++++++
 3 files changed, 67 insertions(+), 3 deletions(-)
 create mode 100644 dom/nfc/tests/marionette/test_nfc_peer_sendFile.js
2014-08-11 18:26:52 +08:00
Yoshi Huang
6e2d19f6db Bug 1051738 - B2G NFC: typo in getNFCPeer. r=dimi
From bea6af520beedcc4547ce5c45c4d78faa63d5812 Mon Sep 17 00:00:00 2001
---
 dom/nfc/nsNfc.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
2014-08-11 17:19:11 +08:00
Yoshi Huang
0f1e3b3420 Bug 1049351 - [NFC] fix testPeerShouldThrow. r=dimi 2014-08-11 15:45:35 +08:00
Yoshi Huang
f8b65ea9b6 Bug 1050692 - [NFC] B2G NFC: peer.sendNDEF always return Bad Session ID. r=dimi 2014-08-08 17:22:28 +08:00
Krzysztof Mioduszewski
d426d698c5 Bug 1042651 - B2G NFC: getNFCPeer and getNFCTag should not throw error. r=smaug, r=allstars.chh, a=me 2014-08-05 05:06:00 -04:00
Ed Morley
56917defaa Backed out changeset b2ef6a444640 (bug 1046554) since the gaia part has been reverted 2014-08-06 16:58:31 +01:00
Yoshi Huang
47606c7455 Bug 1046554 - B2G NFC: pass NFCPeerEvent in onpeerready. r=smaug, dimi 2014-07-31 17:11:04 +08:00
Yoshi Huang
c47835efd2 Bug 933141 - Move NFC files out of system/gonk. r=gps, dimi
--HG--
rename : dom/system/gonk/NfcContentHelper.js => dom/nfc/NfcContentHelper.js
rename : dom/system/gonk/Nfc.js => dom/nfc/gonk/Nfc.js
rename : dom/system/gonk/Nfc.manifest => dom/nfc/gonk/Nfc.manifest
rename : dom/system/gonk/NfcGonkMessage.h => dom/nfc/gonk/NfcGonkMessage.h
rename : dom/system/gonk/NfcMessageHandler.cpp => dom/nfc/gonk/NfcMessageHandler.cpp
rename : dom/system/gonk/NfcMessageHandler.h => dom/nfc/gonk/NfcMessageHandler.h
rename : dom/system/gonk/NfcOptions.h => dom/nfc/gonk/NfcOptions.h
rename : dom/system/gonk/NfcService.cpp => dom/nfc/gonk/NfcService.cpp
rename : dom/system/gonk/NfcService.h => dom/nfc/gonk/NfcService.h
rename : dom/system/gonk/nfc_consts.js => dom/nfc/gonk/nfc_consts.js
rename : dom/system/gonk/nsINfcService.idl => dom/nfc/gonk/nsINfcService.idl
rename : dom/system/gonk/nsINfcContentHelper.idl => dom/nfc/nsINfcContentHelper.idl
2014-08-01 17:23:14 +08:00
Yoshi Huang
0176675b6b Bug 1043186 - Part 4: Add throw in MozNFCPeer. r=smaug, dimi 2014-07-29 11:36:58 +08:00
Yoshi Huang
3e22517417 Bug 1043186 - Part 3: return cached NFCPeer if session matches. 2014-07-25 18:03:37 +08:00
Yoshi Huang
b3bf86b9f8 Bug 1043186 - Part 2: onpeerlost should be fired to correct target. r=dimi 2014-07-24 18:11:42 +08:00
Yoshi Huang
d096c7322c Bug 1043186 - Part 1: Add a nsINfcPeerEventListener. r=dimi 2014-07-24 12:16:02 +08:00
Yoshi Huang
184db875cd Bug 933588 - Part 3: update test cases. r=dimi 2014-07-14 18:57:12 +08:00
Yoshi Huang
f5433c8771 Bug 1038617 - B2G NFC: can't access dead object thrown from nsNfc.js. r=smaug 2014-07-21 15:43:45 +08:00
Ms2ger
e99bd12a4b Bug 1043963 - Collapse test-only moz.build files under dom/ into ancestor moz.build files; r=ted
There is very little benefit to having another layer of moz.build files, and
removing them will speed up the build a minimal amount. It also paves the way
for removing TEST_DIRS, which could simplify the build system somewhat.
2014-07-26 08:17:24 +02:00
Mike Hommey
d10b15b035 Bug 1041860 - Avoid setting FINAL_LIBRARY to libraries that further use a FINAL_LIBRARY. r=mshal 2014-07-23 08:37:51 +09:00
Dimi Lee
10e56f3ca7 Bug 1040619 - [NFC] javascript error "emulator.activateRE is not a function" when run NFC testcase. r=allstars.chh 2014-07-18 15:22:46 +08:00
Thomas Zimmermann
d235d8484e Bug 1034660 - Exchange NDEF's PAYLOAD and ID fields in emulator interface. r=dlee
The emulator used PAYLOAD and ID fields of NDEF records in an incorrect
order. The fix makes the command-line interface incompatible with the
current test cases. This patch adapts the test cases by putting ID before
PAYLOAD.
2014-07-09 06:27:00 -04:00
Dimi Lee
fa78cd4a37 Bug 1035606 - [NFC] Testcase cleanup. r=tzimmermann 2014-07-10 11:33:10 +08:00
Krzysztof Mioduszewski
7124970438 Bug 1033218 - [NFC] use emulator command triggering tech-lost. r=allstars.chh 2014-07-07 20:40:01 +02:00
Dimi Lee
b1c674417f Bug 997576 - [NFC] Testcase for reading empty NFC tag. r=tzimmermann 2014-07-08 11:56:57 +08:00
Yoshi Huang
ccf57a1dbf Bug 1034474 - B2G NFC: onpeerlost is never called. r=dimi
From 6342cf34f7493711317b613a8e30ef6badabcfd1 Mon Sep 17 00:00:00 2001
---
 dom/nfc/tests/marionette/test_nfc_peer.js | 10 +++++++++-
 dom/system/gonk/Nfc.js                    |  4 ++--
 2 files changed, 11 insertions(+), 3 deletions(-)
2014-07-07 11:56:29 +08:00
Dimi Lee
36a14cdd94 Bug 1035041 - [NFC] Add lost head.js for testcase. r=tzimmermann 2014-07-07 10:44:29 +08:00
Dimi Lee
ebe0d0ea89 Bug 1023079 - [NFC]Testcae for triggering tech-lost. r=tzimmermann 2014-07-04 10:21:18 +08:00
Dimi Lee
5611169209 Bug 1028037 - NFC testcase failure with error message 'Accessing TypedArray data over Xrays is slow'. r=bholley 2014-07-03 14:55:13 +08:00
Dimi Lee
1bcc2096d7 Bug 1027479 - Testcase for reading NDEF data from type 4 tag. r=tzimmermann 2014-07-02 14:23:02 +08:00
Dimi Lee
6f5af2bbff Bug 1023683 - Testcase for reading NDEF data from type 3 tag. r=tzimmermann 2014-07-01 14:44:39 +08:00
Dimi Lee
6c49290162 Bug 1028046 - NFC testcase failure with error message "setTagData undefined". r=yoshi 2014-06-20 16:41:07 +08:00
Thomas Zimmermann
ee93b497de Bug 980851 - Add Marionette test case for receiving NDEF message on P2P mode. r=dlee
This patch adds a test for receiving an NDEF message in P2P mode. The
content of the message is known beforehand and validated against
the reference message.
2014-06-17 03:52:00 -04:00
Thomas Zimmermann
640a3e3230 Bug 980851 - Move NFC emulator helpers to head.js. r=dlee
The functions |activateRE|, |notifyDiscoverRE|, and |setTagData| are
of general usefulness. They are now defined in the object |emulator|.
Callers have been adapted.
2014-06-10 02:21:00 -04:00
Carsten "Tomcat" Book
8a4ebf62ad merge b2g-inbound to mozilla-central a=merge 2014-06-17 14:23:57 +02:00
Ben Kelly
d96ec8b401 Bug 1025973 - Part 1: Rename GlobalObject::GetContext() to Context(). r=bz 2014-06-16 14:08:00 -04:00
Krzysztof Mioduszewski
487dbc6fa2 Bug 1019668 - Part 2: Re-enable missing marionette tests (error_messages, checkP2PRegistartion). r=allstars.chh 2014-06-09 05:34:00 -04:00
Krzysztof Mioduszewski
aaaebbae8c Bug 1019668 - Part 1: Don't add errorMsg if the status property is undefined. r=allstars.chh 2014-06-16 07:54:00 -04:00
Boris Zbarsky
c9eabf9d78 Bug 1009675 part 3. Return WebIDL 'object' values as handles. r=peterv 2014-06-11 16:26:52 -04:00
Gijs Kruitbosch
2333259d84 Bug 1022003 - remove ObjectWrapper.jsm, r=bholley,gwagner
--HG--
extra : rebase_source : cdafaf22aaddbb04519a9bc1099b6a10f7b6c886
2014-06-10 16:15:42 +01:00