Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2025-02-04 21:18:35 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 993946 - B2G NFC: Consistent naming between Nfc or NFC in WebIDL. r=dimi, sr=smaug

Browse Source 
--HG--
rename : dom/webidl/MozNfc.webidl => dom/webidl/MozNFC.webidl
This commit is contained in:
Yoshi Huang 2014-04-29 11:50:25 +08:00
parent 4931520cb6
commit 13387ed757
4 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
dom/base/Navigator.cpp
View File

@ -2209,7 +2209,7 @@ Navigator::HasFMRadioSupport(JSContext* /* unused */, JSObject* aGlobal)
#ifdef MOZ_NFC
/* static */
bool
Navigator::HasNfcSupport(JSContext* /* unused */, JSObject* aGlobal)
Navigator::HasNFCSupport(JSContext* /* unused */, JSObject* aGlobal)
{
// Do not support NFC if NFC content helper does not exist.
nsCOMPtr<nsISupports> contentHelper = do_GetService("@mozilla.org/nfc/content-helper;1");
@ -2224,7 +2224,7 @@ Navigator::HasNfcSupport(JSContext* /* unused */, JSObject* aGlobal)
/* static */
bool
Navigator::HasNfcPeerSupport(JSContext* /* unused */, JSObject* aGlobal)
Navigator::HasNFCPeerSupport(JSContext* /* unused */, JSObject* aGlobal)
{
nsCOMPtr<nsPIDOMWindow> win = GetWindowFromGlobal(aGlobal);
return win && CheckPermission(win, "nfc-write");
@ -2232,7 +2232,7 @@ Navigator::HasNfcPeerSupport(JSContext* /* unused */, JSObject* aGlobal)
/* static */
bool
Navigator::HasNfcManagerSupport(JSContext* /* unused */, JSObject* aGlobal)
Navigator::HasNFCManagerSupport(JSContext* /* unused */, JSObject* aGlobal)
{
nsCOMPtr<nsPIDOMWindow> win = GetWindowFromGlobal(aGlobal);
return win && CheckPermission(win, "nfc-manager");

6
dom/base/Navigator.h
View File

@ -282,9 +282,9 @@ public:
static bool HasFMRadioSupport(JSContext* /* unused */, JSObject* aGlobal);
#endif // MOZ_B2G_FM
#ifdef MOZ_NFC
static bool HasNfcSupport(JSContext* /* unused */, JSObject* aGlobal);
static bool HasNfcPeerSupport(JSContext* /* unused */, JSObject* aGlobal);
static bool HasNfcManagerSupport(JSContext* /* unused */, JSObject* aGlobal);
static bool HasNFCSupport(JSContext* /* unused */, JSObject* aGlobal);
static bool HasNFCPeerSupport(JSContext* /* unused */, JSObject* aGlobal);
static bool HasNFCManagerSupport(JSContext* /* unused */, JSObject* aGlobal);
#endif // MOZ_NFC
#ifdef MOZ_TIME_MANAGER
static bool HasTimeSupport(JSContext* /* unused */, JSObject* aGlobal);

16
dom/webidl/MozNfc.webidl → dom/webidl/MozNFC.webidl
View File

@ -5,8 +5,8 @@
/* Copyright © 2013 Deutsche Telekom, Inc. */
[NoInterfaceObject,
Func="Navigator::HasNfcManagerSupport"]
interface MozNfcManager {
Func="Navigator::HasNFCManagerSupport"]
interface MozNFCManager {
/**
* API to check if the given application's manifest
* URL is registered with the Chrome Process or not.
@ -44,23 +44,23 @@ interface MozNfcManager {
[JSImplementation="@mozilla.org/navigatorNfc;1",
NavigatorProperty="mozNfc",
Func="Navigator::HasNfcSupport"]
interface MozNfc : EventTarget {
Func="Navigator::HasNFCSupport"]
interface MozNFC : EventTarget {
MozNFCTag getNFCTag(DOMString sessionId);
MozNFCPeer getNFCPeer(DOMString sessionId);
[Func="Navigator::HasNfcPeerSupport"]
[Func="Navigator::HasNFCPeerSupport"]
attribute EventHandler onpeerready;
[Func="Navigator::HasNfcPeerSupport"]
[Func="Navigator::HasNFCPeerSupport"]
attribute EventHandler onpeerlost;
};
// Mozilla Only
partial interface MozNfc {
partial interface MozNFC {
[ChromeOnly]
void eventListenerWasAdded(DOMString aType);
[ChromeOnly]
void eventListenerWasRemoved(DOMString aType);
};
MozNfc implements MozNfcManager;
MozNFC implements MozNFCManager;

2
dom/webidl/moz.build
View File

@ -557,7 +557,7 @@ if CONFIG['MOZ_B2G_RIL']:
if CONFIG['MOZ_NFC']:
WEBIDL_FILES += [
'MozNDEFRecord.webidl',
'MozNfc.webidl',
'MozNFC.webidl',
'MozNFCPeer.webidl',
'MozNFCTag.webidl',
]