wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

bug 708171 - XUL fennec hangs on start up r=mbrubeck

Browse Source
This commit is contained in:
Brad Lassey 2011-12-06 20:24:33 -08:00
parent f191bfb16a
commit 27d840f642
3 changed files with 47 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
embedding/android/GeckoAppShell.java
View File

@ -73,6 +73,9 @@ import android.net.NetworkInfo;
import android.graphics.drawable.*;
import android.graphics.Bitmap;
import org.json.JSONArray;
import org.json.JSONObject;
public class GeckoAppShell
{
private static final String LOG_FILE_NAME = "GeckoAppShell";
@ -1629,10 +1632,6 @@ public class GeckoAppShell
}
}
// unused
public static String handleGeckoMessage(String message) {
return "";
}
// unused
static void checkUriVisited(String uri) {}
// unused
@ -1645,6 +1644,27 @@ public class GeckoAppShell
GeckoBatteryManager.enableNotifications();
}
public static String handleGeckoMessage(String message) {
//
// {"gecko": {
// "type": "value",
// "event_specific": "value",
// ....
try {
JSONObject json = new JSONObject(message);
final JSONObject geckoObject = json.getJSONObject("gecko");
String type = geckoObject.getString("type");
if (type.equals("Gecko:Ready")) {
onAppShellReady();
}
} catch (Exception e) {
Log.i(LOG_FILE_NAME, "handleGeckoMessage throws " + e);
}
return "";
}
public static void disableBatteryNotifications() {
GeckoBatteryManager.disableNotifications();
}

21
mobile/xul/chrome/content/browser.js
View File

@ -53,6 +53,16 @@ let Ci = Components.interfaces;
let Cu = Components.utils;
let Cr = Components.results;
function getBridge() {
return Cc["@mozilla.org/android/bridge;1"].getService(Ci.nsIAndroidBridge);
}
function sendMessageToJava(aMessage) {
return getBridge().handleGeckoMessage(JSON.stringify(aMessage));
}
function getBrowser() {
return Browser.selectedBrowser;
}
@ -166,7 +176,16 @@ var Browser = {
startup: function startup() {
var self = this;
try {
sendMessageToJava({
gecko: {
type: "Gecko:Ready"
}
});
} catch(e) {
Cu.reportError("error sending message: " + e);
}
try {
messageManager.loadFrameScript("chrome://browser/content/Util.js", true);
messageManager.loadFrameScript("chrome://browser/content/forms.js", true);

3
mobile/xul/installer/package-manifest.in
View File

@ -267,6 +267,9 @@
#ifdef XP_MACOSX
@BINPATH@/components/widget_cocoa.xpt
#endif
#ifdef ANDROID
@BINPATH@/components/widget_android.xpt
#endif
@BINPATH@/components/windowds.xpt
@BINPATH@/components/windowwatcher.xpt
@BINPATH@/components/xpcom_base.xpt