Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-24 05:11:16 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1362195 - 1. Add EventDispatcher::Dispatch for C++ code; r=snorp

Browse Source 
Add an EventDispatcher::Dispatch function for C++ code, so native code
can dispatch events to JS/Java.
This commit is contained in:
Jim Chen 2017-05-11 16:40:17 -04:00
parent 18c0a5d9ca
commit 34b8e70127
2 changed files with 47 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
widget/android/EventDispatcher.cpp
View File

@ -546,7 +546,7 @@ UnboxData(jni::String::Param aEvent, JSContext* aCx, jni::Object::Param aData,
} else if (!jniData || jniData.IsInstanceOf<java::GeckoBundle>()) {
rv = UnboxBundle(aCx, jniData, aOut);
}
if (rv != NS_ERROR_INVALID_ARG) {
if (rv != NS_ERROR_INVALID_ARG || !aEvent) {
return rv;
}
@ -719,6 +719,22 @@ EventDispatcher::DispatchOnGecko(ListenersList* list, const nsAString& aEvent,
return NS_OK;
}
java::EventDispatcher::NativeCallbackDelegate::LocalRef
EventDispatcher::WrapCallback(nsIAndroidEventCallback* aCallback)
{
java::EventDispatcher::NativeCallbackDelegate::LocalRef
callback(jni::GetGeckoThreadEnv());
if (aCallback) {
callback = java::EventDispatcher::NativeCallbackDelegate::New();
NativeCallbackDelegateSupport::AttachNative(
callback,
MakeUnique<NativeCallbackDelegateSupport>(
aCallback, mDOMWindow));
}
return callback;
}
NS_IMETHODIMP
EventDispatcher::Dispatch(JS::HandleValue aEvent, JS::HandleValue aData,
nsIAndroidEventCallback* aCallback, JSContext* aCx)
@ -751,18 +767,32 @@ EventDispatcher::Dispatch(JS::HandleValue aEvent, JS::HandleValue aData,
NS_ENSURE_SUCCESS(rv, JS_IsExceptionPending(aCx) ? NS_OK : rv);
dom::AutoNoJSAPI nojsapi;
mDispatcher->DispatchToThreads(event, data, WrapCallback(aCallback));
return NS_OK;
}
java::EventDispatcher::NativeCallbackDelegate::LocalRef
callback(data.Env());
if (aCallback) {
callback = java::EventDispatcher::NativeCallbackDelegate::New();
NativeCallbackDelegateSupport::AttachNative(
callback,
MakeUnique<NativeCallbackDelegateSupport>(
aCallback, mDOMWindow));
nsresult
EventDispatcher::Dispatch(const char16_t* aEvent,
java::GeckoBundle::Param aData,
nsIAndroidEventCallback* aCallback)
{
nsDependentString event(aEvent);
ListenersList* list = mListenersMap.Get(event);
if (list) {
dom::AutoJSAPI jsapi;
JS::RootedValue data(jsapi.cx());
nsresult rv = UnboxData(/* Event */ nullptr, jsapi.cx(), aData, &data,
/* BundleOnly */ true);
NS_ENSURE_SUCCESS(rv, rv);
return DispatchOnGecko(list, event, data, aCallback);
}
mDispatcher->DispatchToThreads(event, data, callback);
if (!mDispatcher) {
return NS_OK;
}
mDispatcher->DispatchToThreads(event, aData, WrapCallback(aCallback));
return NS_OK;
}

7
widget/android/EventDispatcher.h
View File

@ -41,6 +41,10 @@ public:
nsPIDOMWindowOuter* aDOMWindow);
void Detach();
nsresult Dispatch(const char16_t* aEvent,
java::GeckoBundle::Param aData = nullptr,
nsIAndroidEventCallback* aCallback = nullptr);
using NativesBase::DisposeNative;
bool HasGeckoListener(jni::String::Param aEvent);
@ -83,6 +87,9 @@ private:
nsresult DispatchOnGecko(ListenersList* list, const nsAString& aEvent,
JS::HandleValue aData,
nsIAndroidEventCallback* aCallback);
java::EventDispatcher::NativeCallbackDelegate::LocalRef
WrapCallback(nsIAndroidEventCallback* aCallback);
};
} // namespace widget