Commit 4ae2fa64 authored by Csoregi Natalia's avatar Csoregi Natalia
Browse files

Merge autoland to mozilla-central. a=merge

parents 56715900 d261cc7c

browser/base/content/browser-sets.inc

+4 −0
Original line number Diff line number Diff line
@@ -283,7 +283,11 @@ 
    <key id="key_fullScreen_old" key="&fullScreenCmd.macCommandKey;" command="View:FullScreen" modifiers="accel,shift"/>

    <key keycode="VK_F11" command="View:FullScreen"/>

#endif

#ifndef XP_WIN

    <key id="key_toggleReaderMode" key="&toggleReaderMode.key;" command="View:ReaderView" modifiers="accel,alt" disabled="true"/>

#else

    <key id="key_toggleReaderMode" keycode="&toggleReaderMode.win.keycode;" command="View:ReaderView" disabled="true"/>

#endif

    <key key="&reloadCmd.commandkey;" command="Browser:Reload" modifiers="accel" id="key_reload"/>

    <key key="&reloadCmd.commandkey;" command="Browser:ReloadSkipCache" modifiers="accel,shift"/>

    <key id="key_viewSource" key="&pageSourceCmd.commandkey;" command="View:PageSource" modifiers="accel"/>

browser/base/content/tabbrowser.xml

+4 −1
Original line number Diff line number Diff line
@@ -6346,7 +6346,7 @@ 
      <method name="_canScrollToElement">

        <parameter name="tab"/>

        <body><![CDATA[

          return !tab.pinned && !tab.hidden;

          return !tab._pinnedUnscrollable && !tab.hidden;

        ]]></body>

      </method>

    </implementation>
@@ -6874,6 +6874,7 @@ 
        <body><![CDATA[

          var numPinned = this.tabbrowser._numPinnedTabs;

          var doPosition = this.getAttribute("overflow") == "true" &&

                           this.tabbrowser.visibleTabs.length > numPinned &&

                           numPinned > 0;



          if (doPosition) {
@@ -6896,6 +6897,7 @@ 
              let tab = this.childNodes[i];

              width += layoutData.pinnedTabWidth;

              tab.style.marginInlineStart = -(width + layoutData.scrollButtonWidth) + "px";

              tab._pinnedUnscrollable = true;

            }

            this.style.paddingInlineStart = width + "px";

          } else {
@@ -6904,6 +6906,7 @@ 
            for (let i = 0; i < numPinned; i++) {

              let tab = this.childNodes[i];

              tab.style.marginInlineStart = "";

              tab._pinnedUnscrollable = false;

            }



            this.style.paddingInlineStart = "";

browser/base/content/test/siteIdentity/browser_bug822367.js

+2 −0
Original line number Diff line number Diff line
@@ -4,6 +4,7 @@ 




const PREF_DISPLAY = "security.mixed_content.block_display_content";

const PREF_DISPLAY_UPGRADE = "security.mixed_content.upgrade_display_content";

const PREF_ACTIVE = "security.mixed_content.block_active_content";



// We alternate for even and odd test cases to simulate different hosts
@@ -14,6 +15,7 @@ var gTestBrowser = null; 


add_task(async function test() {

  await SpecialPowers.pushPrefEnv({ set: [[ PREF_DISPLAY, true ],

                                          [ PREF_DISPLAY_UPGRADE, false ],

                                          [ PREF_ACTIVE, true  ]] });



  var newTab = BrowserTestUtils.addTab(gBrowser);

browser/base/content/test/siteIdentity/browser_mcb_redirect.js

+5 −0
Original line number Diff line number Diff line
@@ -55,12 +55,14 @@ 


const PREF_ACTIVE = "security.mixed_content.block_active_content";

const PREF_DISPLAY = "security.mixed_content.block_display_content";

const PREF_DISPLAY_UPGRADE = "security.mixed_content.upgrade_display_content";

const HTTPS_TEST_ROOT = getRootDirectory(gTestPath).replace("chrome://mochitests/content", "https://example.com");

const HTTP_TEST_ROOT = getRootDirectory(gTestPath).replace("chrome://mochitests/content", "http://example.com");

const PREF_INSECURE_ICON = "security.insecure_connection_icon.enabled";



var origBlockActive;

var origBlockDisplay;

var origUpgradeDisplay;

var origInsecurePref;

var gTestBrowser = null;
@@ -70,6 +72,7 @@ registerCleanupFunction(function() { 
  // Set preferences back to their original values

  Services.prefs.setBoolPref(PREF_ACTIVE, origBlockActive);

  Services.prefs.setBoolPref(PREF_DISPLAY, origBlockDisplay);

  Services.prefs.setBoolPref(PREF_DISPLAY_UPGRADE, origUpgradeDisplay);

  Services.prefs.setBoolPref(PREF_INSECURE_ICON, origInsecurePref);



  // Make sure we are online again
@@ -298,9 +301,11 @@ function test() { 
  // Store original preferences so we can restore settings after testing

  origBlockActive = Services.prefs.getBoolPref(PREF_ACTIVE);

  origBlockDisplay = Services.prefs.getBoolPref(PREF_DISPLAY);

  origUpgradeDisplay = Services.prefs.getBoolPref(PREF_DISPLAY_UPGRADE);

  origInsecurePref = Services.prefs.getBoolPref(PREF_INSECURE_ICON);

  Services.prefs.setBoolPref(PREF_ACTIVE, true);

  Services.prefs.setBoolPref(PREF_DISPLAY, true);

  Services.prefs.setBoolPref(PREF_DISPLAY_UPGRADE, false);



  var newTab = BrowserTestUtils.addTab(gBrowser);

  gBrowser.selectedTab = newTab;

browser/base/content/test/siteIdentity/browser_mixedContentFramesOnHttp.js

+2 −1
Original line number Diff line number Diff line
@@ -16,7 +16,8 @@ add_task(async function() { 
  await SpecialPowers.pushPrefEnv({

    "set": [

      ["security.mixed_content.block_active_content", true],

      ["security.mixed_content.block_display_content", false]

      ["security.mixed_content.block_display_content", false],

      ["security.mixed_content.upgrade_display_content", false]

    ]});



  await BrowserTestUtils.withNewTab(TEST_URL, async function(browser) {