Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-24 02:35:41 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
495,407 Commits 615 Branches 98 Tags 5.9 GiB
f3cb1ffcb6
Commit Graph

302 Commits

Author SHA1 Message Date
Yoshi Huang
c1ccc522ea Bug 1165841 - Part 3: remove _rfState and init from NfcContentHelper. r=dimi 2015-05-20 17:10:17 +08:00
Yoshi Huang
2338dbd5cc Bug 1165841 - Part 2: move window-related code to nsNfc.js. r=dimi 2015-05-20 17:06:38 +08:00
Yoshi Huang
8d2f50875a Bug 1165841 - Part 1: add window into nsINfcEventListener. r=dimi 2015-05-20 16:36:16 +08:00
Dimi Lee
225aad3115 Bug 1162836 - Fix NFC marionette testcase fail. r=yoshi 
--HG--
extra : rebase_source : f2d6affd0c6fb42805ad9e3220532399cb9f6322
 2015-05-19 20:29:25 +08:00
Thomas Zimmermann
840f154d6b Bug 1164425: Cleanup interfaces of |ListenSocket|, r=kmachulis 
This patch removes |ListenSocket::GetSocketAddr|, which is unused
and not thread-safe. The |Listen| methods now return error codes.
 2015-05-20 10:50:43 +02:00
Carsten "Tomcat" Book
1a15bd1430 Backed out changeset 17bd0777339a (bug 1164425) 2015-05-20 10:30:55 +02:00
Thomas Zimmermann
6a46c5c7cf Bug 1164425: Cleanup interfaces of |ListenSocket|, r=kmachulis 
This patch removes |ListenSocket::GetSocketAddr|, which is unused
and not thread-safe. The |Listen| methods now return error codes.
 2015-05-20 09:54:27 +02:00
Thomas Zimmermann
62b1926054 Bug 1161020: Implement new socket-connector interface for NFC, r=allstars.chh 
This patch moves |NfcConnector| into its own file and implements
the new socket-connector interface.
 2015-05-19 13:28:46 +02:00
Andrea Marchesini
3aa189b5ff Bug 1163388 - patch 2 - get rid of nsIDOMFile, r=ehsan 
--HG--
rename : dom/base/nsIDOMFile.idl => dom/base/nsIDOMBlob.idl
 2015-05-18 14:52:26 +01:00
Andrew McCreight
9e8f4b219e Bug 1152551, part 2 - Fix mode lines in dom/. r=jst 2015-05-03 15:32:37 -04:00
Thomas Zimmermann
7f554d1a7f Bug 1156352: Remove |UnixSocketRawData| from NFC interfaces, r=allstars.chh 2015-04-23 13:48:48 +02:00
Andrea Marchesini
789ad8312d Bug 1156632 - Remove unused forward class declarations - patch 3 - dom/{events,xbl,xslt,xul} and others, r=ehsan 2015-04-22 08:29:18 +02:00
Thomas Zimmermann
bfbe1d4602 Bug 1154281: Don't include UnixSocket.h in NFC, r=allstars.chh 
NFC only requires |UnixSocketRawData|, which is defined in SocketBase.h.
 2015-04-21 10:33:06 +02:00
Yoshi Huang
f04dbfcc12 Bug 1156208 - this.nfc.getErrorMessage is not a function. r=dimi 
From 810bdc26b4f20b448212f32458fa43b7a5e573bf Mon Sep 17 00:00:00 2001
---
 dom/nfc/gonk/Nfc.js | 4 ++++
 1 file changed, 4 insertions(+)
 2015-04-20 17:47:24 +08:00
Yoshi Huang
0a6632197d Bug 1152667 - Remove NfcGonkMessage.h r=dimi 
From 391484fa778ea08a5041bece49ef4ee14e13c7a4 Mon Sep 17 00:00:00 2001
---
 dom/nfc/gonk/NfcGonkMessage.h      | 44 --------------------------------------
 dom/nfc/gonk/NfcMessageHandler.cpp |  8 ++++---
 dom/nfc/gonk/NfcService.cpp        |  1 -
 3 files changed, 5 insertions(+), 48 deletions(-)
 delete mode 100644 dom/nfc/gonk/NfcGonkMessage.h
 2015-04-09 15:54:02 +08:00
