Commit c623cb07 authored by Sebastian Hengst's avatar Sebastian Hengst
Browse files

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

MozReview-Commit-ID: 63rZAVDkxDT
parents b53e2929 a885cdff

.eslintignore

+1 −0
Original line number Diff line number Diff line
@@ -119,6 +119,7 @@ devtools/client/storage/test/*.html 
!devtools/client/storage/test/storage-unsecured-iframe-usercontextid.html

devtools/client/webaudioeditor/**

devtools/client/webconsole/net/**

devtools/client/webconsole/new-console-output/test/mochitest/**

devtools/client/webconsole/test/**

devtools/client/webconsole/hudservice.js

devtools/client/webconsole/webconsole-connection-proxy.js

browser/app/profile/firefox.js

+1 −3
Original line number Diff line number Diff line
@@ -459,6 +459,7 @@ pref("browser.tabs.loadDivertedInBackground", false); 
pref("browser.tabs.loadBookmarksInBackground", false);

pref("browser.tabs.loadBookmarksInTabs", false);

pref("browser.tabs.tabClipWidth", 140);

pref("browser.tabs.tabMinWidth", 76);

#ifdef UNIX_BUT_NOT_MAC

pref("browser.tabs.drawInTitlebar", false);

#else
@@ -487,9 +488,6 @@ pref("browser.tabs.showAudioPlayingIcon", true); 
// This should match Chromium's audio indicator delay.

pref("browser.tabs.delayHidingAudioPlayingIconMS", 3000);



// The minimum tab width in pixels

pref("browser.tabs.tabMinWidth", 50);



pref("browser.ctrlTab.previews", false);



// By default, do not export HTML at shutdown.

browser/base/content/browser-pageActions.js

+9 −0
Original line number Diff line number Diff line
@@ -719,6 +719,15 @@ var BrowserPageActions = { 
      }

    }

  },



  /**

   * Call this on tab switch or when the current <browser>'s location changes.

   */

  onLocationChange() {

    for (let action of PageActions.actions) {

      action.onLocationChange(window);

    }

  },

};



var BrowserPageActionFeedback = {

browser/base/content/browser.css

+8 −5
Original line number Diff line number Diff line
@@ -10,7 +10,6 @@ 
  --lwt-additional-images: none;

  --lwt-background-alignment: right top;

  --lwt-background-tiling: no-repeat;

  --tab-min-width: 50px;

}



:root:-moz-lwtheme {
@@ -139,6 +138,11 @@ tabbrowser { 
              max-width 100ms ease-out;

}



:root[uidensity=touch] .tabbrowser-tab:not([pinned]) {

  /* Touch mode needs additional space for the close button. */

  min-width: calc(var(--tab-min-width) + 10px);

}



.tabbrowser-tab:not([pinned]):not([fadein]) {

  max-width: 0.1px;

  min-width: 0.1px;
@@ -202,6 +206,7 @@ tabbrowser { 
}



/* Allow dropping a tab on buttons with associated drop actions. */

#TabsToolbar[movingtab] + #nav-bar > #nav-bar-customization-target > #personal-bookmarks,

#TabsToolbar[movingtab] + #nav-bar > #nav-bar-customization-target > #home-button,

#TabsToolbar[movingtab] + #nav-bar > #nav-bar-customization-target > #downloads-button,

#TabsToolbar[movingtab] + #nav-bar > #nav-bar-customization-target > #bookmarks-menu-button {
@@ -372,12 +377,11 @@ toolbarpaletteitem > toolbaritem[sdkstylewidget="true"][cui-areatype="toolbar"] 
    list-style-image: var(--webextension-menupanel-image, inherit);

  }



  .webextension-browser-action[cui-areatype="menu-panel"],

  toolbarpaletteitem[place="palette"] > .webextension-browser-action:-moz-lwtheme-brighttext {

    list-style-image: var(--webextension-menupanel-image-light, inherit);

  }



  .webextension-browser-action[cui-areatype="menu-panel"],

  .webextension-browser-action[cui-areatype="menu-panel"]:-moz-lwtheme-darktext,

  toolbarpaletteitem[place="palette"] > .webextension-browser-action:-moz-lwtheme-darktext {

    list-style-image: var(--webextension-menupanel-image-dark, inherit);

  }
@@ -409,12 +413,11 @@ toolbarpaletteitem > toolbaritem[sdkstylewidget="true"][cui-areatype="toolbar"] 
    list-style-image: var(--webextension-menupanel-image-2x, inherit);

  }



  .webextension-browser-action[cui-areatype="menu-panel"],

  toolbarpaletteitem[place="palette"] > .webextension-browser-action:-moz-lwtheme-brighttext {

    list-style-image: var(--webextension-menupanel-image-2x-light, inherit);

  }



  .webextension-browser-action[cui-areatype="menu-panel"],

  .webextension-browser-action[cui-areatype="menu-panel"]:-moz-lwtheme-darktext,

  toolbarpaletteitem[place="palette"] > .webextension-browser-action:-moz-lwtheme-darktext {

    list-style-image: var(--webextension-menupanel-image-2x-dark, inherit);

  }

browser/base/content/browser.js

+2 −0
Original line number Diff line number Diff line
@@ -4693,6 +4693,8 @@ var XULBrowserWindow = { 


      gIdentityHandler.onLocationChange();



      BrowserPageActions.onLocationChange();



      gTabletModePageCounter.inc();



      // Utility functions for disabling find