wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 1097442 - Part 2: rename nsINfcEventListener. r=dimi

Browse Source 
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(-)
This commit is contained in:
Yoshi Huang 2014-11-12 11:22:36 +08:00
parent 7b50cbd594
commit 40974d05e0
6 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dom/nfc/gonk/Nfc.js
View File

@ -450,7 +450,7 @@ Nfc.prototype = {
classDescription: "Nfc",
interfaces: [Ci.nsINfcService]}),
QueryInterface: XPCOMUtils.generateQI([Ci.nsIObserver, Ci.nsINfcEventListener]),
QueryInterface: XPCOMUtils.generateQI([Ci.nsIObserver, Ci.nsINfcGonkEventListener]),
powerLevel: NFC.NFC_POWER_LEVEL_UNKNOWN,

2
dom/nfc/gonk/NfcService.cpp
View File

@ -267,7 +267,7 @@ NfcService::FactoryCreate()
}
NS_IMETHODIMP
NfcService::Start(nsINfcEventListener* aListener)
NfcService::Start(nsINfcGonkEventListener* aListener)
{
MOZ_ASSERT(NS_IsMainThread());
MOZ_ASSERT(aListener);

2
dom/nfc/gonk/NfcService.h
View File

@ -41,7 +41,7 @@ private:
~NfcService();
nsCOMPtr<nsIThread> mThread;
nsCOMPtr<nsINfcEventListener> mListener;
nsCOMPtr<nsINfcGonkEventListener> mListener;
nsRefPtr<mozilla::ipc::NfcConsumer> mConsumer;
nsAutoPtr<NfcMessageHandler> mHandler;
};

8
dom/nfc/gonk/nsINfcService.idl
View File

@ -4,16 +4,16 @@
#include "nsISupports.idl"
[scriptable, uuid(976d2074-cb40-41f7-a195-8feee42eaace)]
interface nsINfcEventListener : nsISupports
[scriptable, uuid(cc9f1e96-fddc-4d98-8399-8d11c4f640aa)]
interface nsINfcGonkEventListener : nsISupports
{
void onEvent(in jsval event);
};
[scriptable, uuid(0329e687-87ff-4cf5-8aa5-e876d9d4a375)]
[scriptable, uuid(8beeb4cd-5661-4e67-83ca-d335f0801484)]
interface nsINfcService : nsISupports
{
void start(in nsINfcEventListener listener);
void start(in nsINfcGonkEventListener listener);
void shutdown();
[implicit_jscontext]

6
dom/nfc/nsINfcContentHelper.idl
View File

@ -23,7 +23,7 @@ interface nsINfcTagEvent : nsISupports
};
[scriptable, uuid(42c7a85f-59ae-4bde-b961-e1f1436476c3)]
interface nsINfcDOMEventListener : nsISupports
interface nsINfcEventListener : nsISupports
{
/**
* Callback function used to notify tagfound.
@ -103,9 +103,9 @@ interface nsINfcContentHelper : nsISupports
* Add the event listener.
*
* @param listener
* An instance of the nsINfcDOMEventListener.
* An instance of the nsINfcEventListener.
*/
void addEventListener(in nsINfcDOMEventListener listener);
void addEventListener(in nsINfcEventListener listener);
/**
* Register the given application id with parent process

2
dom/nfc/nsNfc.js
View File

@ -389,7 +389,7 @@ MozNFCImpl.prototype = {
contractID: "@mozilla.org/navigatorNfc;1",
QueryInterface: XPCOMUtils.generateQI([Ci.nsISupports,
Ci.nsIDOMGlobalPropertyInitializer,
Ci.nsINfcDOMEventListener]),
Ci.nsINfcEventListener]),
};
this.NSGetFactory = XPCOMUtils.generateNSGetFactory([MozNFCTagImpl,