Yoshi Huang
1c8a65a91a Bug 1127735 - Update TechDiscoveredNotication. r=smaug, dimi 2015-03-25 11:16:42 +08:00
Yoshi Huang
a4d03f3431 Bug 1146270 - Move HCI Event Origin into NfcOptions.webidl. r=smaug, dimi 2015-03-24 17:19:48 +08:00
Andrea Marchesini
e6f385fb3d Bug 1148527 - Indentation fix after bug 1145631, r=ehsan 2015-03-27 18:52:19 +00:00
Ehsan Akhgari
883849ee32 Bug 1145631 - Part 1: Replace MOZ_OVERRIDE and MOZ_FINAL with override and final in the tree; r=froydnj 
This patch was automatically generated using the following script:

function convert() {
echo "Converting $1 to $2..."
find . \
       ! -wholename "*/.git*" \
       ! -wholename "obj-ff-dbg*" \
         -type f \
      \( -iname "*.cpp" \
         -o -iname "*.h" \
         -o -iname "*.c" \
         -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_OVERRIDE override
convert MOZ_FINAL final
 2015-03-21 12:28:04 -04:00
Boris Zbarsky
dc24477d79 Bug 1117172 part 3. Change the wrappercached WrapObject methods to allow passing in aGivenProto. r=peterv 
The only manual changes here are to BindingUtils.h, BindingUtils.cpp,
Codegen.py, Element.cpp, IDBFileRequest.cpp, IDBObjectStore.cpp,
dom/workers/Navigator.cpp, WorkerPrivate.cpp, DeviceStorageRequestChild.cpp,
Notification.cpp, nsGlobalWindow.cpp, MessagePort.cpp, nsJSEnvironment.cpp,
Sandbox.cpp, XPCConvert.cpp, ExportHelpers.cpp, and DataStoreService.cpp.  The
rest of this diff was generated by running the following commands:

  find . -name "*.h" -o -name "*.cpp" | xargs perl -pi -e 'BEGIN { $/ = undef } s/(WrapObjectInternal\(JSContext *\* *(?:aCx|cx|aContext|aCtx|js))\)/\1, JS::Handle<JSObject*> aGivenProto)/g'

  find . -name "*.h" -o -name "*.cpp" | xargs perl -pi -e 'BEGIN { $/ = undef } s/(WrapObjectInternal\((?:aCx|cx|aContext|aCtx|js))\)/\1, aGivenProto)/g'

  find . -name "*.h" -o -name "*.cpp" | xargs perl -pi -e 'BEGIN { $/ = undef } s/(WrapNode\(JSContext *\* *(?:aCx|cx|aContext|aCtx|js))\)/\1, JS::Handle<JSObject*> aGivenProto)/g'

  find . -name "*.h" -o -name "*.cpp" | xargs perl -pi -e 'BEGIN { $/ = undef } s/(WrapNode\((?:aCx|cx|aContext|aCtx|js))\)/\1, aGivenProto)/g'

  find . -name "*.h" -o -name "*.cpp" | xargs perl -pi -e 'BEGIN { $/ = undef } s/(WrapObject\(JSContext *\* *(?:aCx|cx|aContext|aCtx|js))\)/\1, JS::Handle<JSObject*> aGivenProto)/g'

  find . -name "*.h" -o -name "*.cpp" | xargs perl -pi -e 'BEGIN { $/ = undef } s/(Binding(?:_workers)?::Wrap\((?:aCx|cx|aContext|aCtx|js), [^,)]+)\)/\1, aGivenProto)/g'
 2015-03-19 10:13:33 -04:00
Thomas Zimmermann
1ce878358e Bug 1109592 - Listen for connections from NFC daemon. r=allstars.chh 
This patch inverses the connection setup procedure between Gecko
and nfcd. Gecko now installs a listen socket and starts nfcd from
the init scripts. Nfcd establishes the connection by connecting
to Gecko's socket.

As a side effect of this patch, nfcd only runs while NFC is switched
on. This saves ~1.6 MiB os memory with contemporary NFC drivers on
flame-kk.
 2015-03-11 03:38:00 -04:00
Thomas Zimmermann
7c78ff1393 Bug 1109592 - Forward socket state from |NfcSocketListener|. r=allstars.chh 
This patch allows to handle changes to the socket state at a higher
level than |NfcSocketListener|.
 2015-03-09 03:27:00 -04:00
Thomas Zimmermann
cf680688ae Bug 1109592 - Only open connection to nfcd while NFC is switched on. r=allstars.chh 
With this patch Gecko only creates a connection to nfcd while NFC is
switched on, and closes the connection after NFC has been switched off.

While the connection is being opened, commands to nfcd are held in a
waiting queue. Gecko flushes the queue after it connected successfully
to nfcd.

As a side effect of this patch, the NFC thread only exists while NFC
is switched on.
 2015-03-12 07:43:00 -04:00
Yoshi Huang
0c1fbb4d87 Bug 1141457 - Part 3: add a CommandMsgTable. r=dimi 
From 7650a8e6a0ab634b90c85c0fa85a096e7d0f4ec9 Mon Sep 17 00:00:00 2001
---
 dom/nfc/gonk/Nfc.js | 36 +++++++++++++-----------------------
 1 file changed, 13 insertions(+), 23 deletions(-)
 2015-03-10 17:06:56 +08:00
Yoshi Huang
36a9d0e2e1 Bug 1141457 - Part 2: add isP2P for writeNDEF. r=dimi 
From 35af6fe22fa075ecef92cd84e2ce22357c9c395f Mon Sep 17 00:00:00 2001
---
 dom/nfc/NfcContentHelper.js     | 5 +++--
 dom/nfc/gonk/Nfc.js             | 1 -
 dom/nfc/nsINfcContentHelper.idl | 5 ++++-
 dom/nfc/nsNfc.js                | 4 ++--
 4 files changed, 9 insertions(+), 6 deletions(-)
 2015-03-10 16:49:08 +08:00
Yoshi Huang
45d8dca2a9 Bug 1141457 - Part 1: Move SendFile to gMessageManager. r=dimi 
From 4bb362a58ce6fb1bf32efd8a5202f28aa909f5f1 Mon Sep 17 00:00:00 2001
---
 dom/nfc/gonk/Nfc.js | 31 +++++++++++++++----------------
 1 file changed, 15 insertions(+), 16 deletions(-)
 2015-03-05 17:43:43 +08:00
Thomas Zimmermann
6d0aec9592 Bug 1140383: Add fast path for NFC:QueryInfo, r=allstars.chh 
Messages of type NFC:QueryInfo return local RF state. We don't need
the NFC Service, so we can return early.
 2015-03-10 13:51:57 +01:00
Thomas Zimmermann
bdb2ed0946 Bug 1137151: Marked destructor of |MozNDEFRecord| as protected, r=allstars.chh 2015-03-10 13:44:01 +01:00
Yoshi Huang
426943a021 Bug 933665 - Remove encodeNdefRecords func from NfcContentHelper. r=dimi 2015-03-05 18:58:37 +08:00
Yoshi Huang
642ea0f3ee Bug 1139830 - Make type/id/payload nullable in MozNDEFRecordOptions. r=smaug 2015-03-06 16:23:21 +08:00
Yoshi Huang
38c3210ae5 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
85cb62e955 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
068be00fd1 Bug 1121298 - Part 2: Add Constructor(uri) for MozNDEFRecord. r=smaug, dimi 2015-01-29 18:16:26 +08:00
Yoshi Huang
52582b044c 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
620b926b7f Bug 1137107 - Part 2: Add NfcResponseType and NfcNotificationType. r=smaug, dimi 2015-02-26 17:23:17 +08:00
Yoshi Huang
2ef55ccc43 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
0e0b7bb9ae 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
7e0bbe496b 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
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
Yoshi Huang
6f58df1cee Bug 1100285 - sessionId shouldn't be added in nfc-manager-send-file. r=dimi 2014-11-17 18:51:40 +08:00
Jonathan Hao
c57d2071c2 Bug 1086179 - Add a format API to MozNFCTag. r=smaug, allstars.chh 2014-11-18 09:52:39 +08:00
Yoshi Huang
2fb937a8ba Bug 1098975 - sessionToken is missing in _createNFCPeer in nsNfc.js. r=dimi 2014-11-14 16:03:16 +08:00
Yoshi Huang
65bd5d6b15 Bug 1098253 - get rfState from nfcd. r=dimi 
From 2c8fd495054e6bd3bd93561e20518a47f6f6bc64 Mon Sep 17 00:00:00 2001
---
 dom/nfc/gonk/NfcGonkMessage.h      | 2 +-
 dom/nfc/gonk/NfcMessageHandler.cpp | 5 +----
 dom/nfc/gonk/NfcMessageHandler.h   | 1 -
 3 files changed, 2 insertions(+), 6 deletions(-)
 2014-11-13 19:20:37 +08:00
Yoshi Huang
51445b181a Bug 1096897 - Part 2: change power to changeRFState. r=dimi 
From 4ca465353c1c5bd5bc08f40195ad66cc1c407549 Mon Sep 17 00:00:00 2001
---
 dom/nfc/NfcContentHelper.js        | 30 ++++++------------------------
 dom/nfc/gonk/Nfc.js                | 26 ++++++--------------------
 dom/nfc/gonk/NfcGonkMessage.h      |  4 ++--
 dom/nfc/gonk/NfcMessageHandler.cpp | 20 ++++++++++----------
 dom/nfc/gonk/NfcMessageHandler.h   |  4 ++--
 dom/nfc/nsINfcContentHelper.idl    | 21 +++++----------------
 dom/nfc/nsNfc.js                   | 13 ++++++++++---
 7 files changed, 41 insertions(+), 77 deletions(-)
 2014-11-12 10:13:33 +08:00
Yoshi Huang
237e4a7bc6 Bug 1096897 - Part 1: s/powerLevel/rfState/g. r=smaug, dimi 
From b9ec1a996afb8d50d014e3e479a7c767df2555ac Mon Sep 17 00:00:00 2001
---
 dom/nfc/gonk/Nfc.js                | 14 +++++++-------
 dom/nfc/gonk/NfcMessageHandler.cpp | 10 +++++-----
 dom/nfc/gonk/NfcMessageHandler.h   |  2 +-
 dom/nfc/gonk/NfcOptions.h          | 18 +++++++++---------
 dom/nfc/gonk/NfcService.cpp        |  8 +++++++-
 dom/nfc/gonk/nfc_consts.js         |  8 +++-----
 dom/webidl/NfcOptions.webidl       | 10 ++++++++--
 7 files changed, 40 insertions(+), 30 deletions(-)
 2014-11-11 19:19:52 +08:00
Yoshi Huang
974b6f055e Bug 1097442 - Part 2: rename nsINfcEventListener. r=dimi 
From f2abd94c7d0c1f79c55b813bcd32a1b2761949d1 Mon Sep 17 00:00:00 2001
---
 dom/nfc/gonk/Nfc.js             | 2 +-
 dom/nfc/gonk/NfcService.cpp     | 2 +-
 dom/nfc/gonk/NfcService.h       | 2 +-
 dom/nfc/gonk/nsINfcService.idl  | 8 ++++----
 dom/nfc/nsINfcContentHelper.idl | 6 +++---
 dom/nfc/nsNfc.js                | 2 +-
 6 files changed, 11 insertions(+), 11 deletions(-)
 2014-11-12 11:22:36 +08:00
Yoshi Huang
4d754498a8 Bug 1097442 - Part 1: rename eventTarget to eventListener. r=dimi 
From 3e4d4deffb10f715e03725700d4078aa98cc1803 Mon Sep 17 00:00:00 2001
---
 dom/nfc/NfcContentHelper.js     | 18 +++++++++---------
 dom/nfc/gonk/Nfc.js             | 28 ++++++++++++++--------------
 dom/nfc/nsINfcContentHelper.idl | 13 +++++++------
 dom/nfc/nsNfc.js                |  4 ++--
 4 files changed, 32 insertions(+), 31 deletions(-)
 2014-11-12 10:26:09 +08:00
Yoshi Huang
3ea6f7d232 Bug 1087925 - calling some NFCTag API should throw if the condition is not met. r=smaug, dimi 2014-11-05 17:43:54 +08:00
Yoshi Huang
df0810a717 Bug 1094669 - Add a size attribute for MozNDEFRecord. r=smaug, dimi 
From 2f518e162998b4ac911b3e10f8a7f8177fe03f59 Mon Sep 17 00:00:00 2001
---
 dom/nfc/MozNDEFRecord.cpp       | 7 +++++++
 dom/nfc/MozNDEFRecord.h         | 6 ++++++
 dom/webidl/MozNDEFRecord.webidl | 6 ++++++
 3 files changed, 19 insertions(+)
 2014-11-07 14:24:34 +08:00
Yoshi Huang
fab2c29426 Bug 1055460 - replace config request with power request. r=dimi 
From 2860c6c7d3783e0f7cf71bcaacbc324dc288c8af Mon Sep 17 00:00:00 2001
---
 dom/nfc/NfcContentHelper.js        |  4 ++--
 dom/nfc/gonk/Nfc.js                | 18 +++++++-----------
 dom/nfc/gonk/NfcGonkMessage.h      |  6 +++---
 dom/nfc/gonk/NfcMessageHandler.cpp | 20 ++++++++++----------
 dom/nfc/gonk/NfcMessageHandler.h   |  4 ++--
 5 files changed, 24 insertions(+), 28 deletions(-)
 2014-11-06 17:57:49 +08:00
Yoshi Huang
6522c9ac46 Bug 1085301 - B2G NFC: Don't check sessionToken in notifyPeerFound. r=dimi 2014-11-05 11:09:37 +08:00