Bug 591047 - (1/7) Backing out Android a1 IME code from bug 581535 and bug 582644; r=blassey a=blocking-fennec

This commit is contained in:
Brad Lassey
2010-09-23 23:28:15 -04:00
parent 3d4a517aba
commit e83a91d636
14 changed files with 2 additions and 184 deletions

View File

@@ -38,7 +38,6 @@
#include <android/log.h>
#ifdef MOZ_IPC
#include "mozilla/dom/ContentChild.h"
#include "nsXULAppAPI.h"
#endif
#include <pthread.h>
@@ -199,12 +198,6 @@ AndroidBridge::NotifyIME(int aType, int aState)
if (sBridge)
JNI()->CallStaticVoidMethod(sBridge->mGeckoAppShellClass,
sBridge->jNotifyIME, aType, aState);
#ifdef MOZ_IPC
// It's possible that we are in chrome process
// but sBridge is not initialized yet
else if (XRE_GetProcessType() == GeckoProcessType_Content)
mozilla::dom::ContentChild::GetSingleton()->SendNotifyIME(aType, aState);
#endif
}
void
@@ -212,11 +205,6 @@ AndroidBridge::NotifyIMEChange(const PRUnichar *aText, PRUint32 aTextLen,
int aStart, int aEnd, int aNewEnd)
{
if (!sBridge) {
#ifdef MOZ_IPC
mozilla::dom::ContentChild::GetSingleton()->
SendNotifyIMEChange(nsAutoString(aText), aTextLen,
aStart, aEnd, aNewEnd);
#endif
return;
}