73.0-1

1 files changed, 18 insertions, 18 deletions

diff --git a/unity-menubar.patch b/unity-menubar.patch
index 2be5af7fa76e..a8a2eacebf1c 100644
--- a/unity-menubar.patch
+++ b/unity-menubar.patch
@@ -14,7 +14,7 @@
              <menu id="file-menu" data-l10n-id="menu-file">
 --- a/browser/base/content/browser.js
 +++ b/browser/base/content/browser.js
-@@ -6463,11 +6463,17 @@ function onViewToolbarsPopupShowing(aEve
+@@ -6524,11 +6524,17 @@ function onViewToolbarsPopupShowing(aEve
  
    let toolbarNodes = gNavToolbox.querySelectorAll("toolbar");
  
@@ -32,9 +32,9 @@
      let menuItem = document.createXULElement("menuitem");
      let hidingAttribute =
        toolbar.getAttribute("type") == "menubar" ? "autohide" : "collapsed";
---- a/browser/components/places/content/places.xul
-+++ b/browser/components/places/content/places.xul
-@@ -166,7 +166,7 @@
+--- a/browser/components/places/content/places.xhtml
++++ b/browser/components/places/content/places.xhtml
+@@ -170,7 +170,7 @@
          <toolbarbutton type="menu" class="tabbable"
                onpopupshowing="document.getElementById('placeContent').focus()"
  #else
@@ -97,7 +97,7 @@
      'components.conf',
 --- a/modules/libpref/init/all.js
 +++ b/modules/libpref/init/all.js
-@@ -311,6 +311,9 @@ pref("dom.mouseevent.click.hack.use_lega
+@@ -317,6 +317,9 @@ pref("dom.mouseevent.click.hack.use_lega
  // of content viewers to cache based on the amount of available memory.
  pref("browser.sessionhistory.max_total_viewers", -1);
  
@@ -109,7 +109,7 @@
  pref("ui.android.mouse_as_touch", 1);
 --- a/toolkit/content/xul.css
 +++ b/toolkit/content/xul.css
-@@ -201,6 +201,13 @@ toolbar[type="menubar"] {
+@@ -210,6 +210,13 @@ toolbar[type="menubar"] {
  }
  %endif
  
@@ -125,10 +125,10 @@
  }
 --- a/widget/gtk/moz.build
 +++ b/widget/gtk/moz.build
-@@ -53,6 +53,15 @@ UNIFIED_SOURCES += [
- ]
+@@ -54,6 +54,15 @@ UNIFIED_SOURCES += [
  
  SOURCES += [
+     'MediaKeysEventSourceFactory.cpp',
 +    'nsDbusmenu.cpp',
 +    'nsMenu.cpp', # conflicts with X11 headers
 +    'nsMenuBar.cpp',
@@ -141,7 +141,7 @@
      'nsWindow.cpp', # conflicts with X11 headers
      'WaylandVsyncSource.cpp', # conflicts with X11 headers
  ]
-@@ -130,6 +139,7 @@ FINAL_LIBRARY = 'xul'
+@@ -131,6 +140,7 @@ FINAL_LIBRARY = 'xul'
  LOCAL_INCLUDES += [
      '/layout/base',
      '/layout/generic',
@@ -3455,7 +3455,7 @@
 +    if (aComputedStyle &&
 +        (aComputedStyle->StyleDisplay()->mDisplay == StyleDisplay::None ||
 +         aComputedStyle->StyleVisibility()->mVisible ==
-+            NS_STYLE_VISIBILITY_COLLAPSE)) {
++            StyleVisibility::Collapse)) {
 +        vis = false;
 +    }
 +
@@ -5084,15 +5084,15 @@
 +#endif /* __nsNativeMenuService_h__ */
 --- a/widget/gtk/nsWindow.cpp
 +++ b/widget/gtk/nsWindow.cpp
-@@ -74,6 +74,7 @@
+@@ -75,6 +75,7 @@
  
  #include "mozilla/Assertions.h"
  #include "mozilla/Likely.h"
 +#include "mozilla/Move.h"
  #include "mozilla/Preferences.h"
- #include "nsIPrefService.h"
- #include "nsIServiceManager.h"
-@@ -5486,6 +5487,10 @@ void nsWindow::HideWindowChrome(bool aSh
+ #include "nsGfxCIID.h"
+ #include "nsGtkUtils.h"
+@@ -5631,6 +5632,10 @@ void nsWindow::HideWindowChrome(bool aSh
    SetWindowDecoration(aShouldHide ? eBorderStyle_none : mBorderStyle);
  }
  
@@ -5105,7 +5105,7 @@
    nsIRollupListener* rollupListener = GetActiveRollupListener();
 --- a/widget/gtk/nsWindow.h
 +++ b/widget/gtk/nsWindow.h
-@@ -40,6 +40,8 @@
+@@ -39,6 +39,8 @@
  
  #include "IMContextWrapper.h"
  
@@ -5114,7 +5114,7 @@
  #undef LOG
  #ifdef MOZ_LOGGING
  
-@@ -175,6 +177,8 @@ class nsWindow final : public nsBaseWidg
+@@ -184,6 +186,8 @@ class nsWindow final : public nsBaseWidg
                                    nsIScreen* aTargetScreen = nullptr) override;
    virtual void HideWindowChrome(bool aShouldHide) override;
  
@@ -5123,7 +5123,7 @@
    /**
     * GetLastUserInputTime returns a timestamp for the most recent user input
     * event.  This is intended for pointer grab requests (including drags).
-@@ -671,6 +675,8 @@ class nsWindow final : public nsBaseWidg
+@@ -701,6 +705,8 @@ class nsWindow final : public nsBaseWidg
  
    mozilla::UniquePtr<mozilla::CurrentX11TimeGetter> mCurrentTimeGetter;
    static CSDSupportLevel sCSDSupportLevel;
@@ -5197,7 +5197,7 @@
  if defined('MOZ_X11'):
 --- a/xpfe/appshell/AppWindow.cpp
 +++ b/xpfe/appshell/AppWindow.cpp
-@@ -69,7 +69,7 @@
+@@ -65,7 +65,7 @@
  #  include "mozilla/XULStore.h"
  #endif