Commit e37982ce authored by Ed Morley's avatar Ed Morley
Browse files

Merge last PGO-green changeset of mozilla-inbound to mozilla-central

parents c1977c07 dbebdd88

b2g/app/b2g.js

+1 −1
Original line number Diff line number Diff line
@@ -440,7 +440,7 @@ pref("app.update.auto", true); 
pref("app.update.silent", true);

pref("app.update.mode", 0);

pref("app.update.incompatible.mode", 0);

pref("app.update.stage.enabled", true);

pref("app.update.staging.enabled", true);

pref("app.update.service.enabled", true);



// The URL hosting the update manifest.

b2g/chrome/content/shell.js

+5 −1
Original line number Diff line number Diff line
@@ -421,6 +421,10 @@ Services.obs.addObserver(function(aSubject, aTopic, aData) { 
                          fullscreenorigin: aData });

}, "fullscreen-origin-change", false);



Services.obs.addObserver(function onWebappsReady(subject, topic, data) {

  shell.sendChromeEvent({ type: 'webapps-registry-ready' });

}, 'webapps-registry-ready', false);



(function Repl() {

  if (!Services.prefs.getBoolPref('b2g.remote-js.enabled')) {

    return;

browser/app/profile/firefox.js

+1 −1
Original line number Diff line number Diff line
@@ -147,7 +147,7 @@ pref("app.update.silent", false); 


// If set to true, the Update Service will apply updates in the background

// when it finishes downloading them.

pref("app.update.stage.enabled", true);

pref("app.update.staging.enabled", true);



// Update service URL:

pref("app.update.url", "https://aus3.mozilla.org/update/3/%PRODUCT%/%VERSION%/%BUILD_ID%/%BUILD_TARGET%/%LOCALE%/%CHANNEL%/%OS_VERSION%/%DISTRIBUTION%/%DISTRIBUTION_VERSION%/update.xml");

browser/base/content/browser.js

+13 −12
Original line number Diff line number Diff line
@@ -219,8 +219,6 @@ XPCOMUtils.defineLazyGetter(this, "PageMenu", function() { 
* one listener that calls all real handlers.

*/

function pageShowEventHandlers(event) {

  // Filter out events that are not about the document load we are interested in

  if (event.target == content.document) {

  charsetLoadListener();

  XULBrowserWindow.asyncUpdateUI();
@@ -230,7 +228,6 @@ function pageShowEventHandlers(event) { 
  if (event.persisted)

    gPluginHandler.reshowClickToPlayNotification();

}

}



function UpdateBackForwardCommands(aWebNavigation) {

  var backBroadcaster = document.getElementById("Browser:Back");
@@ -1273,7 +1270,11 @@ var gBrowserInit = { 
    SocialUI.init();

    AddonManager.addAddonListener(AddonsMgrListener);



    gBrowser.addEventListener("pageshow", function(evt) { setTimeout(pageShowEventHandlers, 0, evt); }, true);

    gBrowser.addEventListener("pageshow", function(event) {

      // Filter out events that are not about the document load we are interested in

      if (event.target == content.document)

        setTimeout(pageShowEventHandlers, 0, event);

    }, true);



    // Ensure login manager is up and running.

    Cc["@mozilla.org/login-manager;1"].getService(Ci.nsILoginManager);

build/automation.py.in

+1 −1
Original line number Diff line number Diff line
@@ -396,7 +396,7 @@ user_pref("network.http.prompt-temp-redirect", false); 
user_pref("media.cache_size", 100);

user_pref("security.warn_viewing_mixed", false);

user_pref("app.update.enabled", false);

user_pref("app.update.stage.enabled", false);

user_pref("app.update.staging.enabled", false);

user_pref("browser.panorama.experienced_first_run", true); // Assume experienced

user_pref("dom.w3c_touch_events.enabled", true);

user_pref("toolkit.telemetry.prompted", 2);