Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-25 22:01:30 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Backed out changeset 5de4d20f6cfd (bug 880259) for intermittent Android reftest failures.

Browse Source
This commit is contained in:
Ryan VanderMeulen 2013-08-09 12:54:15 -04:00
parent 15e9284f50
commit ca1b70b6b7
4 changed files with 17 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CLOBBER
View File

@ -18,4 +18,4 @@
# Modifying this file will now automatically clobber the buildbot machines \o/ # Modifying this file will now automatically clobber the buildbot machines \o/
# #
Bug 902908 renamed js/src/ion to js/src/jit and required a clobber Add an WebIDL interface for bug 892978 requires a clobber for Windows.

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

@ -31,9 +31,9 @@ public class GeckoView extends LayerView
public GeckoView(Context context, AttributeSet attrs) { public GeckoView(Context context, AttributeSet attrs) {
super(context, attrs); super(context, attrs);
TypedArray a = context.obtainStyledAttributes(attrs, R.styleable.GeckoView); TypedArray a = context.obtainStyledAttributes(attrs, R.styleable.GeckoView);
String url = a.getString(R.styleable.GeckoView_url); String url = a.getString(R.styleable.GeckoView_url);
boolean doInit = a.getBoolean(R.styleable.GeckoView_doinit, true);
a.recycle(); a.recycle();
if (url != null) { if (url != null) {
@ -46,23 +46,27 @@ public class GeckoView extends LayerView
Tabs tabs = Tabs.getInstance(); Tabs tabs = Tabs.getInstance();
tabs.attachToContext(context); tabs.attachToContext(context);
} }
GeckoProfile profile = GeckoProfile.get(context);
BrowserDB.initialize(profile.getName());
GeckoAppShell.registerEventListener("Gecko:Ready", this); GeckoAppShell.registerEventListener("Gecko:Ready", this);
ThreadUtils.setUiThread(Thread.currentThread(), new Handler()); ThreadUtils.setUiThread(Thread.currentThread(), new Handler());
initializeView(GeckoAppShell.getEventDispatcher()); initializeView(GeckoAppShell.getEventDispatcher());
if (!doInit)
return;
GeckoProfile profile = GeckoProfile.get(context);
BrowserDB.initialize(profile.getName());
if (GeckoThread.checkAndSetLaunchState(GeckoThread.LaunchState.Launching, GeckoThread.LaunchState.Launched)) { if (GeckoThread.checkAndSetLaunchState(GeckoThread.LaunchState.Launching, GeckoThread.LaunchState.Launched)) {
GeckoAppShell.setLayerView(this); GeckoAppShell.setLayerView(this);
GeckoThread.createAndStart(); GeckoThread.createAndStart();
} }
} }
@Override
public void onWindowFocusChanged(boolean hasFocus) {
super.onWindowFocusChanged(hasFocus);
if (hasFocus) {
setBackgroundDrawable(null);
}
}
public void loadUrl(String uri) { public void loadUrl(String uri) {
Tabs.getInstance().loadUrl(uri); Tabs.getInstance().loadUrl(uri);
} }

10
mobile/android/base/resources/layout/shared_ui_components.xml
View File

@ -6,13 +6,11 @@
<!-- This file is used to include shared UI components in different gecko app <!-- This file is used to include shared UI components in different gecko app
layouts, such as gecko_app.xml and web_app.xml --> layouts, such as gecko_app.xml and web_app.xml -->
<merge xmlns:android="http://schemas.android.com/apk/res/android" <merge xmlns:android="http://schemas.android.com/apk/res/android">
xmlns:gecko="http://schemas.android.com/apk/res-auto">
<org.mozilla.gecko.GeckoView android:id="@+id/layer_view" <org.mozilla.gecko.gfx.LayerView android:id="@+id/layer_view"
gecko:doinit="false" android:layout_width="fill_parent"
android:layout_width="fill_parent" android:layout_height="fill_parent"/>
android:layout_height="fill_parent"/>
<AbsoluteLayout android:id="@+id/plugin_container" <AbsoluteLayout android:id="@+id/plugin_container"
android:background="@android:color/transparent" android:background="@android:color/transparent"

1
mobile/android/base/resources/values/attrs.xml
View File

@ -173,7 +173,6 @@
<declare-styleable name="GeckoView"> <declare-styleable name="GeckoView">
<attr name="url" format="string"/> <attr name="url" format="string"/>
<attr name="doinit" format="boolean"/>
</declare-styleable> </declare-styleable>
</resources> </resources>