Commit cb49d6d8 authored by Andreea Pavel's avatar Andreea Pavel
Browse files

Merge autoland to mozilla-central a=merge

parents 8e1eb5cb 13dff337

accessible/tests/browser/Layout.jsm

+1 −2
Original line number Diff line number Diff line
@@ -121,8 +121,7 @@ const Layout = { 
  },



  CSSToDevicePixels(win, x, y, width, height) {

    const winUtil = win.windowUtils;

    const ratio = winUtil.screenPixelsPerCSSPixel;

    const ratio = win.devicePixelRatio;



    // CSS pixels and ratio can be not integer. Device pixels are always integer.

    // Do our best and hope it works.

accessible/tests/mochitest/layout.js

+1 −3
Original line number Diff line number Diff line
@@ -371,9 +371,7 @@ function getBoundsForDOMElm(aID) { 
}



function CSSToDevicePixels(aWindow, aX, aY, aWidth, aHeight) {

  var winUtil = aWindow.windowUtils;



  var ratio = winUtil.screenPixelsPerCSSPixel;

  var ratio = aWindow.devicePixelRatio;



  // CSS pixels and ratio can be not integer. Device pixels are always integer.

  // Do our best and hope it works.

browser/base/content/browser-siteIdentity.js

+1 −2
Original line number Diff line number Diff line
@@ -1279,8 +1279,7 @@ var gIdentityHandler = { 
    let urlString = value + "\n" + gBrowser.contentTitle;

    let htmlString = '<a href="' + value + '">' + value + "</a>";



    let windowUtils = window.windowUtils;

    let scale = windowUtils.screenPixelsPerCSSPixel / windowUtils.fullZoom;

    let scale = window.devicePixelRatio;

    let canvas = document.createElementNS(

      "http://www.w3.org/1999/xhtml",

      "canvas"

browser/base/content/tabbrowser-tabs.js

+1 −2
Original line number Diff line number Diff line
@@ -432,8 +432,7 @@ 
      // Until canvas is HiDPI-aware (bug 780362), we need to scale the desired

      // canvas size (in CSS pixels) to the window's backing resolution in order

      // to get a full-resolution drag image for use on HiDPI displays.

      let windowUtils = window.windowUtils;

      let scale = windowUtils.screenPixelsPerCSSPixel / windowUtils.fullZoom;

      let scale = window.devicePixelRatio;

      let canvas = this._dndCanvas;

      if (!canvas) {

        this._dndCanvas = canvas = document.createElementNS(

browser/components/controlcenter/content/identityPanel.inc.xhtml

+11 −11
Original line number Diff line number Diff line
@@ -31,17 +31,17 @@ 
                     oncommand="gIdentityHandler.showSecuritySubView();">

        <vbox class="identity-popup-security-connection identity-button">

          <hbox flex="1">

            <description class="identity-popup-connection-not-secure"

                        when-connection="not-secure secure-cert-user-overridden secure-custom-root cert-error-page https-only-error-page" data-l10n-id="identity-connection-not-secure"></description>

            <description class="identity-popup-connection-secure"

                        when-connection="secure secure-ev" data-l10n-id="identity-connection-secure"></description>

            <description class="identity-popup-connection-failure"

                        when-connection="net-error-page" data-l10n-id="identity-connection-failure"></description>

            <description when-connection="chrome" data-l10n-id="identity-connection-internal"></description>

            <description when-connection="file" data-l10n-id="identity-connection-file"></description>

            <description when-connection="extension" data-l10n-id="identity-extension-page"></description>

            <description class="identity-popup-connection-secure upgraded" when-httpsonlystatus="upgraded failed-sub"

              data-l10n-id="identity-https-only-connection-upgraded"></description>

            <label class="identity-popup-connection-not-secure"

                        when-connection="not-secure secure-cert-user-overridden secure-custom-root cert-error-page https-only-error-page" data-l10n-id="identity-connection-not-secure"></label>

            <label class="identity-popup-connection-secure"

                        when-connection="secure secure-ev" data-l10n-id="identity-connection-secure"></label>

            <label class="identity-popup-connection-failure"

                        when-connection="net-error-page" data-l10n-id="identity-connection-failure"></label>

            <label when-connection="chrome" data-l10n-id="identity-connection-internal"></label>

            <label when-connection="file" data-l10n-id="identity-connection-file"></label>

            <label when-connection="extension" data-l10n-id="identity-extension-page"></label>

            <label class="identity-popup-connection-secure upgraded" when-httpsonlystatus="upgraded failed-sub"

              data-l10n-id="identity-https-only-connection-upgraded"></label>

          </hbox>

        </vbox>

      </toolbarbutton>