Commit 444f7c36 authored by Sebastian Hengst's avatar Sebastian Hengst
Browse files

merge mozilla-central to mozilla-inbound. r=merge a=merge

parents beb48926 030c11d7

.flake8

+2 −0
Original line number Diff line number Diff line
@@ -2,3 +2,5 @@ 
# See http://pep8.readthedocs.io/en/latest/intro.html#configuration

ignore = E121, E123, E126, E129, E133, E226, E241, E242, E704, W503, E402

max-line-length = 99

exclude =

    testing/mochitest/pywebsocket,

CLOBBER

+1 −1
Original line number Diff line number Diff line
@@ -22,4 +22,4 @@ 
# changes to stick? As of bug 928195, this shouldn't be necessary! Please

# don't change CLOBBER for WebIDL changes any more.



Bug 1340910 - clobber required for Brotli 0.6.0 update due to changes in exported headers.
 
Bug 1395286 - Fix packaging error for Android builds, presumably due to bug 1255404 and/or bug 863246.

browser/base/content/browser-pageActions.js

+2 −1
Original line number Diff line number Diff line
@@ -339,6 +339,7 @@ var BrowserPageActions = { 
  _makeUrlbarButtonNode(action) {

    let buttonNode = document.createElement("image");

    buttonNode.classList.add("urlbar-icon", "urlbar-page-action");

    buttonNode.setAttribute("role", "button");

    if (action.tooltip) {

      buttonNode.setAttribute("tooltiptext", action.tooltip);

    }
@@ -721,7 +722,7 @@ var BrowserPageActionFeedback = { 
    // The timeout value used here allows the panel to stay open for

    // 1 second after the text transition (duration=120ms) has finished.

    setTimeout(() => {

      this.panelNode.hidePopup();

      this.panelNode.hidePopup(true);

    }, Services.prefs.getIntPref("browser.pageActions.feedbackTimeoutMS", 1120));

  },

};

browser/base/content/browser.xul

+6 −0
Original line number Diff line number Diff line
@@ -881,11 +881,13 @@ 
                </hbox>

                <image id="page-report-button"

                       class="urlbar-icon urlbar-page-action"

                       role="button"

                       hidden="true"

                       tooltiptext="&pageReportIcon.tooltip;"

                       onmousedown="gPopupBlockerObserver.onReportButtonMousedown(event);"/>

                <image id="reader-mode-button"

                       class="urlbar-icon urlbar-page-action"

                       role="button"

                       hidden="true"

                       onclick="ReaderParent.buttonClick(event);"/>

                <toolbarbutton id="urlbar-zoom-button"
@@ -895,19 +897,23 @@ 
                <box id="pageActionSeparator" class="urlbar-page-action"/>

                <image id="pageActionButton"

                       class="urlbar-icon urlbar-page-action"

                       role="button"

                       tooltiptext="&pageActionButton.tooltip;"

                       onclick="BrowserPageActions.mainButtonClicked(event);"/>

                <hbox id="star-button-box"

                      hidden="true"

                      class="urlbar-icon-wrapper urlbar-page-action"

                      role="button"

                      context="pageActionPanelContextMenu"

                      oncontextmenu="BrowserPageActions.onContextMenu(event);"

                      onclick="BrowserPageActions.bookmark.onUrlbarNodeClicked(event);">

                  <image id="star-button"

                         class="urlbar-icon"

                         role="button"

                         observes="bookmarkThisPageBroadcaster"/>

                  <hbox id="star-button-animatable-box">

                    <image id="star-button-animatable-image"

                           role="button"

                           observes="bookmarkThisPageBroadcaster"/>

                  </hbox>

                </hbox>

browser/base/content/test/about/browser_aboutHome_wrapsCorrectly.js

+5 −0
Original line number Diff line number Diff line 
add_task(async function() {

  // When about:home is set to Activity Stream, there are no 'narrow' attributes

  // therefore for this test, we want to ensure we're using the original about:home

  await SpecialPowers.pushPrefEnv({set: [

    ["browser.newtabpage.activity-stream.aboutHome.enabled", false]

  ]});

  let newWindow = await BrowserTestUtils.openNewBrowserWindow();



  let resizedPromise = BrowserTestUtils.waitForEvent(newWindow, "resize");