Commit 3483fb25 authored by Andreea Pavel's avatar Andreea Pavel
Browse files

Merge autoland to mozilla-central. a=merge

parents 594bcb57 98807fe5

browser/actors/FormValidationParent.jsm

+4 −4
Original line number Diff line number Diff line
@@ -117,10 +117,10 @@ class FormValidationParent extends JSWindowActorParent { 


    let tabBrowser = aWindow.gBrowser;

    this._anchor = tabBrowser.selectedBrowser.popupAnchor;

    this._anchor.left = aPanelData.contentRect.left;

    this._anchor.top = aPanelData.contentRect.top;

    this._anchor.width = aPanelData.contentRect.width;

    this._anchor.height = aPanelData.contentRect.height;

    this._anchor.style.left = aPanelData.contentRect.left + "px";

    this._anchor.style.top = aPanelData.contentRect.top + "px";

    this._anchor.style.width = aPanelData.contentRect.width + "px";

    this._anchor.style.height = aPanelData.contentRect.height + "px";

    this._anchor.hidden = false;



    // Display the panel if it isn't already visible.

browser/app/blocklist.xml

+9 −1
Original line number Diff line number Diff line 
<?xml version='1.0' encoding='UTF-8'?>

<blocklist xmlns="http://www.mozilla.org/2006/addons-blocklist" lastupdate="1573804224556">

<blocklist xmlns="http://www.mozilla.org/2006/addons-blocklist" lastupdate="1574334260570">

  <emItems>

    <emItem blockID="i334" id="{0F827075-B026-42F3-885D-98981EE7B1AE}">

      <prefs/>
@@ -3557,6 +3557,14 @@ 
      <prefs/>

      <versionRange minVersion="0" maxVersion="*" severity="3"/>

    </emItem>

    <emItem blockID="28831b71-8a9a-466e-9f34-1f40f2f0e27a" id="/^((\{333d6dd8-43ed-4f01-944d-b7c737a5db72\})|(\{f5712532-777e-4080-b6b9-d548040f7675\})|(\{abf3f8d7-bc95-4dd5-ab96-c390ad5f8756\})|(\{f769002a-608d-4a8c-adc4-05f4857ff3ae\})|(\{1980667f-9bde-4e7e-8d0c-132db12c1b30\}))$/">

      <prefs/>

      <versionRange minVersion="0" maxVersion="*" severity="3"/>

    </emItem>

    <emItem blockID="9729654a-6cd1-4e20-8cf5-47a3ff544ef5" id="/^((youtubetomp3@addons\.youtube\.com)|(addons-mozilla@youtube-to-mp4))$/">

      <prefs/>

      <versionRange minVersion="0" maxVersion="*" severity="3"/>

    </emItem>

  </emItems>

  <pluginItems>

    <pluginItem blockID="p332">

browser/app/profile/firefox.js

+2 −0
Original line number Diff line number Diff line
@@ -326,6 +326,8 @@ pref("browser.urlbar.usepreloadedtopurls.expire_days", 14); 


// Whether the quantum bar displays the major design update.

pref("browser.urlbar.megabar", false);

// Whether we expand the font size when the megabar is focused.

pref("browser.urlbar.megabar.expandTextOnFocus", false);

// Whether the megabar displays the permanent search icon.

pref("browser.urlbar.searchIcon", false);

pref("browser.urlbar.view.stripHttps", false);

browser/base/content/aboutDialog.xul

+1 −1
Original line number Diff line number Diff line
@@ -31,7 +31,7 @@ 
        aria-describedby="version distribution distributionId communityDesc contributeDesc trademark"

        >

#ifdef XP_MACOSX

#include macWindow.inc.xul

#include macWindow.inc.xhtml

#endif



  <linkset>