corysanin/tubestation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug 1287946 - Update existing code to use mozilla::java; r=me

Browse Source
This commit is contained in:
Jim Chen
2016-07-21 00:42:26 -04:00
parent 550a6c6f80
commit 0ea27022be
67 changed files with 209 additions and 218 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
widget/android/AndroidBridge.cpp
View File

@@ -57,7 +57,7 @@
using namespace mozilla;
using namespace mozilla::gfx;
using namespace mozilla::jni;
using namespace mozilla::widget;
using namespace mozilla::java;
AndroidBridge* AndroidBridge::sBridge = nullptr;
pthread_t AndroidBridge::sJavaUiThread;
@@ -199,12 +199,12 @@ AndroidBridge::AndroidBridge()
JNIEnv* const jEnv = jni::GetGeckoThreadEnv();
AutoLocalJNIFrame jniFrame(jEnv);
mClassLoader = Object::GlobalRef(jEnv, widget::GeckoThread::ClsLoader());
mClassLoader = Object::GlobalRef(jEnv, java::GeckoThread::ClsLoader());
mClassLoaderLoadClass = GetMethodID(
jEnv, jEnv->GetObjectClass(mClassLoader.Get()),
"loadClass", "(Ljava/lang/String;)Ljava/lang/Class;");
mMessageQueue = widget::GeckoThread::MsgQueue();
mMessageQueue = java::GeckoThread::MsgQueue();
auto msgQueueClass = Class::LocalRef::Adopt(
jEnv, jEnv->GetObjectClass(mMessageQueue.Get()));
// mMessageQueueNext must not be null
@@ -925,7 +925,7 @@ AndroidBridge::HandleGeckoMessage(JSContext* cx, JS::HandleObject object)
{
ALOG_BRIDGE("%s", __PRETTY_FUNCTION__);
auto message = mozilla::widget::CreateNativeJSContainer(cx, object);
auto message = widget::CreateNativeJSContainer(cx, object);
GeckoAppShell::HandleGeckoMessageWrapper(message);
}