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

Backed out changeset 0b0b229e5968 (bug 1257319) for causing merge conflicts when uplifting to mozilla-central

Browse Source
This commit is contained in:
Carsten "Tomcat" Book
2016-03-23 10:55:31 +01:00
parent 2f09f0fe61
commit 684f8d7e60
2 changed files with 1 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
widget/android/nsAppShell.cpp
View File

@@ -184,44 +184,6 @@ public:
}
};
class GeckoAppShellSupport final
: public widget::GeckoAppShell::Natives<GeckoAppShellSupport>
, public UsesGeckoThreadProxy
{
public:
template<typename Functor>
static void OnNativeCall(Functor&& aCall)
{
if (aCall.IsTarget(&SyncNotifyObservers)) {
aCall();
return;
}
return UsesGeckoThreadProxy::OnNativeCall(aCall);
}
static void SyncNotifyObservers(jni::String::Param aTopic,
jni::String::Param aData)
{
MOZ_RELEASE_ASSERT(NS_IsMainThread());
NotifyObservers(aTopic, aData);
}
static void NotifyObservers(jni::String::Param aTopic,
jni::String::Param aData)
{
MOZ_ASSERT(NS_IsMainThread());
MOZ_ASSERT(aTopic);
nsCOMPtr<nsIObserverService> obsServ = services::GetObserverService();
if (!obsServ) {
return;
}
obsServ->NotifyObservers(nullptr, aTopic->ToCString().get(),
aData ? aData->ToString().get() : nullptr);
}
};
nsAppShell::nsAppShell()
: mSyncRunFinished(*(sAppShellLock = new Mutex("nsAppShell")),
"nsAppShell.SyncRun")
@@ -239,7 +201,6 @@ nsAppShell::nsAppShell()
if (jni::IsAvailable()) {
// Initialize JNI and Set the corresponding state in GeckoThread.
AndroidBridge::ConstructBridge();
GeckoAppShellSupport::Init();
GeckoThreadNatives::Init();
mozilla::ANRReporter::Init();
mozilla::PrefsHelper::Init();