зеркало из https://github.com/mozilla/gecko-dev.git
Bug 1285572 - Remove LOAD_URI event; r=snorp
Remove the LOAD_URI event, which is now obsolete, from GeckoEvent.
This commit is contained in:
Родитель
facb8d1cd1
Коммит
fa5754f73b
|
@ -66,7 +66,6 @@ public class GeckoEvent {
|
||||||
public enum NativeGeckoEvent {
|
public enum NativeGeckoEvent {
|
||||||
NATIVE_POKE(0),
|
NATIVE_POKE(0),
|
||||||
MOTION_EVENT(2),
|
MOTION_EVENT(2),
|
||||||
LOAD_URI(12),
|
|
||||||
NOOP(15),
|
NOOP(15),
|
||||||
VIEWPORT(20),
|
VIEWPORT(20),
|
||||||
NETWORK_CHANGED(22),
|
NETWORK_CHANGED(22),
|
||||||
|
@ -351,20 +350,6 @@ public class GeckoEvent {
|
||||||
return event;
|
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) {
|
public static GeckoEvent createNetworkEvent(int connectionType, boolean isWifi, int DHCPGateway, String status) {
|
||||||
GeckoEvent event = GeckoEvent.get(NativeGeckoEvent.NETWORK_CHANGED);
|
GeckoEvent event = GeckoEvent.get(NativeGeckoEvent.NETWORK_CHANGED);
|
||||||
event.mConnectionType = connectionType;
|
event.mConnectionType = connectionType;
|
||||||
|
|
|
@ -314,12 +314,6 @@ AndroidGeckoEvent::Init(JNIEnv *jenv, jobject jobj)
|
||||||
|
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case LOAD_URI: {
|
|
||||||
ReadCharactersField(jenv);
|
|
||||||
ReadCharactersExtraField(jenv);
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
|
|
||||||
case VIEWPORT: {
|
case VIEWPORT: {
|
||||||
ReadCharactersField(jenv);
|
ReadCharactersField(jenv);
|
||||||
ReadCharactersExtraField(jenv);
|
ReadCharactersExtraField(jenv);
|
||||||
|
|
|
@ -604,7 +604,6 @@ public:
|
||||||
enum {
|
enum {
|
||||||
NATIVE_POKE = 0,
|
NATIVE_POKE = 0,
|
||||||
MOTION_EVENT = 2,
|
MOTION_EVENT = 2,
|
||||||
LOAD_URI = 12,
|
|
||||||
NOOP = 15,
|
NOOP = 15,
|
||||||
APZ_INPUT_EVENT = 17, // used internally in AndroidJNI/nsAppShell/nsWindow
|
APZ_INPUT_EVENT = 17, // used internally in AndroidJNI/nsAppShell/nsWindow
|
||||||
VIEWPORT = 20,
|
VIEWPORT = 20,
|
||||||
|
|
|
@ -802,36 +802,6 @@ nsAppShell::LegacyGeckoEvent::Run()
|
||||||
break;
|
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: {
|
case AndroidGeckoEvent::NETWORK_CHANGED: {
|
||||||
hal::NotifyNetworkChange(hal::NetworkInformation(curEvent->ConnectionType(),
|
hal::NotifyNetworkChange(hal::NetworkInformation(curEvent->ConnectionType(),
|
||||||
curEvent->IsWifi(),
|
curEvent->IsWifi(),
|
||||||
|
|
Загрузка…
Ссылка в новой задаче