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

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

parents 75668530 596278e8

accessible/src/base/nsAccessible.cpp

+3 −0
Original line number Diff line number Diff line
@@ -2238,6 +2238,9 @@ nsAccessible::DispatchClickEvent(nsIContent *aContent, PRUint32 aActionIndex) 
NS_IMETHODIMP

nsAccessible::ScrollTo(PRUint32 aHow)

{

  if (IsDefunct())

    return NS_ERROR_FAILURE;



  nsCoreUtils::ScrollTo(mDoc->PresShell(), mContent, aHow);

  return NS_OK;

}

b2g/app/b2g.js

+2 −0
Original line number Diff line number Diff line
@@ -512,3 +512,5 @@ pref("extensions.getAddons.cache.enabled", false); 
pref("ui.click_hold_context_menus", true);

pref("ui.click_hold_context_menus.delay", 1000);



// Enable device storage

pref("device.storage.enabled", true);

b2g/chrome/content/shell.js

+1 −1
Original line number Diff line number Diff line
@@ -54,7 +54,7 @@ function addPermissions(urls) { 
    'indexedDB', 'indexedDB-unlimited', 'webapps-manage', 'offline-app', 'pin-app',

    'websettings-read', 'websettings-readwrite',

    'content-camera', 'webcontacts-manage', 'wifi-manage', 'desktop-notification',

    'geolocation'

    'geolocation', 'device-storage'

  ];

  urls.forEach(function(url) {

    url = url.trim();

browser/base/content/aboutDialog.js

+2 −2
Original line number Diff line number Diff line
@@ -153,7 +153,7 @@ function appUpdater() 


  if (this.isPending) {

    this.setupUpdateButton("update.restart." +

                           (this.isMajor ? "upgradeButton" : "applyButton"));

                           (this.isMajor ? "upgradeButton" : "updateButton"));

    return;

  }
@@ -542,7 +542,7 @@ appUpdater.prototype = 
      this.removeDownloadListener();

      this.selectPanel("updateButtonBox");

      this.setupUpdateButton("update.restart." +

                             (this.isMajor ? "upgradeButton" : "applyButton"));

                             (this.isMajor ? "upgradeButton" : "updateButton"));

      break;

    default:

      this.removeDownloadListener();

browser/base/content/browser.js

+11 −0
Original line number Diff line number Diff line
@@ -7348,6 +7348,7 @@ var gPluginHandler = { 
        let notification = PopupNotifications.getNotification("click-to-play-plugins", aBrowser);

        if (notification)

          notification.remove();

        gPluginHandler._removeClickToPlayOverlays(contentWindow);

      }

    }];

    let options = { dismissed: true };
@@ -7356,6 +7357,16 @@ var gPluginHandler = { 
                            mainAction, secondaryActions, options);

  },



  _removeClickToPlayOverlays: function PH_removeClickToPlayOverlays(aContentWindow) {

    let doc = aContentWindow.document;

    let cwu = aContentWindow.QueryInterface(Ci.nsIInterfaceRequestor)

                            .getInterface(Ci.nsIDOMWindowUtils);

    for (let plugin of cwu.plugins) {

      let overlay = doc.getAnonymousElementByAttribute(plugin, "class", "mainBox");

      overlay.style.visibility = "hidden";

    }

  },



  // event listener for missing/blocklisted/outdated/carbonFailure plugins.

  pluginUnavailable: function (plugin, eventType) {

    let browser = gBrowser.getBrowserForDocument(plugin.ownerDocument