diff options
Diffstat (limited to 'unity-menubar.patch')
-rw-r--r-- | unity-menubar.patch | 248 |
1 files changed, 137 insertions, 111 deletions
diff --git a/unity-menubar.patch b/unity-menubar.patch index b36373887a2e..8642b76fd0cd 100644 --- a/unity-menubar.patch +++ b/unity-menubar.patch @@ -1,7 +1,7 @@ -Index: firefox-trunk-43.0~a1~hg20150916r262830/browser/base/content/browser-menubar.inc +Index: firefox-44.0~a2~hg20151207r291794/browser/base/content/browser-menubar.inc =================================================================== ---- firefox-trunk-43.0~a1~hg20150916r262830.orig/browser/base/content/browser-menubar.inc 2015-09-17 22:38:32.436567004 +0100 -+++ firefox-trunk-43.0~a1~hg20150916r262830/browser/base/content/browser-menubar.inc 2015-09-17 22:38:32.424566978 +0100 +--- firefox-44.0~a2~hg20151207r291794.orig/browser/base/content/browser-menubar.inc 2015-12-08 05:35:46.000000000 +0000 ++++ firefox-44.0~a2~hg20151207r291794/browser/base/content/browser-menubar.inc 2015-12-09 22:34:37.000000000 +0000 @@ -5,7 +5,11 @@ <menubar id="main-menubar" @@ -14,10 +14,10 @@ Index: firefox-trunk-43.0~a1~hg20150916r262830/browser/base/content/browser-menu this.setAttribute('openedwithkey', event.target.parentNode.openedWithKey);" style="border:0px;padding:0px;margin:0px;-moz-appearance:none"> -Index: firefox-trunk-43.0~a1~hg20150916r262830/browser/components/places/content/places.xul +Index: firefox-44.0~a2~hg20151207r291794/browser/components/places/content/places.xul =================================================================== ---- firefox-trunk-43.0~a1~hg20150916r262830.orig/browser/components/places/content/places.xul 2015-09-17 22:38:32.436567004 +0100 -+++ firefox-trunk-43.0~a1~hg20150916r262830/browser/components/places/content/places.xul 2015-09-17 22:38:32.424566978 +0100 +--- firefox-44.0~a2~hg20151207r291794.orig/browser/components/places/content/places.xul 2015-12-08 05:35:55.000000000 +0000 ++++ firefox-44.0~a2~hg20151207r291794/browser/components/places/content/places.xul 2015-12-09 22:34:37.000000000 +0000 @@ -157,7 +157,7 @@ <toolbarbutton type="menu" class="tabbable" onpopupshowing="document.getElementById('placeContent').focus()" @@ -27,10 +27,10 @@ Index: firefox-trunk-43.0~a1~hg20150916r262830/browser/components/places/content <menu accesskey="&organize.accesskey;" class="menu-iconic" #endif id="organizeButton" label="&organize.label;" -Index: firefox-trunk-43.0~a1~hg20150916r262830/toolkit/content/widgets/popup.xml +Index: firefox-44.0~a2~hg20151207r291794/toolkit/content/widgets/popup.xml =================================================================== ---- firefox-trunk-43.0~a1~hg20150916r262830.orig/toolkit/content/widgets/popup.xml 2015-09-17 22:38:32.436567004 +0100 -+++ firefox-trunk-43.0~a1~hg20150916r262830/toolkit/content/widgets/popup.xml 2015-09-17 22:38:32.424566978 +0100 +--- firefox-44.0~a2~hg20151207r291794.orig/toolkit/content/widgets/popup.xml 2015-12-08 05:37:22.000000000 +0000 ++++ firefox-44.0~a2~hg20151207r291794/toolkit/content/widgets/popup.xml 2015-12-09 22:34:37.000000000 +0000 @@ -25,8 +25,14 @@ </getter> </property> @@ -48,10 +48,10 @@ Index: firefox-trunk-43.0~a1~hg20150916r262830/toolkit/content/widgets/popup.xml <property name="triggerNode" readonly="true" onget="return this.popupBoxObject.triggerNode"/> -Index: firefox-trunk-43.0~a1~hg20150916r262830/toolkit/content/xul.css +Index: firefox-44.0~a2~hg20151207r291794/toolkit/content/xul.css =================================================================== ---- firefox-trunk-43.0~a1~hg20150916r262830.orig/toolkit/content/xul.css 2015-09-17 22:38:32.436567004 +0100 -+++ firefox-trunk-43.0~a1~hg20150916r262830/toolkit/content/xul.css 2015-09-17 22:38:32.428566987 +0100 +--- firefox-44.0~a2~hg20151207r291794.orig/toolkit/content/xul.css 2015-12-08 05:37:22.000000000 +0000 ++++ firefox-44.0~a2~hg20151207r291794/toolkit/content/xul.css 2015-12-09 22:34:37.000000000 +0000 @@ -315,6 +315,18 @@ } %endif @@ -71,10 +71,10 @@ Index: firefox-trunk-43.0~a1~hg20150916r262830/toolkit/content/xul.css toolbarseparator { -moz-binding: url("chrome://global/content/bindings/toolbar.xml#toolbardecoration"); } -Index: firefox-trunk-43.0~a1~hg20150916r262830/widget/gtk/nsDbusmenu.cpp +Index: firefox-44.0~a2~hg20151207r291794/widget/gtk/nsDbusmenu.cpp =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ firefox-trunk-43.0~a1~hg20150916r262830/widget/gtk/nsDbusmenu.cpp 2015-09-17 22:38:32.428566987 +0100 ++++ firefox-44.0~a2~hg20151207r291794/widget/gtk/nsDbusmenu.cpp 2015-12-09 22:34:37.000000000 +0000 @@ -0,0 +1,63 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ +/* vim:expandtab:shiftwidth=4:tabstop=4: @@ -139,10 +139,10 @@ Index: firefox-trunk-43.0~a1~hg20150916r262830/widget/gtk/nsDbusmenu.cpp + + return NS_OK; +} -Index: firefox-trunk-43.0~a1~hg20150916r262830/widget/gtk/nsDbusmenu.h +Index: firefox-44.0~a2~hg20151207r291794/widget/gtk/nsDbusmenu.h =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ firefox-trunk-43.0~a1~hg20150916r262830/widget/gtk/nsDbusmenu.h 2015-09-17 22:38:32.428566987 +0100 ++++ firefox-44.0~a2~hg20151207r291794/widget/gtk/nsDbusmenu.h 2015-12-09 22:34:37.000000000 +0000 @@ -0,0 +1,99 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ +/* vim:expandtab:shiftwidth=4:tabstop=4: @@ -243,10 +243,10 @@ Index: firefox-trunk-43.0~a1~hg20150916r262830/widget/gtk/nsDbusmenu.h +#define dbusmenu_menuitem_property_set_shortcut nsDbusmenuFunctions::s_dbusmenu_menuitem_property_set_shortcut + +#endif /* __nsDbusmenu_h__ */ -Index: firefox-trunk-43.0~a1~hg20150916r262830/widget/gtk/nsMenu.cpp +Index: firefox-44.0~a2~hg20151207r291794/widget/gtk/nsMenu.cpp =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ firefox-trunk-43.0~a1~hg20150916r262830/widget/gtk/nsMenu.cpp 2015-09-17 23:19:48.934614587 +0100 ++++ firefox-44.0~a2~hg20151207r291794/widget/gtk/nsMenu.cpp 2015-12-09 22:34:37.000000000 +0000 @@ -0,0 +1,866 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ +/* vim:expandtab:shiftwidth=4:tabstop=4: @@ -351,7 +351,7 @@ Index: firefox-trunk-43.0~a1~hg20150916r262830/widget/gtk/nsMenu.cpp + return; + } + -+ nsRefPtr<nsStyleContext> sc = ++ RefPtr<nsStyleContext> sc = + shell->StyleSet()->ResolveStyleFor(aContent->AsElement(), + nullptr); + if (!sc) { @@ -368,7 +368,7 @@ Index: firefox-trunk-43.0~a1~hg20150916r262830/widget/gtk/nsMenu.cpp + return; + } + -+ nsRefPtr<nsXBLBinding> binding; ++ RefPtr<nsXBLBinding> binding; + bool dummy; + nsresult rv = xbl->LoadBindings(aContent, display->mBinding->GetURI(), + display->mBinding->mOriginPrincipal, @@ -917,10 +917,10 @@ Index: firefox-trunk-43.0~a1~hg20150916r262830/widget/gtk/nsMenu.cpp + + if (aAttribute == nsGkAtoms::hidden || + aAttribute == nsGkAtoms::collapsed) { -+ nsRefPtr<nsStyleContext> sc = GetStyleContext(); ++ RefPtr<nsStyleContext> sc = GetStyleContext(); + UpdateVisibility(sc); + } else if (aAttribute == nsGkAtoms::image) { -+ nsRefPtr<nsStyleContext> sc = GetStyleContext(); ++ RefPtr<nsStyleContext> sc = GetStyleContext(); + UpdateIcon(sc); + } +} @@ -1114,10 +1114,10 @@ Index: firefox-trunk-43.0~a1~hg20150916r262830/widget/gtk/nsMenu.cpp + + MaybeAddPlaceholderItem(); +} -Index: firefox-trunk-43.0~a1~hg20150916r262830/widget/gtk/nsMenu.h +Index: firefox-44.0~a2~hg20151207r291794/widget/gtk/nsMenu.h =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ firefox-trunk-43.0~a1~hg20150916r262830/widget/gtk/nsMenu.h 2015-09-17 22:38:32.428566987 +0100 ++++ firefox-44.0~a2~hg20151207r291794/widget/gtk/nsMenu.h 2015-12-09 22:34:37.000000000 +0000 @@ -0,0 +1,166 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ +/* vim:expandtab:shiftwidth=4:tabstop=4: @@ -1285,10 +1285,10 @@ Index: firefox-trunk-43.0~a1~hg20150916r262830/widget/gtk/nsMenu.h +}; + +#endif /* __nsMenu_h__ */ -Index: firefox-trunk-43.0~a1~hg20150916r262830/widget/gtk/nsMenuBar.cpp +Index: firefox-44.0~a2~hg20151207r291794/widget/gtk/nsMenuBar.cpp =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ firefox-trunk-43.0~a1~hg20150916r262830/widget/gtk/nsMenuBar.cpp 2015-09-17 22:38:32.428566987 +0100 ++++ firefox-44.0~a2~hg20151207r291794/widget/gtk/nsMenuBar.cpp 2015-12-09 22:34:37.000000000 +0000 @@ -0,0 +1,545 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ +/* vim:expandtab:shiftwidth=4:tabstop=4: @@ -1608,7 +1608,7 @@ Index: firefox-trunk-43.0~a1~hg20150916r262830/widget/gtk/nsMenuBar.cpp + + g_object_ref(mTopLevel); + -+ nsRefPtr<nsNativeMenuDocListener> listener = ++ RefPtr<nsNativeMenuDocListener> listener = + nsNativeMenuDocListener::Create(aMenuBarNode); + if (!listener) { + return NS_ERROR_FAILURE; @@ -1835,10 +1835,10 @@ Index: firefox-trunk-43.0~a1~hg20150916r262830/widget/gtk/nsMenuBar.cpp + DebugOnly<nsresult> rv = RemoveChild(aChild); + NS_ASSERTION(NS_SUCCEEDED(rv), "Failed to remove item from menubar"); +} -Index: firefox-trunk-43.0~a1~hg20150916r262830/widget/gtk/nsMenuBar.h +Index: firefox-44.0~a2~hg20151207r291794/widget/gtk/nsMenuBar.h =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ firefox-trunk-43.0~a1~hg20150916r262830/widget/gtk/nsMenuBar.h 2015-09-17 22:38:32.428566987 +0100 ++++ firefox-44.0~a2~hg20151207r291794/widget/gtk/nsMenuBar.h 2015-12-09 22:34:37.000000000 +0000 @@ -0,0 +1,112 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ +/* vim:expandtab:shiftwidth=4:tabstop=4: @@ -1944,7 +1944,7 @@ Index: firefox-trunk-43.0~a1~hg20150916r262830/widget/gtk/nsMenuBar.h + DbusmenuServer *mServer; + nsCOMPtr<nsIDOMEventTarget> mDocument; + nsNativeMenuGIORequest mRegisterRequestCanceller; -+ nsRefPtr<nsMenuBarDocEventListener> mEventListener; ++ RefPtr<nsMenuBarDocEventListener> mEventListener; + + uint32_t mAccessKey; + ModifierFlags mAccessKeyMask; @@ -1952,10 +1952,10 @@ Index: firefox-trunk-43.0~a1~hg20150916r262830/widget/gtk/nsMenuBar.h +}; + +#endif /* __nsMenuBar_h__ */ -Index: firefox-trunk-43.0~a1~hg20150916r262830/widget/gtk/nsMenuContainer.cpp +Index: firefox-44.0~a2~hg20151207r291794/widget/gtk/nsMenuContainer.cpp =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ firefox-trunk-43.0~a1~hg20150916r262830/widget/gtk/nsMenuContainer.cpp 2015-09-17 22:38:32.428566987 +0100 ++++ firefox-44.0~a2~hg20151207r291794/widget/gtk/nsMenuContainer.cpp 2015-12-09 22:34:37.000000000 +0000 @@ -0,0 +1,174 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ +/* vim:expandtab:shiftwidth=4:tabstop=4: @@ -2131,10 +2131,10 @@ Index: firefox-trunk-43.0~a1~hg20150916r262830/widget/gtk/nsMenuContainer.cpp + + return aContent; +} -Index: firefox-trunk-43.0~a1~hg20150916r262830/widget/gtk/nsMenuContainer.h +Index: firefox-44.0~a2~hg20151207r291794/widget/gtk/nsMenuContainer.h =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ firefox-trunk-43.0~a1~hg20150916r262830/widget/gtk/nsMenuContainer.h 2015-09-17 22:38:32.428566987 +0100 ++++ firefox-44.0~a2~hg20151207r291794/widget/gtk/nsMenuContainer.h 2015-12-09 22:34:37.000000000 +0000 @@ -0,0 +1,66 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ +/* vim:expandtab:shiftwidth=4:tabstop=4: @@ -2202,10 +2202,10 @@ Index: firefox-trunk-43.0~a1~hg20150916r262830/widget/gtk/nsMenuContainer.h +}; + +#endif /* __nsMenuContainer_h__ */ -Index: firefox-trunk-43.0~a1~hg20150916r262830/widget/gtk/nsMenuItem.cpp +Index: firefox-44.0~a2~hg20151207r291794/widget/gtk/nsMenuItem.cpp =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ firefox-trunk-43.0~a1~hg20150916r262830/widget/gtk/nsMenuItem.cpp 2015-09-17 22:38:32.428566987 +0100 ++++ firefox-44.0~a2~hg20151207r291794/widget/gtk/nsMenuItem.cpp 2015-12-09 22:34:37.000000000 +0000 @@ -0,0 +1,742 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ +/* vim:expandtab:shiftwidth=4:tabstop=4: @@ -2942,17 +2942,17 @@ Index: firefox-trunk-43.0~a1~hg20150916r262830/widget/gtk/nsMenuItem.cpp + + if (aAttribute == nsGkAtoms::hidden || + aAttribute == nsGkAtoms::collapsed) { -+ nsRefPtr<nsStyleContext> sc = GetStyleContext(); ++ RefPtr<nsStyleContext> sc = GetStyleContext(); + UpdateVisibility(sc); + } else if (aAttribute == nsGkAtoms::image) { -+ nsRefPtr<nsStyleContext> sc = GetStyleContext(); ++ RefPtr<nsStyleContext> sc = GetStyleContext(); + UpdateIcon(sc); + } +} -Index: firefox-trunk-43.0~a1~hg20150916r262830/widget/gtk/nsMenuItem.h +Index: firefox-44.0~a2~hg20151207r291794/widget/gtk/nsMenuItem.h =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ firefox-trunk-43.0~a1~hg20150916r262830/widget/gtk/nsMenuItem.h 2015-09-17 22:38:32.428566987 +0100 ++++ firefox-44.0~a2~hg20151207r291794/widget/gtk/nsMenuItem.h 2015-12-09 22:34:37.000000000 +0000 @@ -0,0 +1,107 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ +/* vim:expandtab:shiftwidth=4:tabstop=4: @@ -3061,10 +3061,10 @@ Index: firefox-trunk-43.0~a1~hg20150916r262830/widget/gtk/nsMenuItem.h +}; + +#endif /* __nsMenuItem_h__ */ -Index: firefox-trunk-43.0~a1~hg20150916r262830/widget/gtk/nsMenuObject.cpp +Index: firefox-44.0~a2~hg20151207r291794/widget/gtk/nsMenuObject.cpp =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ firefox-trunk-43.0~a1~hg20150916r262830/widget/gtk/nsMenuObject.cpp 2015-09-17 22:38:32.428566987 +0100 ++++ firefox-44.0~a2~hg20151207r291794/widget/gtk/nsMenuObject.cpp 2015-12-09 22:34:37.000000000 +0000 @@ -0,0 +1,707 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ +/* vim:expandtab:shiftwidth=4:tabstop=4: @@ -3164,7 +3164,7 @@ Index: firefox-trunk-43.0~a1~hg20150916r262830/widget/gtk/nsMenuObject.cpp + ~nsMenuObjectIconLoader() { }; + + nsMenuObject *mOwner; -+ nsRefPtr<imgRequestProxy> mImageRequest; ++ RefPtr<imgRequestProxy> mImageRequest; + nsCOMPtr<nsIURI> mURI; + nsIntRect mImageRect; + bool mIconLoaded; @@ -3305,7 +3305,7 @@ Index: firefox-trunk-43.0~a1~hg20150916r262830/widget/gtk/nsMenuObject.cpp + } else { + mImageRect.SetEmpty(); + nsCOMPtr<nsILoadGroup> loadGroup = doc->GetDocumentLoadGroup(); -+ nsRefPtr<imgLoader> loader = ++ RefPtr<imgLoader> loader = + nsContentUtils::GetImgLoaderForDocument(doc); + if (!loader || !loadGroup) { + NS_WARNING("Failed to get loader or load group for image load"); @@ -3618,7 +3618,7 @@ Index: firefox-trunk-43.0~a1~hg20150916r262830/widget/gtk/nsMenuObject.cpp + return nullptr; + } + -+ nsRefPtr<nsStyleContext> sc = ++ RefPtr<nsStyleContext> sc = + nsComputedDOMStyle::GetStyleContextForElementNoFlush( + mContent->AsElement(), nullptr, shell); + @@ -3732,7 +3732,7 @@ Index: firefox-trunk-43.0~a1~hg20150916r262830/widget/gtk/nsMenuObject.cpp + + UpdateContentAttributes(); + -+ nsRefPtr<nsStyleContext> sc = GetStyleContext(); ++ RefPtr<nsStyleContext> sc = GetStyleContext(); + Update(sc); +} + @@ -3773,10 +3773,10 @@ Index: firefox-trunk-43.0~a1~hg20150916r262830/widget/gtk/nsMenuObject.cpp + weak = weak->GetPrevious(); + } +} -Index: firefox-trunk-43.0~a1~hg20150916r262830/widget/gtk/nsMenuObject.h +Index: firefox-44.0~a2~hg20151207r291794/widget/gtk/nsMenuObject.h =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ firefox-trunk-43.0~a1~hg20150916r262830/widget/gtk/nsMenuObject.h 2015-09-17 22:38:32.428566987 +0100 ++++ firefox-44.0~a2~hg20151207r291794/widget/gtk/nsMenuObject.h 2015-12-09 22:34:37.000000000 +0000 @@ -0,0 +1,242 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ +/* vim:expandtab:shiftwidth=4:tabstop=4: @@ -3925,10 +3925,10 @@ Index: firefox-trunk-43.0~a1~hg20150916r262830/widget/gtk/nsMenuObject.h + // children outlives their parent). However, we need to keep it alive until + // after running the nsMenuObject destructor for the top-level menu object, + // hence the strong ref -+ nsRefPtr<nsNativeMenuDocListener> mListener; ++ RefPtr<nsNativeMenuDocListener> mListener; + nsMenuContainer *mParent; // [weak] + DbusmenuMenuitem *mNativeData; // [strong] -+ nsRefPtr<nsMenuObjectIconLoader> mIconLoader; ++ RefPtr<nsMenuObjectIconLoader> mIconLoader; + uint8_t mFlags; +}; + @@ -4020,10 +4020,10 @@ Index: firefox-trunk-43.0~a1~hg20150916r262830/widget/gtk/nsMenuObject.h +}; + +#endif /* __nsMenuObject_h__ */ -Index: firefox-trunk-43.0~a1~hg20150916r262830/widget/gtk/nsMenuSeparator.cpp +Index: firefox-44.0~a2~hg20151207r291794/widget/gtk/nsMenuSeparator.cpp =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ firefox-trunk-43.0~a1~hg20150916r262830/widget/gtk/nsMenuSeparator.cpp 2015-09-17 22:38:32.428566987 +0100 ++++ firefox-44.0~a2~hg20151207r291794/widget/gtk/nsMenuSeparator.cpp 2015-12-09 22:34:37.000000000 +0000 @@ -0,0 +1,90 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ +/* vim:expandtab:shiftwidth=4:tabstop=4: @@ -4111,14 +4111,14 @@ Index: firefox-trunk-43.0~a1~hg20150916r262830/widget/gtk/nsMenuSeparator.cpp + + if (aAttribute == nsGkAtoms::hidden || + aAttribute == nsGkAtoms::collapsed) { -+ nsRefPtr<nsStyleContext> sc = GetStyleContext(); ++ RefPtr<nsStyleContext> sc = GetStyleContext(); + UpdateVisibility(sc); + } +} -Index: firefox-trunk-43.0~a1~hg20150916r262830/widget/gtk/nsMenuSeparator.h +Index: firefox-44.0~a2~hg20151207r291794/widget/gtk/nsMenuSeparator.h =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ firefox-trunk-43.0~a1~hg20150916r262830/widget/gtk/nsMenuSeparator.h 2015-09-17 22:38:32.428566987 +0100 ++++ firefox-44.0~a2~hg20151207r291794/widget/gtk/nsMenuSeparator.h 2015-12-09 22:34:37.000000000 +0000 @@ -0,0 +1,41 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ +/* vim:expandtab:shiftwidth=4:tabstop=4: @@ -4161,10 +4161,10 @@ Index: firefox-trunk-43.0~a1~hg20150916r262830/widget/gtk/nsMenuSeparator.h +}; + +#endif /* __nsMenuSeparator_h__ */ -Index: firefox-trunk-43.0~a1~hg20150916r262830/widget/gtk/nsNativeMenuAtomList.h +Index: firefox-44.0~a2~hg20151207r291794/widget/gtk/nsNativeMenuAtomList.h =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ firefox-trunk-43.0~a1~hg20150916r262830/widget/gtk/nsNativeMenuAtomList.h 2015-09-17 22:38:32.428566987 +0100 ++++ firefox-44.0~a2~hg20151207r291794/widget/gtk/nsNativeMenuAtomList.h 2015-12-09 22:34:37.000000000 +0000 @@ -0,0 +1,11 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ +/* vim:expandtab:shiftwidth=4:tabstop=4: @@ -4177,10 +4177,10 @@ Index: firefox-trunk-43.0~a1~hg20150916r262830/widget/gtk/nsNativeMenuAtomList.h +WIDGET_ATOM2(_moz_menupopupstate, "_moz-menupopupstate") +WIDGET_ATOM(openedwithkey) +WIDGET_ATOM(shellshowingmenubar) -Index: firefox-trunk-43.0~a1~hg20150916r262830/widget/gtk/nsNativeMenuAtoms.cpp +Index: firefox-44.0~a2~hg20151207r291794/widget/gtk/nsNativeMenuAtoms.cpp =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ firefox-trunk-43.0~a1~hg20150916r262830/widget/gtk/nsNativeMenuAtoms.cpp 2015-09-17 22:38:32.428566987 +0100 ++++ firefox-44.0~a2~hg20151207r291794/widget/gtk/nsNativeMenuAtoms.cpp 2015-12-09 22:34:37.000000000 +0000 @@ -0,0 +1,39 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ +/* vim:expandtab:shiftwidth=4:tabstop=4: @@ -4221,10 +4221,10 @@ Index: firefox-trunk-43.0~a1~hg20150916r262830/widget/gtk/nsNativeMenuAtoms.cpp +{ + NS_RegisterStaticAtoms(gAtoms); +} -Index: firefox-trunk-43.0~a1~hg20150916r262830/widget/gtk/nsNativeMenuAtoms.h +Index: firefox-44.0~a2~hg20151207r291794/widget/gtk/nsNativeMenuAtoms.h =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ firefox-trunk-43.0~a1~hg20150916r262830/widget/gtk/nsNativeMenuAtoms.h 2015-09-17 22:38:32.428566987 +0100 ++++ firefox-44.0~a2~hg20151207r291794/widget/gtk/nsNativeMenuAtoms.h 2015-12-09 22:34:37.000000000 +0000 @@ -0,0 +1,25 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ +/* vim:expandtab:shiftwidth=4:tabstop=4: @@ -4251,10 +4251,10 @@ Index: firefox-trunk-43.0~a1~hg20150916r262830/widget/gtk/nsNativeMenuAtoms.h +}; + +#endif /* __nsNativeMenuAtoms_h__ */ -Index: firefox-trunk-43.0~a1~hg20150916r262830/widget/gtk/nsNativeMenuDocListener.cpp +Index: firefox-44.0~a2~hg20151207r291794/widget/gtk/nsNativeMenuDocListener.cpp =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ firefox-trunk-43.0~a1~hg20150916r262830/widget/gtk/nsNativeMenuDocListener.cpp 2015-09-17 22:38:32.428566987 +0100 ++++ firefox-44.0~a2~hg20151207r291794/widget/gtk/nsNativeMenuDocListener.cpp 2015-12-09 22:34:37.000000000 +0000 @@ -0,0 +1,370 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ +/* vim:expandtab:shiftwidth=4:tabstop=4: @@ -4560,7 +4560,7 @@ Index: firefox-trunk-43.0~a1~hg20150916r262830/widget/gtk/nsNativeMenuDocListene +/* static */ already_AddRefed<nsNativeMenuDocListener> +nsNativeMenuDocListener::Create(nsIContent *aRootNode) +{ -+ nsRefPtr<nsNativeMenuDocListener> listener = new nsNativeMenuDocListener(); ++ RefPtr<nsNativeMenuDocListener> listener = new nsNativeMenuDocListener(); + if (NS_FAILED(listener->Init(aRootNode))) { + return nullptr; + } @@ -4626,11 +4626,11 @@ Index: firefox-trunk-43.0~a1~hg20150916r262830/widget/gtk/nsNativeMenuDocListene + CancelFlush(this); + mPendingMutations.Clear(); +} -Index: firefox-trunk-43.0~a1~hg20150916r262830/widget/gtk/nsNativeMenuDocListener.h +Index: firefox-44.0~a2~hg20151207r291794/widget/gtk/nsNativeMenuDocListener.h =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ firefox-trunk-43.0~a1~hg20150916r262830/widget/gtk/nsNativeMenuDocListener.h 2015-09-17 22:38:32.428566987 +0100 -@@ -0,0 +1,152 @@ ++++ firefox-44.0~a2~hg20151207r291794/widget/gtk/nsNativeMenuDocListener.h 2015-12-09 22:34:37.000000000 +0000 +@@ -0,0 +1,153 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ +/* vim:expandtab:shiftwidth=4:tabstop=4: + */ @@ -4643,6 +4643,7 @@ Index: firefox-trunk-43.0~a1~hg20150916r262830/widget/gtk/nsNativeMenuDocListene + +#include "mozilla/Attributes.h" +#include "mozilla/GuardObjects.h" ++#include "mozilla/RefPtr.h" +#include "nsAutoPtr.h" +#include "nsDataHashtable.h" +#include "nsStubMutationObserver.h" @@ -4730,7 +4731,7 @@ Index: firefox-trunk-43.0~a1~hg20150916r262830/widget/gtk/nsNativeMenuDocListene + static uint32_t sUpdateDepth; +}; + -+typedef nsTArray<nsRefPtr<nsNativeMenuDocListener> > nsNativeMenuDocListenerTArray; ++typedef nsTArray<RefPtr<nsNativeMenuDocListener> > nsNativeMenuDocListenerTArray; + +class nsNativeMenuChangeObserver +{ @@ -4783,10 +4784,10 @@ Index: firefox-trunk-43.0~a1~hg20150916r262830/widget/gtk/nsNativeMenuDocListene +}; + +#endif /* __nsNativeMenuDocListener_h__ */ -Index: firefox-trunk-43.0~a1~hg20150916r262830/widget/gtk/nsNativeMenuService.cpp +Index: firefox-44.0~a2~hg20151207r291794/widget/gtk/nsNativeMenuService.cpp =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ firefox-trunk-43.0~a1~hg20150916r262830/widget/gtk/nsNativeMenuService.cpp 2015-09-17 22:38:32.428566987 +0100 ++++ firefox-44.0~a2~hg20151207r291794/widget/gtk/nsNativeMenuService.cpp 2015-12-09 22:34:37.000000000 +0000 @@ -0,0 +1,506 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ +/* vim:expandtab:shiftwidth=4:tabstop=4: @@ -5206,7 +5207,7 @@ Index: firefox-trunk-43.0~a1~hg20150916r262830/widget/gtk/nsNativeMenuService.cp +/* static */ already_AddRefed<nsNativeMenuService> +nsNativeMenuService::GetInstance() +{ -+ nsRefPtr<nsNativeMenuService> service(sService); ++ RefPtr<nsNativeMenuService> service(sService); + + if (service) { + return service.forget(); @@ -5294,10 +5295,10 @@ Index: firefox-trunk-43.0~a1~hg20150916r262830/widget/gtk/nsNativeMenuService.cp + + return NS_OK; +} -Index: firefox-trunk-43.0~a1~hg20150916r262830/widget/gtk/nsNativeMenuService.h +Index: firefox-44.0~a2~hg20151207r291794/widget/gtk/nsNativeMenuService.h =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ firefox-trunk-43.0~a1~hg20150916r262830/widget/gtk/nsNativeMenuService.h 2015-09-17 22:38:32.428566987 +0100 ++++ firefox-44.0~a2~hg20151207r291794/widget/gtk/nsNativeMenuService.h 2015-12-09 22:34:37.000000000 +0000 @@ -0,0 +1,88 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ +/* vim:expandtab:shiftwidth=4:tabstop=4: @@ -5387,10 +5388,10 @@ Index: firefox-trunk-43.0~a1~hg20150916r262830/widget/gtk/nsNativeMenuService.h +}; + +#endif /* __nsNativeMenuService_h__ */ -Index: firefox-trunk-43.0~a1~hg20150916r262830/widget/gtk/nsNativeMenuUtils.h +Index: firefox-44.0~a2~hg20151207r291794/widget/gtk/nsNativeMenuUtils.h =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ firefox-trunk-43.0~a1~hg20150916r262830/widget/gtk/nsNativeMenuUtils.h 2015-09-17 22:38:32.428566987 +0100 ++++ firefox-44.0~a2~hg20151207r291794/widget/gtk/nsNativeMenuUtils.h 2015-12-09 22:34:37.000000000 +0000 @@ -0,0 +1,59 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ +/* vim:expandtab:shiftwidth=4:tabstop=4: @@ -5451,10 +5452,10 @@ Index: firefox-trunk-43.0~a1~hg20150916r262830/widget/gtk/nsNativeMenuUtils.h +}; + +#endif /* __nsNativeMenuUtils_h__ */ -Index: firefox-trunk-43.0~a1~hg20150916r262830/widget/gtk/nsWidgetFactory.cpp +Index: firefox-44.0~a2~hg20151207r291794/widget/gtk/nsWidgetFactory.cpp =================================================================== ---- firefox-trunk-43.0~a1~hg20150916r262830.orig/widget/gtk/nsWidgetFactory.cpp 2015-09-17 22:38:32.436567004 +0100 -+++ firefox-trunk-43.0~a1~hg20150916r262830/widget/gtk/nsWidgetFactory.cpp 2015-09-17 22:38:32.428566987 +0100 +--- firefox-44.0~a2~hg20151207r291794.orig/widget/gtk/nsWidgetFactory.cpp 2015-12-08 05:37:43.000000000 +0000 ++++ firefox-44.0~a2~hg20151207r291794/widget/gtk/nsWidgetFactory.cpp 2015-12-09 22:34:37.000000000 +0000 @@ -49,6 +49,9 @@ #include "GfxInfoX11.h" #endif @@ -5523,11 +5524,11 @@ Index: firefox-trunk-43.0~a1~hg20150916r262830/widget/gtk/nsWidgetFactory.cpp nsWidgetGtk2ModuleDtor }; -Index: firefox-trunk-43.0~a1~hg20150916r262830/widget/gtk/nsWindow.cpp +Index: firefox-44.0~a2~hg20151207r291794/widget/gtk/nsWindow.cpp =================================================================== ---- firefox-trunk-43.0~a1~hg20150916r262830.orig/widget/gtk/nsWindow.cpp 2015-09-17 22:38:32.436567004 +0100 -+++ firefox-trunk-43.0~a1~hg20150916r262830/widget/gtk/nsWindow.cpp 2015-09-17 22:38:32.432566995 +0100 -@@ -4922,6 +4922,11 @@ +--- firefox-44.0~a2~hg20151207r291794.orig/widget/gtk/nsWindow.cpp 2015-12-08 05:37:43.000000000 +0000 ++++ firefox-44.0~a2~hg20151207r291794/widget/gtk/nsWindow.cpp 2015-12-09 22:34:37.000000000 +0000 +@@ -5033,6 +5033,11 @@ return NS_OK; } @@ -5539,11 +5540,11 @@ Index: firefox-trunk-43.0~a1~hg20150916r262830/widget/gtk/nsWindow.cpp bool nsWindow::CheckForRollup(gdouble aMouseX, gdouble aMouseY, bool aIsWheel, bool aAlwaysRollup) -Index: firefox-trunk-43.0~a1~hg20150916r262830/widget/gtk/nsWindow.h +Index: firefox-44.0~a2~hg20151207r291794/widget/gtk/nsWindow.h =================================================================== ---- firefox-trunk-43.0~a1~hg20150916r262830.orig/widget/gtk/nsWindow.h 2015-09-17 22:38:32.436567004 +0100 -+++ firefox-trunk-43.0~a1~hg20150916r262830/widget/gtk/nsWindow.h 2015-09-17 22:38:32.432566995 +0100 -@@ -33,6 +33,8 @@ +--- firefox-44.0~a2~hg20151207r291794.orig/widget/gtk/nsWindow.h 2015-12-08 05:37:43.000000000 +0000 ++++ firefox-44.0~a2~hg20151207r291794/widget/gtk/nsWindow.h 2015-12-09 22:34:37.000000000 +0000 +@@ -35,6 +35,8 @@ #include "IMContextWrapper.h" @@ -5552,7 +5553,7 @@ Index: firefox-trunk-43.0~a1~hg20150916r262830/widget/gtk/nsWindow.h #undef LOG #ifdef MOZ_LOGGING -@@ -161,6 +163,8 @@ +@@ -163,6 +165,8 @@ nsIScreen* aTargetScreen = nullptr) override; NS_IMETHOD HideWindowChrome(bool aShouldHide) override; @@ -5561,19 +5562,19 @@ Index: firefox-trunk-43.0~a1~hg20150916r262830/widget/gtk/nsWindow.h /** * GetLastUserInputTime returns a timestamp for the most recent user input * event. This is intended for pointer grab requests (including drags). -@@ -516,6 +520,8 @@ - private: - mozilla::LayoutDeviceIntPoint GdkEventCoordsToDevicePixels(gdouble x, gdouble y); - nsIntRect GdkRectToDevicePixels(GdkRectangle rect); +@@ -548,6 +552,8 @@ + RefPtr<mozilla::widget::IMContextWrapper> mIMContext; + + nsAutoPtr<mozilla::CurrentX11TimeGetter> mCurrentTimeGetter; + + nsAutoPtr<nsMenuBar> mMenuBar; }; class nsChildWindow : public nsWindow { -Index: firefox-trunk-43.0~a1~hg20150916r262830/xpfe/appshell/nsWebShellWindow.cpp +Index: firefox-44.0~a2~hg20151207r291794/xpfe/appshell/nsWebShellWindow.cpp =================================================================== ---- firefox-trunk-43.0~a1~hg20150916r262830.orig/xpfe/appshell/nsWebShellWindow.cpp 2015-09-17 22:38:32.436567004 +0100 -+++ firefox-trunk-43.0~a1~hg20150916r262830/xpfe/appshell/nsWebShellWindow.cpp 2015-09-17 22:38:32.432566995 +0100 +--- firefox-44.0~a2~hg20151207r291794.orig/xpfe/appshell/nsWebShellWindow.cpp 2015-12-08 05:37:50.000000000 +0000 ++++ firefox-44.0~a2~hg20151207r291794/xpfe/appshell/nsWebShellWindow.cpp 2015-12-09 22:34:37.000000000 +0000 @@ -58,6 +58,7 @@ #include "nsIScreen.h" @@ -5603,11 +5604,11 @@ Index: firefox-trunk-43.0~a1~hg20150916r262830/xpfe/appshell/nsWebShellWindow.cp nms->CreateNativeMenuBar(aParentWindow, menubarContent); } else { nms->CreateNativeMenuBar(aParentWindow, nullptr); -Index: firefox-trunk-43.0~a1~hg20150916r262830/widget/gtk/moz.build +Index: firefox-44.0~a2~hg20151207r291794/widget/gtk/moz.build =================================================================== ---- firefox-trunk-43.0~a1~hg20150916r262830.orig/widget/gtk/moz.build 2015-09-17 22:38:32.436567004 +0100 -+++ firefox-trunk-43.0~a1~hg20150916r262830/widget/gtk/moz.build 2015-09-17 22:38:32.432566995 +0100 -@@ -20,10 +20,18 @@ +--- firefox-44.0~a2~hg20151207r291794.orig/widget/gtk/moz.build 2015-12-08 05:37:43.000000000 +0000 ++++ firefox-44.0~a2~hg20151207r291794/widget/gtk/moz.build 2015-12-09 22:34:37.000000000 +0000 +@@ -24,10 +24,18 @@ 'nsAppShell.cpp', 'nsBidiKeyboard.cpp', 'nsColorPicker.cpp', @@ -5626,7 +5627,7 @@ Index: firefox-trunk-43.0~a1~hg20150916r262830/widget/gtk/moz.build 'nsNativeThemeGTK.cpp', 'nsScreenGtk.cpp', 'nsScreenManagerGtk.cpp', -@@ -35,6 +43,8 @@ +@@ -40,6 +48,8 @@ ] SOURCES += [ @@ -5635,7 +5636,7 @@ Index: firefox-trunk-43.0~a1~hg20150916r262830/widget/gtk/moz.build 'nsWindow.cpp', # conflicts with X11 headers ] -@@ -84,6 +94,7 @@ +@@ -89,6 +99,7 @@ LOCAL_INCLUDES += [ '/layout/generic', @@ -5643,11 +5644,11 @@ Index: firefox-trunk-43.0~a1~hg20150916r262830/widget/gtk/moz.build '/layout/xul', '/other-licenses/atk-1.0', '/widget', -Index: firefox-trunk-43.0~a1~hg20150916r262830/browser/base/content/browser.js +Index: firefox-44.0~a2~hg20151207r291794/browser/base/content/browser.js =================================================================== ---- firefox-trunk-43.0~a1~hg20150916r262830.orig/browser/base/content/browser.js 2015-09-17 22:38:32.436567004 +0100 -+++ firefox-trunk-43.0~a1~hg20150916r262830/browser/base/content/browser.js 2015-09-17 22:38:32.432566995 +0100 -@@ -4975,6 +4975,8 @@ +--- firefox-44.0~a2~hg20151207r291794.orig/browser/base/content/browser.js 2015-12-08 05:35:46.000000000 +0000 ++++ firefox-44.0~a2~hg20151207r291794/browser/base/content/browser.js 2015-12-09 22:34:37.000000000 +0000 +@@ -5010,6 +5010,8 @@ let toolbarNodes = Array.slice(gNavToolbox.childNodes); toolbarNodes = toolbarNodes.concat(gNavToolbox.externalToolbars); toolbarNodes = toolbarNodes.filter(node => node.getAttribute("toolbarname")); @@ -5656,10 +5657,10 @@ Index: firefox-trunk-43.0~a1~hg20150916r262830/browser/base/content/browser.js return toolbarNodes; } -Index: firefox-trunk-43.0~a1~hg20150916r262830/widget/moz.build +Index: firefox-44.0~a2~hg20151207r291794/widget/moz.build =================================================================== ---- firefox-trunk-43.0~a1~hg20150916r262830.orig/widget/moz.build 2015-09-17 22:38:32.436567004 +0100 -+++ firefox-trunk-43.0~a1~hg20150916r262830/widget/moz.build 2015-09-17 22:38:32.432566995 +0100 +--- firefox-44.0~a2~hg20151207r291794.orig/widget/moz.build 2015-12-08 05:37:43.000000000 +0000 ++++ firefox-44.0~a2~hg20151207r291794/widget/moz.build 2015-12-09 22:34:37.000000000 +0000 @@ -37,10 +37,12 @@ 'nsITaskbarProgress.idl', ] @@ -5674,11 +5675,11 @@ Index: firefox-trunk-43.0~a1~hg20150916r262830/widget/moz.build TEST_DIRS += ['tests'] # Don't build the DSO under the 'build' directory as windows does. -Index: firefox-trunk-43.0~a1~hg20150916r262830/modules/libpref/init/all.js +Index: firefox-44.0~a2~hg20151207r291794/modules/libpref/init/all.js =================================================================== ---- firefox-trunk-43.0~a1~hg20150916r262830.orig/modules/libpref/init/all.js 2015-09-17 22:38:32.436567004 +0100 -+++ firefox-trunk-43.0~a1~hg20150916r262830/modules/libpref/init/all.js 2015-09-17 22:38:32.432566995 +0100 -@@ -211,6 +211,9 @@ +--- firefox-44.0~a2~hg20151207r291794.orig/modules/libpref/init/all.js 2015-12-08 05:37:24.000000000 +0000 ++++ firefox-44.0~a2~hg20151207r291794/modules/libpref/init/all.js 2015-12-09 22:34:37.000000000 +0000 +@@ -217,6 +217,9 @@ pref("browser.sessionhistory.max_total_viewers", -1); pref("ui.use_native_colors", true); @@ -5688,3 +5689,28 @@ Index: firefox-trunk-43.0~a1~hg20150916r262830/modules/libpref/init/all.js pref("ui.click_hold_context_menus", false); // Duration of timeout of incremental search in menus (ms). 0 means infinite. pref("ui.menu.incremental_search.timeout", 1000); +Index: firefox-44.0~a2~hg20151207r291794/widget/gtk/nsScreenGtk.cpp +=================================================================== +--- firefox-44.0~a2~hg20151207r291794.orig/widget/gtk/nsScreenGtk.cpp 2015-12-08 05:37:43.000000000 +0000 ++++ firefox-44.0~a2~hg20151207r291794/widget/gtk/nsScreenGtk.cpp 2015-12-09 22:35:28.665445270 +0000 +@@ -13,6 +13,7 @@ + #include <gtk/gtk.h> + #include <dlfcn.h> + #include "gfxPlatformGtk.h" ++#include "nsIWidget.h" + + static uint32_t sScreenId = 0; + +Index: firefox-44.0~a2~hg20151207r291794/widget/gtk/nsIdleServiceGTK.cpp +=================================================================== +--- firefox-44.0~a2~hg20151207r291794.orig/widget/gtk/nsIdleServiceGTK.cpp 2015-12-08 05:37:43.000000000 +0000 ++++ firefox-44.0~a2~hg20151207r291794/widget/gtk/nsIdleServiceGTK.cpp 2015-12-09 22:36:46.577798732 +0000 +@@ -13,6 +13,8 @@ + #include "prlink.h" + #include "mozilla/Logging.h" + ++using namespace mozilla; ++ + static PRLogModuleInfo* sIdleLog = nullptr; + + typedef bool (*_XScreenSaverQueryExtension_fn)(Display* dpy, int* event_base, |