[pull] master from mozilla:master

browser/base/content/navigator-toolbox.inc.xhtml

@@ -589,7 +589,7 @@
       <menupopup id="BMB_bookmarksPopup"
                  type="arrow"
                  is="places-popup-arrow"
-                 class="cui-widget-panel cui-widget-panelview cui-widget-panelWithFooter PanelUI-subView"
+                 class="cui-widget-panel cui-widget-panelview PanelUI-subView"
                  placespopup="true"
                  context="placesContext"
                  openInTabs="children"
@@ -601,19 +601,19 @@
                                  BookmarkingUI.attachPlacesView(event, this);"
                  tooltip="bhTooltip" popupsinherittooltip="true">
         <menuitem id="BMB_viewBookmarksSidebar"
-                  class="menuitem-iconic subviewbutton"
+                  class="subviewbutton"
                   data-l10n-id="bookmarks-tools-sidebar-visibility"
                   data-l10n-args='{ "isVisible": false }'
                   oncommand="SidebarUI.toggle('viewBookmarksSidebar');"/>
         <!-- NB: temporary solution for bug 985024, this should go away soon. -->
         <menuitem id="BMB_bookmarksShowAllTop"
-                  class="menuitem-iconic subviewbutton"
+                  class="subviewbutton"
                   data-l10n-id="bookmarks-manage-bookmarks"
                   command="Browser:ShowAllBookmarks"
                   key="manBookmarkKb"/>
         <menuseparator/>
         <menu id="BMB_bookmarksToolbar"
-              class="menu-iconic bookmark-item subviewbutton"
+              class="bookmark-item subviewbutton"
               data-l10n-id="bookmarks-toolbar-menu"
               container="true">
           <menupopup id="BMB_bookmarksToolbarPopup"
@@ -625,7 +625,7 @@
                                        new PlacesMenu(event, `place:parent=${PlacesUtils.bookmarks.toolbarGuid}`,
                                                       PlacesUIUtils.getViewForNode(this.parentNode.parentNode).options);">
             <menuitem id="BMB_viewBookmarksToolbar"
-                      class="menuitem-iconic subviewbutton"
+                      class="subviewbutton"
                       data-l10n-id="bookmarks-tools-toolbar-visibility-menuitem"
                       data-l10n-args='{ "isVisible": false }'
                       oncommand="BookmarkingUI.toggleBookmarksToolbar('bookmarks-widget');"/>
@@ -634,7 +634,7 @@
           </menupopup>
         </menu>
         <menu id="BMB_unsortedBookmarks"
-              class="menu-iconic bookmark-item subviewbutton"
+              class="bookmark-item subviewbutton"
               data-l10n-id="bookmarks-other-bookmarks-menu"
               container="true">
           <menupopup id="BMB_unsortedBookmarksPopup"
@@ -664,7 +664,7 @@
         <menuseparator/>
         <!-- Bookmarks menu items will go here -->
         <menuitem id="BMB_bookmarksShowAll"
-                  class="subviewbutton panel-subview-footer-button"
+                  class="subviewbutton"
                   data-l10n-id="bookmarks-manage-bookmarks"
                   command="Browser:ShowAllBookmarks"
                   key="manBookmarkKb"/>

browser/components/customizableui/content/panelUI.js

@@ -475,11 +475,6 @@ const PanelUI = {
       document
         .getElementById(CustomizableUI.AREA_NAVBAR)
         .appendChild(tempPanel);
-      // If the view has a footer, set a convenience class on the panel.
-      tempPanel.classList.toggle(
-        "cui-widget-panelWithFooter",
-        viewNode.querySelector(".panel-subview-footer")
-      );
 
       let multiView = document.createXULElement("panelmultiview");
       multiView.setAttribute("id", "customizationui-widget-multiview");

browser/themes/shared/customizableui/panelUI.inc.css

@@ -189,19 +189,6 @@ toolbarseparator + .panel-subview-body,
   -moz-box-flex: 1;
 }
 
