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 930070 - GeckoView should handle not having fennec-specific classes r=mfinkle

Browse Source
This commit is contained in:
Brad Lassey 2013-10-23 18:33:56 +02:00
parent 478cc95532
commit 196fcbcb6a
5 changed files with 31 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
mobile/android/base/GeckoApp.java
View File

@ -172,7 +172,6 @@ abstract public class GeckoApp
public static int mOrientation;
protected boolean mIsRestoringActivity;
private String mCurrentResponse = "";
public static boolean sIsUsingCustomProfile = false;
private ContactService mContactService;
private PromptService mPromptService;
@ -1175,7 +1174,7 @@ abstract public class GeckoApp
if (profileName == null)
profileName = "default";
}
GeckoApp.sIsUsingCustomProfile = true;
GeckoProfile.sIsUsingCustomProfile = true;
}
if (profileName != null || profilePath != null) {

11
mobile/android/base/GeckoProfile.java
View File

@ -35,6 +35,7 @@ public final class GeckoProfile {
private final String mName;
private File mMozDir;
private File mDir;
public static boolean sIsUsingCustomProfile = false;
// Constants to cache whether or not a profile is "locked".
private enum LockState {
@ -60,7 +61,13 @@ public final class GeckoProfile {
}
public static GeckoProfile get(Context context) {
if (context instanceof GeckoApp) {
boolean isGeckoApp = false;
try {
isGeckoApp = context instanceof GeckoApp;
} catch (NoClassDefFoundError ex) {}
if (isGeckoApp) {
// Check for a cached profile on this context already
// TODO: We should not be caching profile information on the Activity context
if (((GeckoApp)context).mProfile != null) {
@ -74,7 +81,7 @@ public final class GeckoProfile {
return guest;
}
if (context instanceof GeckoApp) {
if (isGeckoApp) {
// Otherwise, get the default profile for the Activity
return get(context, ((GeckoApp)context).getDefaultProfileName());
}

2
mobile/android/base/GeckoThread.java
View File

@ -147,7 +147,7 @@ public class GeckoThread extends Thread implements GeckoEventListener {
if (args == null || !args.contains(BrowserApp.GUEST_BROWSING_ARG)) {
guest = " " + BrowserApp.GUEST_BROWSING_ARG;
}
} else if (!GeckoApp.sIsUsingCustomProfile) {
} else if (!GeckoProfile.sIsUsingCustomProfile) {
// If nothing was passed in in the intent, force Gecko to use the default profile for
// for this activity
profile = " -P " + GeckoAppShell.getGeckoInterface().getProfile().getName();

9
mobile/android/base/GeckoView.java
View File

@ -46,7 +46,12 @@ public class GeckoView extends LayerView
// If running outside of a GeckoActivity (eg, from a library project),
// load the native code and disable content providers
if (!(context instanceof GeckoActivity)) {
boolean isGeckoActivity = false;
try {
isGeckoActivity = context instanceof GeckoActivity;
} catch (NoClassDefFoundError ex) {}
if (!isGeckoActivity) {
// Set the GeckoInterface if the context is an activity and the GeckoInterface
// has not already been set
if (context instanceof Activity && getGeckoInterface() == null) {
@ -59,7 +64,7 @@ public class GeckoView extends LayerView
GeckoLoader.loadMozGlue();
BrowserDB.setEnableContentProviders(false);
}
}
if (url != null) {
GeckoThread.setUri(url);

22
mobile/android/base/gfx/GeckoLayerClient.java
View File

@ -896,16 +896,20 @@ public class GeckoLayerClient implements LayerView.Listener, PanZoomTarget
}
private void setShadowVisibility() {
ThreadUtils.postToUiThread(new Runnable() {
@Override
public void run() {
if (BrowserApp.mBrowserToolbar == null) {
return;
try {
if (BrowserApp.mBrowserToolbar == null) // this will throw if we don't have BrowserApp
return;
ThreadUtils.postToUiThread(new Runnable() {
@Override
public void run() {
if (BrowserApp.mBrowserToolbar == null) {
return;
}
ImmutableViewportMetrics m = mViewportMetrics;
BrowserApp.mBrowserToolbar.setShadowVisibility(m.viewportRectTop >= m.pageRectTop);
}
ImmutableViewportMetrics m = mViewportMetrics;
BrowserApp.mBrowserToolbar.setShadowVisibility(m.viewportRectTop >= m.pageRectTop);
}
});
});
} catch (NoClassDefFoundError ex) {}
}
/** Implementation of PanZoomTarget */