diff options
author | nikatar | 2018-09-23 02:50:07 +0300 |
---|---|---|
committer | nikatar | 2018-09-23 02:50:07 +0300 |
commit | b05d3c289deba17ce865e69803b1279955428d0e (patch) | |
tree | 99cf3b7aff1cb7bb1ca23eea9697d415e56b68db /unity-menubar.patch | |
parent | 5a2104ff6fed1f88e67f19a42579c465e862315f (diff) | |
download | aur-b05d3c289deba17ce865e69803b1279955428d0e.tar.gz |
62.0.2
Diffstat (limited to 'unity-menubar.patch')
-rw-r--r-- | unity-menubar.patch | 70 |
1 files changed, 35 insertions, 35 deletions
diff --git a/unity-menubar.patch b/unity-menubar.patch index fcf8bbb8a8da..133651e9bd47 100644 --- a/unity-menubar.patch +++ b/unity-menubar.patch @@ -19,13 +19,13 @@ diff --git a/browser/base/content/browser-menubar.inc b/browser/base/content/bro <menu id="file-menu" label="&fileMenu.label;" accesskey="&fileMenu.accesskey;"> <menupopup id="menu_FilePopup" - onpopupshowing="updateUserContextUIVisibility();"> + onpopupshowing="updateFileMenuUserContextUIVisibility('menu_newUserContext');"> <menuitem id="menu_newNavigatorTab" label="&tabCmd.label;" diff --git a/browser/base/content/browser.js b/browser/base/content/browser.js --- a/browser/base/content/browser.js +++ b/browser/base/content/browser.js -@@ -5573,21 +5573,27 @@ function onViewToolbarsPopupShowing(aEve +@@ -5701,21 +5701,27 @@ function onViewToolbarsPopupShowing(aEve if (deadItem.hasAttribute("toolbarId")) popup.removeChild(deadItem); } @@ -196,7 +196,7 @@ diff --git a/layout/build/nsLayoutStatics.cpp b/layout/build/nsLayoutStatics.cpp #include "mozilla/dom/ipc/IPCBlobInputStreamStorage.h" #include "mozilla/dom/U2FTokenManager.h" #include "mozilla/dom/PointerEventHandler.h" - #include "nsHostObjectProtocolHandler.h" + #include "mozilla/dom/BlobURLProtocolHandler.h" #include "nsThreadManager.h" +#ifdef MOZ_WIDGET_GTK @@ -227,16 +227,16 @@ diff --git a/layout/build/nsLayoutStatics.cpp b/layout/build/nsLayoutStatics.cpp NS_SetStaticAtomsDone(); StartupJSEnvironment(); + nsJSContext::EnsureStatics(); nsGlobalWindowInner::Init(); nsGlobalWindowOuter::Init(); - Navigator::Init(); diff --git a/modules/libpref/init/all.js b/modules/libpref/init/all.js --- a/modules/libpref/init/all.js +++ b/modules/libpref/init/all.js -@@ -272,16 +272,19 @@ pref("dom.script_loader.bytecode_cache.e - // look at: ScriptLoader::ShouldCacheBytecode function. - pref("dom.script_loader.bytecode_cache.strategy", 0); +@@ -262,16 +262,19 @@ pref("dom.script_loader.bytecode_cache.s + pref("dom.script_loader.binast_encoding.enabled", false); + #endif // Fastback caching - if this pref is negative, then we calculate the number // of content viewers to cache based on the amount of available memory. @@ -282,10 +282,10 @@ diff --git a/toolkit/content/xul.css b/toolkit/content/xul.css -moz-box-flex: 1000; } - toolbarpaletteitem { - -moz-binding: url("chrome://global/content/bindings/toolbar.xml#toolbarpaletteitem"); - } + /********* menu ***********/ + menubar > menu { + -moz-binding: url("chrome://global/content/bindings/menu.xml#menu-menubar"); diff --git a/widget/gtk/moz.build b/widget/gtk/moz.build --- a/widget/gtk/moz.build +++ b/widget/gtk/moz.build @@ -862,7 +862,7 @@ new file mode 100644 + continue; + } + -+ AppendChild(Move(child)); ++ AppendChild(std::move(child)); + } +} + @@ -937,7 +937,7 @@ new file mode 100644 + EnsureNoPlaceholderItem(); + } + -+ nsMenuContainer::InsertChildAfter(Move(aChild), aPrevSibling, ++ nsMenuContainer::InsertChildAfter(std::move(aChild), aPrevSibling, + !IsInBatchedUpdate()); + StructureMutated(); +} @@ -949,7 +949,7 @@ new file mode 100644 + EnsureNoPlaceholderItem(); + } + -+ nsMenuContainer::AppendChild(Move(aChild), !IsInBatchedUpdate()); ++ nsMenuContainer::AppendChild(std::move(aChild), !IsInBatchedUpdate()); + StructureMutated(); +} + @@ -991,7 +991,7 @@ new file mode 100644 + UniquePtr<nsMenuObject> child = CreateChild(aChild); + + if (child) { -+ InsertChildAfter(Move(child), aPrevSibling); ++ InsertChildAfter(std::move(child), aPrevSibling); + } + } else { + Build(); @@ -1737,7 +1737,7 @@ new file mode 100644 + continue; + } + -+ AppendChild(Move(child)); ++ AppendChild(std::move(child)); + } +} + @@ -1904,7 +1904,7 @@ new file mode 100644 + return; + } + -+ InsertChildAfter(Move(child), aPrevSibling); ++ InsertChildAfter(std::move(child), aPrevSibling); +} + +void @@ -1978,7 +1978,7 @@ new file mode 100644 + return nullptr; + } + -+ return Move(menubar); ++ return std::move(menubar); +} + +nsMenuObject::EType @@ -2259,7 +2259,7 @@ new file mode 100644 + } + + UniquePtr<nsMenuObject> res = ctor(this, aContent); -+ return Move(res); ++ return std::move(res); +} + +size_t @@ -2322,7 +2322,7 @@ new file mode 100644 + index)); + } + -+ MOZ_ALWAYS_TRUE(mChildren.InsertElementAt(index, Move(aChild))); ++ MOZ_ALWAYS_TRUE(mChildren.InsertElementAt(index, std::move(aChild))); +} + +void @@ -2336,7 +2336,7 @@ new file mode 100644 + aChild->GetNativeData())); + } + -+ MOZ_ALWAYS_TRUE(mChildren.AppendElement(Move(aChild))); ++ MOZ_ALWAYS_TRUE(mChildren.AppendElement(std::move(aChild))); +} + +bool @@ -5358,10 +5358,10 @@ new file mode 100644 + NS_ENSURE_ARG(aParent); + NS_ENSURE_ARG(aMenuBarNode); + -+ if (aMenuBarNode->AsElement()->AttrValueIs(kNameSpaceID_None, -+ nsNativeMenuAtoms::_moz_menubarkeeplocal, -+ nsGkAtoms::_true, -+ eCaseMatters)) { ++ if (aMenuBarNode->AttrValueIs(kNameSpaceID_None, ++ nsNativeMenuAtoms::_moz_menubarkeeplocal, ++ nsGkAtoms::_true, ++ eCaseMatters)) { + return NS_OK; + } + @@ -5382,7 +5382,7 @@ new file mode 100644 + mMenuBars.AppendElement(menubar.get()); + RegisterNativeMenuBar(menubar.get()); + -+ static_cast<nsWindow *>(aParent)->SetMenuBar(Move(menubar)); ++ static_cast<nsWindow *>(aParent)->SetMenuBar(std::move(menubar)); + + return NS_OK; +} @@ -5521,7 +5521,7 @@ new file mode 100644 diff --git a/widget/gtk/nsWidgetFactory.cpp b/widget/gtk/nsWidgetFactory.cpp --- a/widget/gtk/nsWidgetFactory.cpp +++ b/widget/gtk/nsWidgetFactory.cpp -@@ -43,16 +43,18 @@ +@@ -44,16 +44,18 @@ #include "nsImageToPixbuf.h" #include "nsPrintDialogGTK.h" @@ -5540,7 +5540,7 @@ diff --git a/widget/gtk/nsWidgetFactory.cpp b/widget/gtk/nsWidgetFactory.cpp #include "mozilla/gfx/2D.h" #include "mozilla/widget/ScreenManager.h" #include <gtk/gtk.h> -@@ -111,16 +113,19 @@ nsNativeThemeGTKConstructor(nsISupports +@@ -112,16 +114,19 @@ nsNativeThemeGTKConstructor(nsISupports namespace mozilla { namespace widget { // This constructor should really be shared with all platforms. @@ -5560,7 +5560,7 @@ diff --git a/widget/gtk/nsWidgetFactory.cpp b/widget/gtk/nsWidgetFactory.cpp NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(nsPrintDialogServiceGTK, Init) #endif -@@ -224,16 +229,17 @@ NS_DEFINE_NAMED_CID(NS_PRINTSESSION_CID) +@@ -225,16 +230,17 @@ NS_DEFINE_NAMED_CID(NS_PRINTSESSION_CID) NS_DEFINE_NAMED_CID(NS_DEVICE_CONTEXT_SPEC_CID); NS_DEFINE_NAMED_CID(NS_PRINTDIALOGSERVICE_CID); #endif @@ -5578,7 +5578,7 @@ diff --git a/widget/gtk/nsWidgetFactory.cpp b/widget/gtk/nsWidgetFactory.cpp { &kNS_APPSHELL_CID, false, nullptr, nsAppShellConstructor, Module::ALLOW_IN_GPU_PROCESS }, { &kNS_COLORPICKER_CID, false, nullptr, nsColorPickerConstructor, Module::MAIN_PROCESS_ONLY }, { &kNS_FILEPICKER_CID, false, nullptr, nsFilePickerConstructor, Module::MAIN_PROCESS_ONLY }, -@@ -260,16 +266,17 @@ static const mozilla::Module::CIDEntry k +@@ -261,16 +267,17 @@ static const mozilla::Module::CIDEntry k { &kNS_DEVICE_CONTEXT_SPEC_CID, false, nullptr, nsDeviceContextSpecGTKConstructor }, { &kNS_PRINTDIALOGSERVICE_CID, false, nullptr, nsPrintDialogServiceGTKConstructor }, #endif @@ -5596,7 +5596,7 @@ diff --git a/widget/gtk/nsWidgetFactory.cpp b/widget/gtk/nsWidgetFactory.cpp { "@mozilla.org/widgets/child_window/gtk;1", &kNS_CHILD_CID }, { "@mozilla.org/widget/appshell/gtk;1", &kNS_APPSHELL_CID, Module::ALLOW_IN_GPU_PROCESS }, { "@mozilla.org/colorpicker;1", &kNS_COLORPICKER_CID, Module::MAIN_PROCESS_ONLY }, -@@ -298,16 +305,17 @@ static const mozilla::Module::ContractID +@@ -299,16 +306,17 @@ static const mozilla::Module::ContractID { "@mozilla.org/gfx/devicecontextspec;1", &kNS_DEVICE_CONTEXT_SPEC_CID }, { NS_PRINTDIALOGSERVICE_CONTRACTID, &kNS_PRINTDIALOGSERVICE_CID }, #endif @@ -5635,7 +5635,7 @@ diff --git a/widget/gtk/nsWindow.cpp b/widget/gtk/nsWindow.cpp #include "nsGtkUtils.h" #include "nsIObserverService.h" #include "mozilla/layers/LayersTypes.h" -@@ -5219,16 +5220,21 @@ nsWindow::SetWindowDecoration(nsBorderSt +@@ -5246,16 +5247,21 @@ nsWindow::SetWindowDecoration(nsBorderSt } void @@ -5646,7 +5646,7 @@ diff --git a/widget/gtk/nsWindow.cpp b/widget/gtk/nsWindow.cpp +void +nsWindow::SetMenuBar(UniquePtr<nsMenuBar> aMenuBar) { -+ mMenuBar = mozilla::Move(aMenuBar); ++ mMenuBar = std::move(aMenuBar); +} + bool @@ -5679,7 +5679,7 @@ diff --git a/widget/gtk/nsWindow.h b/widget/gtk/nsWindow.h #include "Units.h" extern mozilla::LazyLogModule gWidgetLog; -@@ -159,16 +161,18 @@ public: +@@ -173,16 +175,18 @@ public: uint16_t aDuration, nsISupports* aData, nsIRunnable* aCallback) override; @@ -5698,7 +5698,7 @@ diff --git a/widget/gtk/nsWindow.h b/widget/gtk/nsWindow.h // utility method, -1 if no change should be made, otherwise returns a // value that can be passed to gdk_window_set_decorations -@@ -632,11 +636,13 @@ private: +@@ -646,11 +650,13 @@ private: * all windows in a hierarchy. If the children are released after the top * level window is released, the children still have a valid pointer, * however, IME doesn't work at that time. @@ -5741,7 +5741,7 @@ diff --git a/widget/moz.build b/widget/moz.build diff --git a/xpfe/appshell/nsWebShellWindow.cpp b/xpfe/appshell/nsWebShellWindow.cpp --- a/xpfe/appshell/nsWebShellWindow.cpp +++ b/xpfe/appshell/nsWebShellWindow.cpp -@@ -62,17 +62,17 @@ +@@ -61,17 +61,17 @@ #include "mozilla/DebugOnly.h" #include "mozilla/EventDispatcher.h" #include "mozilla/MouseEvents.h" |