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

Backed out changeset 2c2c426e4afe (bug 784759) r=margaret

Browse Source
This commit is contained in:
Wes Johnston 2014-02-06 15:12:59 -08:00
parent 38b87a8009
commit 3307fa6b1b
4 changed files with 6 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
mobile/android/base/tests/BaseTest.java
View File

@ -90,16 +90,6 @@ abstract class BaseTest extends ActivityInstrumentationTestCase2<Activity> {
}
}
protected void blockForGeckoDelayedStartup() {
try {
Actions.EventExpecter geckoReadyExpector = mActions.expectGeckoEvent("Gecko:DelayedStartup");
geckoReadyExpector.blockForEvent();
geckoReadyExpector.unregisterListener();
} catch (Exception e) {
mAsserter.dumpLog("Exception in blockForGeckoDelayedStartup", e);
}
}
static {
try {
mLauncherActivityClass = (Class<Activity>)Class.forName(LAUNCH_ACTIVITY_FULL_CLASSNAME);

2
mobile/android/base/tests/testFormHistory.java
View File

@ -29,7 +29,7 @@ public class testFormHistory extends BaseTest {
ContentValues[] cvs = new ContentValues[1];
cvs[0] = new ContentValues();
blockForGeckoDelayedStartup();
blockForGeckoReady();
Uri formHistoryUri;
Uri insertUri;

2
mobile/android/base/tests/testPasswordProvider.java
View File

@ -30,7 +30,7 @@ public class testPasswordProvider extends BaseTest {
ContentValues[] cvs = new ContentValues[1];
cvs[0] = new ContentValues();
blockForGeckoDelayedStartup();
blockForGeckoReady();
cvs[0].put("hostname", "http://www.example.com");
cvs[0].put("httpRealm", "http://www.example.com");

18
mobile/android/chrome/content/browser.js
View File

@ -423,8 +423,6 @@ var BrowserApp = {
event.initEvent("UIReady", true, false);
window.dispatchEvent(event);
Services.obs.addObserver(this, "browser-delayed-startup-finished", false);
if (this._startupStatus)
this.onAppUpdated();
@ -696,6 +694,10 @@ var BrowserApp = {
},
onAppUpdated: function() {
// initialize the form history and passwords databases on upgrades
Services.obs.notifyObservers(null, "FormHistory:Init", "");
Services.obs.notifyObservers(null, "Passwords:Init", "");
// Migrate user-set "plugins.click_to_play" pref. See bug 884694.
// Because the default value is true, a user-set pref means that the pref was set to false.
if (Services.prefs.prefHasUserValue("plugins.click_to_play")) {
@ -1612,10 +1614,6 @@ var BrowserApp = {
Services.prefs.setCharPref("general.useragent.locale", aData);
break;
case "browser-delayed-startup-finished":
this._delayedStartup();
break;
default:
dump('BrowserApp.observe: unexpected topic "' + aTopic + '"\n');
break;
@ -1623,14 +1621,6 @@ var BrowserApp = {
}
},
_delayedStartup: function() {
// initialize the form history and passwords databases on upgrades
if (this._startupStatus) {
Services.obs.notifyObservers(null, "FormHistory:Init", "");
Services.obs.notifyObservers(null, "Passwords:Init", "");
}
},
get defaultBrowserWidth() {
delete this.defaultBrowserWidth;
let width = Services.prefs.getIntPref("browser.viewport.desktopWidth");