Bug 1285572 - Remove LOAD_URI event; r=snorp

Remove the LOAD_URI event, which is now obsolete, from GeckoEvent.
This commit is contained in:
Jim Chen 2016-07-20 21:43:34 -04:00
Родитель facb8d1cd1
Коммит fa5754f73b
4 изменённых файлов: 0 добавлений и 52 удалений

Просмотреть файл

@ -66,7 +66,6 @@ public class GeckoEvent {
public enum NativeGeckoEvent {
NATIVE_POKE(0),
MOTION_EVENT(2),
LOAD_URI(12),
NOOP(15),
VIEWPORT(20),
NETWORK_CHANGED(22),
@ -351,20 +350,6 @@ public class GeckoEvent {
return event;
}
public static GeckoEvent createURILoadEvent(String uri) {
GeckoEvent event = GeckoEvent.get(NativeGeckoEvent.LOAD_URI);
event.mCharacters = uri;
event.mCharactersExtra = "";
return event;
}
public static GeckoEvent createBookmarkLoadEvent(String uri) {
GeckoEvent event = GeckoEvent.get(NativeGeckoEvent.LOAD_URI);
event.mCharacters = uri;
event.mCharactersExtra = "-bookmark";
return event;
}
public static GeckoEvent createNetworkEvent(int connectionType, boolean isWifi, int DHCPGateway, String status) {
GeckoEvent event = GeckoEvent.get(NativeGeckoEvent.NETWORK_CHANGED);
event.mConnectionType = connectionType;

Просмотреть файл

@ -314,12 +314,6 @@ AndroidGeckoEvent::Init(JNIEnv *jenv, jobject jobj)
break;
case LOAD_URI: {
ReadCharactersField(jenv);
ReadCharactersExtraField(jenv);
break;
}
case VIEWPORT: {
ReadCharactersField(jenv);
ReadCharactersExtraField(jenv);

Просмотреть файл

@ -604,7 +604,6 @@ public:
enum {
NATIVE_POKE = 0,
MOTION_EVENT = 2,
LOAD_URI = 12,
NOOP = 15,
APZ_INPUT_EVENT = 17, // used internally in AndroidJNI/nsAppShell/nsWindow
VIEWPORT = 20,

Просмотреть файл

@ -802,36 +802,6 @@ nsAppShell::LegacyGeckoEvent::Run()
break;
}
case AndroidGeckoEvent::LOAD_URI: {
nsCOMPtr<nsICommandLineRunner> cmdline
(do_CreateInstance("@mozilla.org/toolkit/command-line;1"));
if (!cmdline)
break;
if (curEvent->Characters().Length() == 0)
break;
char *uri = ToNewUTF8String(curEvent->Characters());
if (!uri)
break;
char *flag = ToNewUTF8String(curEvent->CharactersExtra());
const char *argv[4] = {
"dummyappname",
"-url",
uri,
flag ? flag : ""
};
nsresult rv = cmdline->Init(4, argv, nullptr, nsICommandLine::STATE_REMOTE_AUTO);
if (NS_SUCCEEDED(rv))
cmdline->Run();
free(uri);
if (flag)
free(flag);
break;
}
case AndroidGeckoEvent::NETWORK_CHANGED: {
hal::NotifyNetworkChange(hal::NetworkInformation(curEvent->ConnectionType(),
curEvent->IsWifi(),