-.subviewbutton.panel-subview-footer {
-  box-sizing: border-box;
-  min-height: 41px;
-}
-
-.cui-widget-panelview menuitem.subviewbutton.panel-subview-footer {
-  margin: 4px 0 0;
-}
-
-.cui-widget-panelview .subviewbutton.panel-subview-footer > .menu-text {
-  -moz-box-flex: 1;
-}
-
 .panel-info-button {
   appearance: none;
   padding: 0;
@@ -383,7 +370,7 @@ panelview[id^=PanelUI-webext-] {
 
 .cui-widget-panel,
 .cui-widget-panel::part(arrowcontent) {
-  --arrowpanel-padding: 4px 0;
+  --arrowpanel-padding: var(--panel-subview-body-padding);
 }
 
 #appMenu-popup panelview,
@@ -408,10 +395,6 @@ panelview[id^=PanelUI-webext-] {
   min-width: calc(@menuPanelWidth@ + 32px);
 }
 
-.cui-widget-panel.cui-widget-panelWithFooter::part(content) {
-  padding-bottom: 0;
-}
-
 .toolbaritem-combined-buttons@inAnyPanel@ > toolbarbutton > .toolbarbutton-icon {
   min-width: 0;
   min-height: 0;
@@ -1202,24 +1185,15 @@ panelview .toolbarbutton-1,
   margin-bottom: 6px;
 }
 
-.subviewbutton.panel-subview-footer > .menu-text {
+.subviewbutton > .menu-text {
   appearance: none;
   padding-inline-start: 0 !important; /* to override menu.css on Windows */
-  padding-inline-end: 6px;
-  -moz-box-flex: 0;
-}
-
-.subviewbutton.panel-subview-footer > .toolbarbutton-text {
-  padding-inline-start: 0;
-}
-
-.subviewbutton.panel-subview-footer > .menu-accel-container {
-  padding-inline-start: 6px;
 }
 
 .subviewbutton > .menu-accel-container > .menu-iconic-accel,
 .subviewbutton > .menu-accel-container > .menu-accel {
   margin-inline-end: 0 !important; /* to override menu.css on Windows */
+  color: var(--panel-shortcut-color);
 }
 
 .subviewbutton[shortcut]::after {
@@ -1434,24 +1408,6 @@ menuitem.subviewbutton@menuStateActive@,
   color: var(--arrowpanel-color);
 }
 
-.subviewbutton.panel-subview-footer {
-  margin: 0;
-  background-color: var(--arrowpanel-dimmed);
-  border-top: 1px solid var(--panel-separator-color);
-  border-radius: 0;
-}
-
-menuitem.panel-subview-footer@menuStateHover@,
-.subviewbutton.panel-subview-footer@buttonStateHoverOrFocus@ {
-  background-color: var(--arrowpanel-dimmed-further);
-}
-
-menuitem.panel-subview-footer@menuStateActive@,
-.subviewbutton.panel-subview-footer@buttonStateActive@ {
-  background-color: var(--arrowpanel-dimmed-even-further);
-  box-shadow: 0 1px 0 hsla(210,4%,10%,.05) inset;
-}
-
 #BMB_bookmarksPopup .subviewbutton:not([disabled="true"]) {
   color: inherit;
 }

browser/themes/shared/urlbar-searchbar.inc.css

@@ -148,10 +148,10 @@
   color: var(--lwt-toolbar-field-highlight-text, -moz-system-color(text-select-foreground, light));
 }
 
-/* #urlbar-input:not(:focus):-moz-lwtheme::selection,
+#urlbar-input:not(:focus):-moz-lwtheme::selection,
 .searchbar-textbox:not(:focus-within):-moz-lwtheme::selection {
-  background-color: -moz-system-color(text-select-background-disabled, light);
-} */
+  background-color: var(--lwt-toolbar-field-highlight, -moz-system-color(text-select-background-disabled, light));
+}
 
 :root[lwt-toolbar-field-focus-brighttext] #urlbar-input:focus::selection,
 :root[lwt-toolbar-field-focus-brighttext] .searchbar-textbox:focus-within::selection {

build/build-clang/README

@@ -29,7 +29,6 @@ Config file format
 build-clang.py accepts a JSON config format with the following fields:
 
 * stages: Use 1, 2, 3 or 4 to select different compiler stages.  The default is 3.
-* python_path: Path to the Python 2.7 installation on the machine building clang.
 * cc: Path to the bootsraping C Compiler.
 * cxx: Path to the bootsraping C++ Compiler.
 * as: Path to the assembler tool.

build/build-clang/build-clang.py

@@ -215,7 +215,6 @@ def build_one_stage(
     osx_cross_compile,
     build_type,
     assertions,
-    python_path,
     libcxx_include_dir,
     build_wasm,
     compiler_rt_source_dir=None,
@@ -263,7 +262,6 @@ def cmake_base_args(cc, cxx, asm, ld, ar, ranlib, libtool, inst_dir):
             "-DCMAKE_INSTALL_PREFIX=%s" % inst_dir,
             "-DLLVM_TARGETS_TO_BUILD=%s" % machine_targets,
             "-DLLVM_ENABLE_ASSERTIONS=%s" % ("ON" if assertions else "OFF"),
-            "-DPYTHON_EXECUTABLE=%s" % slashify_path(python_path),
             "-DLLVM_TOOL_LIBCXX_BUILD=%s" % ("ON" if build_libcxx else "OFF"),
             "-DLLVM_ENABLE_BINDINGS=OFF",
         ]
@@ -711,10 +709,6 @@ def prune_final_dir_for_clang_tidy(final_dir, osx_cross_compile):
         assertions = config["assertions"]
         if assertions not in (True, False):
             raise ValueError("Only boolean values are accepted for assertions.")
-    python_path = None
-    if "python_path" not in config:
-        raise ValueError("Config file needs to set python_path")
-    python_path = config["python_path"]
     ndk_dir = None
     android_targets = None
     if "android_targets" in config:
@@ -884,7 +878,6 @@ def prune_final_dir_for_clang_tidy(final_dir, osx_cross_compile):
         osx_cross_compile,
         build_type,
         assertions,
-        python_path,
         libcxx_include_dir,
         build_wasm,
         is_final_stage=(stages == 1),
@@ -913,7 +906,6 @@ def prune_final_dir_for_clang_tidy(final_dir, osx_cross_compile):
             osx_cross_compile,
             build_type,
             assertions,
-            python_path,
             libcxx_include_dir,
             build_wasm,
             compiler_rt_source_dir,
@@ -945,7 +937,6 @@ def prune_final_dir_for_clang_tidy(final_dir, osx_cross_compile):
             osx_cross_compile,
             build_type,
             assertions,
-            python_path,
             libcxx_include_dir,
             build_wasm,
             compiler_rt_source_dir,
@@ -986,7 +977,6 @@ def prune_final_dir_for_clang_tidy(final_dir, osx_cross_compile):
             osx_cross_compile,
             build_type,
             assertions,
-            python_path,
             libcxx_include_dir,
             build_wasm,
             compiler_rt_source_dir,

build/build-clang/clang-10-linux64.json

@@ -5,7 +5,6 @@
     "build_wasm": true,
     "build_type": "Release",
     "assertions": false,
-    "python_path": "/usr/bin/python2.7",
     "cc": "{MOZ_FETCHES_DIR}/gcc/bin/gcc",
     "cxx": "{MOZ_FETCHES_DIR}/gcc/bin/g++",
     "as": "{MOZ_FETCHES_DIR}/gcc/bin/gcc",

build/build-clang/clang-11-android.json

@@ -3,7 +3,6 @@
     "build_libcxx": true,
     "build_type": "Release",
     "assertions": false,
-    "python_path": "/usr/bin/python2.7",
     "cc": "{MOZ_FETCHES_DIR}/gcc/bin/gcc",
     "cxx": "{MOZ_FETCHES_DIR}/gcc/bin/g++",
     "as": "{MOZ_FETCHES_DIR}/gcc/bin/gcc",

build/build-clang/clang-11-linux64.json

@@ -5,7 +5,6 @@
     "build_wasm": true,
     "build_type": "Release",
     "assertions": false,
-    "python_path": "/usr/bin/python2.7",
     "cc": "{MOZ_FETCHES_DIR}/gcc/bin/gcc",
     "cxx": "{MOZ_FETCHES_DIR}/gcc/bin/g++",
     "as": "{MOZ_FETCHES_DIR}/gcc/bin/gcc",

build/build-clang/clang-11-macosx64.json

@@ -4,7 +4,6 @@
     "build_type": "Release",
     "assertions": false,
     "osx_cross_compile": true,
-    "python_path": "/usr/bin/python2.7",
     "cc": "{MOZ_FETCHES_DIR}/clang/bin/clang",
     "cxx": "{MOZ_FETCHES_DIR}/clang/bin/clang++",
     "as": "{MOZ_FETCHES_DIR}/clang/bin/clang",

build/build-clang/clang-11-win64-2stage.json

@@ -3,7 +3,6 @@
     "build_libcxx": false,
     "build_type": "Release",
     "assertions": false,
-    "python_path": "c:/mozilla-build/python/python.exe",
     "cc": "cl.exe",
     "cxx": "cl.exe",
     "ml": "ml64.exe",

build/build-clang/clang-11-win64.json

@@ -4,7 +4,6 @@
     "build_libcxx": false,
     "build_type": "Release",
     "assertions": false,
-    "python_path": "c:/mozilla-build/python/python.exe",
     "cc": "cl.exe",
     "cxx": "cl.exe",
     "ml": "ml64.exe",

build/build-clang/clang-12-android.json

@@ -3,7 +3,6 @@
     "build_libcxx": true,
     "build_type": "Release",
     "assertions": false,
-    "python_path": "/usr/bin/python2.7",
     "cc": "{MOZ_FETCHES_DIR}/gcc/bin/gcc",
     "cxx": "{MOZ_FETCHES_DIR}/gcc/bin/g++",
     "as": "{MOZ_FETCHES_DIR}/gcc/bin/gcc",

build/build-clang/clang-12-linux64.json

@@ -5,7 +5,6 @@
     "build_wasm": true,
     "build_type": "Release",
     "assertions": false,
-    "python_path": "/usr/bin/python2.7",
     "cc": "{MOZ_FETCHES_DIR}/gcc/bin/gcc",
     "cxx": "{MOZ_FETCHES_DIR}/gcc/bin/g++",
     "as": "{MOZ_FETCHES_DIR}/gcc/bin/gcc",

build/build-clang/clang-12-macosx64.json

@@ -4,7 +4,6 @@
     "build_type": "Release",
     "assertions": false,
     "osx_cross_compile": true,
-    "python_path": "/usr/bin/python2.7",
     "cc": "{MOZ_FETCHES_DIR}/clang/bin/clang",
     "cxx": "{MOZ_FETCHES_DIR}/clang/bin/clang++",
     "as": "{MOZ_FETCHES_DIR}/clang/bin/clang",

build/build-clang/clang-12-mingw.json

@@ -4,7 +4,6 @@
     "build_libcxx": true,
     "build_type": "Release",
     "assertions": false,
-    "python_path": "/usr/bin/python2.7",
     "cc": "{MOZ_FETCHES_DIR}/gcc/bin/gcc",
     "cxx": "{MOZ_FETCHES_DIR}/gcc/bin/g++",
     "as": "{MOZ_FETCHES_DIR}/gcc/bin/gcc",

build/build-clang/clang-12-win64-2stage.json

@@ -3,7 +3,6 @@
     "build_libcxx": false,
     "build_type": "Release",
     "assertions": false,
-    "python_path": "c:/mozilla-build/python/python.exe",
     "cc": "cl.exe",
     "cxx": "cl.exe",
     "ml": "ml64.exe",

build/build-clang/clang-12-win64.json

@@ -4,7 +4,6 @@
     "build_libcxx": false,
     "build_type": "Release",
     "assertions": false,
-    "python_path": "c:/mozilla-build/python/python.exe",
     "cc": "cl.exe",
     "cxx": "cl.exe",
     "ml": "ml64.exe",

build/build-clang/clang-5.0-linux64.json

@@ -3,7 +3,6 @@
     "build_libcxx": true,
     "build_type": "Release",
     "assertions": false,
-    "python_path": "/usr/bin/python2.7",
     "cc": "{MOZ_FETCHES_DIR}/gcc/bin/gcc",
     "cxx": "{MOZ_FETCHES_DIR}/gcc/bin/g++",
     "as": "{MOZ_FETCHES_DIR}/gcc/bin/gcc",

build/build-clang/clang-7-linux64.json

@@ -3,7 +3,6 @@
     "build_libcxx": true,
     "build_type": "Release",
     "assertions": false,
-    "python_path": "/usr/bin/python2.7",
     "cc": "{MOZ_FETCHES_DIR}/gcc/bin/gcc",
     "cxx": "{MOZ_FETCHES_DIR}/gcc/bin/g++",
     "as": "{MOZ_FETCHES_DIR}/gcc/bin/gcc",

build/build-clang/clang-linux64.json

@@ -5,7 +5,6 @@
     "build_wasm": true,
     "build_type": "Release",
     "assertions": false,
-    "python_path": "/usr/bin/python2.7",
     "cc": "{MOZ_FETCHES_DIR}/gcc/bin/gcc",
     "cxx": "{MOZ_FETCHES_DIR}/gcc/bin/g++",
     "as": "{MOZ_FETCHES_DIR}/gcc/bin/gcc",

build/build-clang/clang-tidy-external-linux64.json

@@ -4,7 +4,6 @@
     "build_type": "Release",
     "assertions": false,
     "build_clang_tidy": true,
-    "python_path": "/usr/bin/python2.7",
     "cc": "{MOZ_FETCHES_DIR}/gcc/bin/gcc",
     "cxx": "{MOZ_FETCHES_DIR}/gcc/bin/g++",
     "as": "{MOZ_FETCHES_DIR}/gcc/bin/gcc",

build/build-clang/clang-tidy-linux64.json

@@ -4,7 +4,6 @@
     "build_type": "Release",
     "assertions": false,
     "build_clang_tidy": true,
-    "python_path": "/usr/bin/python2.7",
     "cc": "{MOZ_FETCHES_DIR}/gcc/bin/gcc",
     "cxx": "{MOZ_FETCHES_DIR}/gcc/bin/g++",
     "as": "{MOZ_FETCHES_DIR}/gcc/bin/gcc",

build/build-clang/clang-tidy-macosx64.json

@@ -5,7 +5,6 @@
     "assertions": false,
     "build_clang_tidy": true,
     "osx_cross_compile": true,
-    "python_path": "/usr/bin/python2.7",
     "cc": "{MOZ_FETCHES_DIR}/clang/bin/clang",
     "cxx": "{MOZ_FETCHES_DIR}/clang/bin/clang++",
     "as": "{MOZ_FETCHES_DIR}/clang/bin/clang",

build/build-clang/clang-tidy-win64.json

@@ -4,7 +4,6 @@
     "build_type": "Release",
     "assertions": false,
     "build_clang_tidy": true,
-    "python_path": "c:/mozilla-build/python/python.exe",
     "cc": "cl.exe",
     "cxx": "cl.exe",
     "ml": "ml64.exe",