forked from pool/MozillaFirefox
- update to Firefox 63.0
* WebExtensions now run in their own process on Linux * The Ctrl+Tab shortcut now displays thumbnail previews of your tabs and cycles through tabs in recently used order. This new default behavior is activated only in new profiles and can be changed in preferences. * Added support for Web Components custom elements and shadow DOM - requires NSPR 4.20, NSS 3.39 and Rust 1.28 OBS-URL: https://build.opensuse.org/package/show/mozilla:Factory/MozillaFirefox?expand=0&rev=691
This commit is contained in:
parent
5048a922bb
commit
6bbb36ffe9
@ -1,10 +1,22 @@
|
|||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Thu Oct 25 14:39:04 UTC 2018 - Guillaume GARDET <guillaume.gardet@opensuse.org>
|
Mon Oct 29 14:07:51 UTC 2018 - wr@rosenauer.org
|
||||||
|
|
||||||
|
- update to Firefox 63.0
|
||||||
|
* WebExtensions now run in their own process on Linux
|
||||||
|
* The Ctrl+Tab shortcut now displays thumbnail previews of your
|
||||||
|
tabs and cycles through tabs in recently used order. This new
|
||||||
|
default behavior is activated only in new profiles and can be
|
||||||
|
changed in preferences.
|
||||||
|
* Added support for Web Components custom elements and shadow DOM
|
||||||
|
- requires NSPR 4.20, NSS 3.39 and Rust 1.28
|
||||||
|
|
||||||
|
-------------------------------------------------------------------
|
||||||
|
Thu Oct 25 14:39:04 UTC 2018 - guillaume.gardet@opensuse.org
|
||||||
|
|
||||||
- Update _constraints for armv6/7
|
- Update _constraints for armv6/7
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Thu Oct 25 08:50:24 UTC 2018 - Guillaume GARDET <guillaume.gardet@opensuse.org>
|
Thu Oct 25 08:50:24 UTC 2018 - guillaume.gardet@opensuse.org
|
||||||
|
|
||||||
- Add patch to fix build on armv7:
|
- Add patch to fix build on armv7:
|
||||||
* mozilla-bmo1463035.patch
|
* mozilla-bmo1463035.patch
|
||||||
|
@ -18,13 +18,13 @@
|
|||||||
|
|
||||||
|
|
||||||
# changed with every update
|
# changed with every update
|
||||||
%define major 62
|
%define major 63
|
||||||
%define mainver %major.0.3
|
%define mainver %major.0
|
||||||
%define orig_version 62.0.3
|
%define orig_version 63.0
|
||||||
%define orig_suffix %{nil}
|
%define orig_suffix %{nil}
|
||||||
%define update_channel release
|
%define update_channel release
|
||||||
%define branding 1
|
%define branding 1
|
||||||
%define releasedate 20181002000000
|
%define releasedate 20181018182531
|
||||||
%define source_prefix firefox-%{orig_version}
|
%define source_prefix firefox-%{orig_version}
|
||||||
|
|
||||||
# PIE, full relro (x86_64 for now)
|
# PIE, full relro (x86_64 for now)
|
||||||
@ -74,12 +74,12 @@ BuildRequires: libiw-devel
|
|||||||
BuildRequires: libnotify-devel
|
BuildRequires: libnotify-devel
|
||||||
BuildRequires: libproxy-devel
|
BuildRequires: libproxy-devel
|
||||||
BuildRequires: makeinfo
|
BuildRequires: makeinfo
|
||||||
BuildRequires: mozilla-nspr-devel >= 4.19
|
BuildRequires: mozilla-nspr-devel >= 4.20
|
||||||
BuildRequires: mozilla-nss-devel >= 3.38
|
BuildRequires: mozilla-nss-devel >= 3.39
|
||||||
BuildRequires: python-devel
|
BuildRequires: python-devel
|
||||||
BuildRequires: python2-xml
|
BuildRequires: python2-xml
|
||||||
BuildRequires: python3 >= 3.5
|
BuildRequires: python3 >= 3.5
|
||||||
BuildRequires: rust >= 1.24
|
BuildRequires: rust >= 1.26
|
||||||
BuildRequires: rust-std
|
BuildRequires: rust-std
|
||||||
BuildRequires: startup-notification-devel
|
BuildRequires: startup-notification-devel
|
||||||
BuildRequires: unzip
|
BuildRequires: unzip
|
||||||
@ -155,12 +155,10 @@ Patch1: mozilla-nongnome-proxies.patch
|
|||||||
Patch2: mozilla-kde.patch
|
Patch2: mozilla-kde.patch
|
||||||
Patch3: mozilla-ntlm-full-path.patch
|
Patch3: mozilla-ntlm-full-path.patch
|
||||||
Patch4: mozilla-openaes-decl.patch
|
Patch4: mozilla-openaes-decl.patch
|
||||||
Patch5: mozilla-no-stdcxx-check.patch
|
|
||||||
Patch6: mozilla-reduce-files-per-UnifiedBindings.patch
|
Patch6: mozilla-reduce-files-per-UnifiedBindings.patch
|
||||||
Patch7: mozilla-aarch64-startup-crash.patch
|
Patch7: mozilla-aarch64-startup-crash.patch
|
||||||
Patch8: mozilla-bmo256180.patch
|
Patch8: mozilla-bmo256180.patch
|
||||||
Patch9: mozilla-no-return.patch
|
Patch9: mozilla-bmo1463035.patch
|
||||||
Patch10: mozilla-bmo1463035.patch
|
|
||||||
# Firefox/browser
|
# Firefox/browser
|
||||||
Patch101: firefox-kde.patch
|
Patch101: firefox-kde.patch
|
||||||
Patch102: firefox-branded-icons.patch
|
Patch102: firefox-branded-icons.patch
|
||||||
@ -264,14 +262,12 @@ cd $RPM_BUILD_DIR/%{source_prefix}
|
|||||||
%patch2 -p1
|
%patch2 -p1
|
||||||
%patch3 -p1
|
%patch3 -p1
|
||||||
%patch4 -p1
|
%patch4 -p1
|
||||||
%patch5 -p1
|
|
||||||
%ifarch %ix86
|
%ifarch %ix86
|
||||||
%patch6 -p1
|
%patch6 -p1
|
||||||
%endif
|
%endif
|
||||||
%patch7 -p1
|
%patch7 -p1
|
||||||
%patch8 -p1
|
%patch8 -p1
|
||||||
%patch9 -p1
|
%patch9 -p1
|
||||||
%patch10 -p1
|
|
||||||
# Firefox
|
# Firefox
|
||||||
%patch101 -p1
|
%patch101 -p1
|
||||||
%patch102 -p1
|
%patch102 -p1
|
||||||
|
@ -1,3 +1,3 @@
|
|||||||
version https://git-lfs.github.com/spec/v1
|
version https://git-lfs.github.com/spec/v1
|
||||||
oid sha256:27af58da73451950ebf835d79afa0a16bf3f1a656d2a754a9d425117412ed4b0
|
oid sha256:be9a1053e0516d4a8661b408fae6a82ecfcf65fe5e8c6b13e7abebacd89f3b23
|
||||||
size 28828
|
size 28404
|
||||||
|
@ -7,8 +7,8 @@
|
|||||||
|
|
||||||
CHANNEL="release"
|
CHANNEL="release"
|
||||||
BRANCH="releases/mozilla-$CHANNEL"
|
BRANCH="releases/mozilla-$CHANNEL"
|
||||||
RELEASE_TAG="c9ed11ae5c79df3dcb69075e1c9da0317d1ecb1b"
|
RELEASE_TAG="FIREFOX_63_0_RELEASE"
|
||||||
VERSION="62.0.3"
|
VERSION="63.0"
|
||||||
VERSION_SUFFIX=""
|
VERSION_SUFFIX=""
|
||||||
LOCALE_FILE="firefox-$VERSION/browser/locales/l10n-changesets.json"
|
LOCALE_FILE="firefox-$VERSION/browser/locales/l10n-changesets.json"
|
||||||
|
|
||||||
|
@ -1,3 +0,0 @@
|
|||||||
version https://git-lfs.github.com/spec/v1
|
|
||||||
oid sha256:c1d506eb7b1225e52398b2e4587085e77ff5f1fbf07728ba0fee60bbeae94636
|
|
||||||
size 259531444
|
|
@ -1,17 +0,0 @@
|
|||||||
-----BEGIN PGP SIGNATURE-----
|
|
||||||
Version: GnuPG v2.0.14 (GNU/Linux)
|
|
||||||
|
|
||||||
iQIcBAABCAAGBQJbsmo1AAoJELu+vbskxvNV8vEQALnsRG+LaLIk2FOHX1BgwpK4
|
|
||||||
7eAsq6P80fLJMKsHhyAZK8cPLGPrHK9sctxGhanbAP0HablmcxXRkGxBed74iVmJ
|
|
||||||
gOYrtI53eG0yy2U9rcC4iti5aa0Ff5jFzapks+XFiuwXabT+vhY2fHPWTLWdxuOy
|
|
||||||
m7xs9AJuf8Y7sTG1YYeeKQr4AzYdAxxpCC2StVo1Aogp87R0UxbI6Qxu/hL5LgaB
|
|
||||||
Z+D1vlH7GOFKfAZ/PXMDFmvBLVRv8hp3yWAwUNthQuP01OHHbN67CRvlddge+85c
|
|
||||||
lygJ+eNq13NUMX0L7nbEIVylvKuEr4zjkRF3A28yRcqn+chr4z3QUvX791Xs6xsJ
|
|
||||||
S3WL6FDVcOhX4KzTUrkBfGIPfHm+jsFDhHuNSLqDRGasWmwPWEVV08EqalOjEn0h
|
|
||||||
QCTDxaFd2mn2R53WUo0YwCfFQF983AEGB/Kxkqiim8Sxe58A5VROaJv4ko/QKNCE
|
|
||||||
8z2cPbmIzw1yC8atnduIYOgCLinadI+ibZ5scaTf+rcNufLnYKEbzeNTuALQnoN9
|
|
||||||
ZuPvIdvBf7x2hukDBRgrWmsvGB2/SQJ2OL3Gltqceb5Qo3TSFZS4CSkX8ps7/BKA
|
|
||||||
VZg72bhRAiyz7dAFah1h5UDH4H79rNS8+BNfVC5MmDTDfjtMm24ApZ3MmcKq48Cz
|
|
||||||
PMEfO5f6vQZR829H7jre
|
|
||||||
=lzNt
|
|
||||||
-----END PGP SIGNATURE-----
|
|
3
firefox-63.0.source.tar.xz
Normal file
3
firefox-63.0.source.tar.xz
Normal file
@ -0,0 +1,3 @@
|
|||||||
|
version https://git-lfs.github.com/spec/v1
|
||||||
|
oid sha256:3f95b028571ab9ffb3bf637761534a685aed224de3b87eb8ad7e1d0831995c07
|
||||||
|
size 265957640
|
17
firefox-63.0.source.tar.xz.asc
Normal file
17
firefox-63.0.source.tar.xz.asc
Normal file
@ -0,0 +1,17 @@
|
|||||||
|
-----BEGIN PGP SIGNATURE-----
|
||||||
|
Version: GnuPG v2.0.14 (GNU/Linux)
|
||||||
|
|
||||||
|
iQIcBAABCAAGBQJbyOkNAAoJELu+vbskxvNV5LMQAK7JdjrLmZ0BQm489MBrC6Pq
|
||||||
|
RLAdoa8Qpkng4Ffe9Rtjj9DTo3ZdJfccTm41E/k8yc5OJ2hwtKfsB3nheCCDtnON
|
||||||
|
aqBUBkj2Rd3heLZBV0uKL56shCf41p58Xp93tsYQJeVfFvOMImVcYNxxyw0M9O7R
|
||||||
|
EZeABrOIhvTlIXWRjgnVgcuPMvOK5sgrtdKT8c9kSIEjCRn49w7jAe7RMgVYWfop
|
||||||
|
FDUmtM4Q1ZwxQoyGjJYSTbwIebSfirwzjXgUD5jTith4bvhDCu4bAx62IyONEGG/
|
||||||
|
2M+WjPviP7n/RRC2EfWbZukozLCGGCkeIQpyRlcSpZxtqNkR3Q+rWhRVXm7VeyfC
|
||||||
|
Bp3MQWEOE75f1hMxS14ggD+lAXq7u4pj6wdGROFTHXRLPEvjj12F76Xr2hUqWX02
|
||||||
|
HA/WVNsYTlqd08+ojbEqsJBDPi2UUv/ogaEWfKPehpnzXJ1znO5eVMdNnA0ykjD4
|
||||||
|
nbo4PRDt3g6E2GMXJgpnVcrq8bQv28s+cHaC4OhxZ7E0fPtfvPp2j0CLX2TGZwq2
|
||||||
|
Ub8NKYWrt6ZjEJrf7fAFMkHnlK+OCb/69byoKhbcrOozZk47f74scVRAv9iLWPdK
|
||||||
|
qj+HeOP8/lg7UMLjN/vP9xpLl4tMpCXmu+H2+uE/OBYS6YNtheHIgwy4EG3DDDSj
|
||||||
|
VKJF8cbSSpvtyh5Q/4Ka
|
||||||
|
=1MST
|
||||||
|
-----END PGP SIGNATURE-----
|
@ -1,11 +1,11 @@
|
|||||||
# HG changeset patch
|
# HG changeset patch
|
||||||
# Parent 0629fb9c6879e14c1b5e3cbff53b0d44371f0127
|
# Parent fdf78810e83396d10418791fbe32bed6bfe1558b
|
||||||
|
|
||||||
diff --git a/browser/base/content/browser-kde.xul b/browser/base/content/browser-kde.xul
|
diff --git a/browser/base/content/browser-kde.xul b/browser/base/content/browser-kde.xul
|
||||||
new file mode 100644
|
new file mode 100644
|
||||||
--- /dev/null
|
--- /dev/null
|
||||||
+++ b/browser/base/content/browser-kde.xul
|
+++ b/browser/base/content/browser-kde.xul
|
||||||
@@ -0,0 +1,1291 @@
|
@@ -0,0 +1,1317 @@
|
||||||
+#filter substitution
|
+#filter substitution
|
||||||
+<?xml version="1.0"?>
|
+<?xml version="1.0"?>
|
||||||
+# -*- Mode: HTML -*-
|
+# -*- Mode: HTML -*-
|
||||||
@ -14,18 +14,23 @@ new file mode 100644
|
|||||||
+# License, v. 2.0. If a copy of the MPL was not distributed with this
|
+# License, v. 2.0. If a copy of the MPL was not distributed with this
|
||||||
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
|
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
|
||||||
+
|
+
|
||||||
|
+<!-- The "global.css" stylesheet is imported first to allow other stylesheets to
|
||||||
|
+ override rules using selectors with the same specificity. This applies to
|
||||||
|
+ both "content" and "skin" packages, which bug 1385444 will unify later. -->
|
||||||
|
+<?xml-stylesheet href="chrome://global/skin/" type="text/css"?>
|
||||||
|
+
|
||||||
+<?xml-stylesheet href="chrome://browser/content/browser.css" type="text/css"?>
|
+<?xml-stylesheet href="chrome://browser/content/browser.css" type="text/css"?>
|
||||||
+<?xml-stylesheet href="chrome://browser/content/downloads/downloads.css"?>
|
+<?xml-stylesheet href="chrome://browser/content/tabbrowser.css" type="text/css"?>
|
||||||
|
+<?xml-stylesheet href="chrome://browser/content/downloads/downloads.css" type="text/css"?>
|
||||||
+<?xml-stylesheet href="chrome://browser/content/places/places.css" type="text/css"?>
|
+<?xml-stylesheet href="chrome://browser/content/places/places.css" type="text/css"?>
|
||||||
+<?xml-stylesheet href="chrome://browser/content/usercontext/usercontext.css" type="text/css"?>
|
+<?xml-stylesheet href="chrome://browser/content/usercontext/usercontext.css" type="text/css"?>
|
||||||
|
+<?xml-stylesheet href="chrome://browser/skin/" type="text/css"?>
|
||||||
+<?xml-stylesheet href="chrome://browser/skin/controlcenter/panel.css" type="text/css"?>
|
+<?xml-stylesheet href="chrome://browser/skin/controlcenter/panel.css" type="text/css"?>
|
||||||
+<?xml-stylesheet href="chrome://browser/skin/customizableui/panelUI.css" type="text/css"?>
|
+<?xml-stylesheet href="chrome://browser/skin/customizableui/panelUI.css" type="text/css"?>
|
||||||
+<?xml-stylesheet href="chrome://browser/skin/downloads/downloads.css"?>
|
+<?xml-stylesheet href="chrome://browser/skin/downloads/downloads.css" type="text/css"?>
|
||||||
+<?xml-stylesheet href="chrome://browser/skin/searchbar.css"?>
|
+<?xml-stylesheet href="chrome://browser/skin/searchbar.css" type="text/css"?>
|
||||||
+<?xml-stylesheet href="chrome://browser/skin/places/places.css"?>
|
+<?xml-stylesheet href="chrome://browser/skin/places/tree-icons.css" type="text/css"?>
|
||||||
+<?xml-stylesheet href="chrome://browser/skin/places/editBookmark.css"?>
|
+<?xml-stylesheet href="chrome://browser/skin/places/editBookmark.css" type="text/css"?>
|
||||||
+<?xml-stylesheet href="chrome://browser/skin/" type="text/css"?>
|
|
||||||
+<?xml-stylesheet href="chrome://browser/content/tabbrowser.css" type="text/css"?>
|
|
||||||
+<?xml-stylesheet href="chrome://browser/skin/compacttheme.css" type="text/css" alternate="yes" title="Light/Dark"?>
|
+<?xml-stylesheet href="chrome://browser/skin/compacttheme.css" type="text/css" alternate="yes" title="Light/Dark"?>
|
||||||
+
|
+
|
||||||
+# All DTD information is stored in a separate file so that it can be shared by
|
+# All DTD information is stored in a separate file so that it can be shared by
|
||||||
@ -40,7 +45,6 @@ new file mode 100644
|
|||||||
+ xmlns:html="http://www.w3.org/1999/xhtml"
|
+ xmlns:html="http://www.w3.org/1999/xhtml"
|
||||||
+ xmlns:xul="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
|
+ xmlns:xul="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
|
||||||
+ xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
|
+ xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
|
||||||
+ onload="gBrowserInit.onLoad()" onunload="gBrowserInit.onUnload()" onclose="return WindowIsClosing();"
|
|
||||||
+ title="&mainWindow.title;"
|
+ title="&mainWindow.title;"
|
||||||
+ title_normal="&mainWindow.title;"
|
+ title_normal="&mainWindow.title;"
|
||||||
+#ifdef XP_MACOSX
|
+#ifdef XP_MACOSX
|
||||||
@ -75,31 +79,36 @@ new file mode 100644
|
|||||||
+# that they can be shared with macWindow.inc.xul.
|
+# that they can be shared with macWindow.inc.xul.
|
||||||
+#include global-scripts.inc
|
+#include global-scripts.inc
|
||||||
+
|
+
|
||||||
+<script type="application/javascript">
|
+<script type="application/javascript"
|
||||||
|
+#ifdef BROWSER_XHTML
|
||||||
|
+xmlns="http://www.w3.org/1999/xhtml"
|
||||||
|
+#endif
|
||||||
|
+>
|
||||||
+ Services.scriptloader.loadSubScript("chrome://global/content/contentAreaUtils.js", this);
|
+ Services.scriptloader.loadSubScript("chrome://global/content/contentAreaUtils.js", this);
|
||||||
+ Services.scriptloader.loadSubScript("chrome://browser/content/tabbrowser.js", this);
|
+ Services.scriptloader.loadSubScript("chrome://browser/content/tabbrowser.js", this);
|
||||||
+
|
+
|
||||||
+ ChromeUtils.defineModuleGetter(window,
|
+ window.onload = gBrowserInit.onLoad.bind(gBrowserInit);
|
||||||
+ "PlacesUtils", "resource://gre/modules/PlacesUtils.jsm");
|
+ window.onunload = gBrowserInit.onUnload.bind(gBrowserInit);
|
||||||
+ ChromeUtils.defineModuleGetter(window,
|
+ window.onclose = WindowIsClosing;
|
||||||
+ "PlacesUIUtils", "resource:///modules/PlacesUIUtils.jsm");
|
+#ifdef BROWSER_XHTML
|
||||||
+ ChromeUtils.defineModuleGetter(window,
|
+ window.addEventListener("DOMContentLoaded",
|
||||||
+ "PlacesTransactions", "resource://gre/modules/PlacesTransactions.jsm");
|
+ gBrowserInit.onBeforeInitialXULLayout.bind(gBrowserInit), { once: true });
|
||||||
+
|
+#else
|
||||||
+ ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
|
+ window.addEventListener("MozBeforeInitialXULLayout",
|
||||||
+ XPCOMUtils.defineLazyScriptGetter(window, "PlacesTreeView",
|
+ gBrowserInit.onBeforeInitialXULLayout.bind(gBrowserInit), { once: true });
|
||||||
+ "chrome://browser/content/places/treeView.js");
|
+#endif
|
||||||
+ XPCOMUtils.defineLazyScriptGetter(window,
|
+ // The listener of DOMContentLoaded must be set on window, rather than
|
||||||
+ ["PlacesInsertionPoint", "PlacesController", "PlacesControllerDragHelper"],
|
+ // document, because the window can go away before the event is fired.
|
||||||
+ "chrome://browser/content/places/controller.js");
|
+ // In that case, we don't want to initialize anything, otherwise we
|
||||||
|
+ // may be leaking things because they will never be destroyed after.
|
||||||
|
+ window.addEventListener("DOMContentLoaded",
|
||||||
|
+ gBrowserInit.onDOMContentLoaded.bind(gBrowserInit), { once: true });
|
||||||
+</script>
|
+</script>
|
||||||
+
|
+
|
||||||
+# All sets except for popupsets (commands, keys, stringbundles and broadcasters)
|
+# All sets except for popupsets (commands, keys, and stringbundles)
|
||||||
+# *must* go into the browser-sets.inc file so that they can be shared with other
|
+# *must* go into the browser-sets.inc file so that they can be shared with other
|
||||||
+# top level windows in macWindow.inc.xul.
|
+# top level windows in macWindow.inc.xul.
|
||||||
+#define FULL_BROWSER_WINDOW
|
|
||||||
+#include browser-sets.inc
|
+#include browser-sets.inc
|
||||||
+#undef FULL_BROWSER_WINDOW
|
|
||||||
+
|
+
|
||||||
+ <popupset id="mainPopupSet">
|
+ <popupset id="mainPopupSet">
|
||||||
+ <menupopup id="tabContextMenu"
|
+ <menupopup id="tabContextMenu"
|
||||||
@ -107,6 +116,9 @@ new file mode 100644
|
|||||||
+ onpopuphidden="if (event.target == this) TabContextMenu.contextTab = null;">
|
+ onpopuphidden="if (event.target == this) TabContextMenu.contextTab = null;">
|
||||||
+ <menuitem id="context_reloadTab" label="&reloadTab.label;" accesskey="&reloadTab.accesskey;"
|
+ <menuitem id="context_reloadTab" label="&reloadTab.label;" accesskey="&reloadTab.accesskey;"
|
||||||
+ oncommand="gBrowser.reloadTab(TabContextMenu.contextTab);"/>
|
+ oncommand="gBrowser.reloadTab(TabContextMenu.contextTab);"/>
|
||||||
|
+ <menuitem id="context_reloadSelectedTabs" label="&reloadSelectedTabs.label;" hidden="true"
|
||||||
|
+ accesskey="&reloadSelectedTabs.accesskey;"
|
||||||
|
+ oncommand="gBrowser.reloadMultiSelectedTabs();"/>
|
||||||
+ <menuitem id="context_toggleMuteTab" oncommand="TabContextMenu.contextTab.toggleMuteAudio();"/>
|
+ <menuitem id="context_toggleMuteTab" oncommand="TabContextMenu.contextTab.toggleMuteAudio();"/>
|
||||||
+ <menuitem id="context_toggleMuteSelectedTabs" hidden="true"
|
+ <menuitem id="context_toggleMuteSelectedTabs" hidden="true"
|
||||||
+ oncommand="gBrowser.toggleMuteAudioOnMultiSelectedTabs(TabContextMenu.contextTab);"/>
|
+ oncommand="gBrowser.toggleMuteAudioOnMultiSelectedTabs(TabContextMenu.contextTab);"/>
|
||||||
@ -117,6 +129,12 @@ new file mode 100644
|
|||||||
+ <menuitem id="context_unpinTab" label="&unpinTab.label;" hidden="true"
|
+ <menuitem id="context_unpinTab" label="&unpinTab.label;" hidden="true"
|
||||||
+ accesskey="&unpinTab.accesskey;"
|
+ accesskey="&unpinTab.accesskey;"
|
||||||
+ oncommand="gBrowser.unpinTab(TabContextMenu.contextTab);"/>
|
+ oncommand="gBrowser.unpinTab(TabContextMenu.contextTab);"/>
|
||||||
|
+ <menuitem id="context_pinSelectedTabs" label="&pinSelectedTabs.label;" hidden="true"
|
||||||
|
+ accesskey="&pinSelectedTabs.accesskey;"
|
||||||
|
+ oncommand="gBrowser.pinMultiSelectedTabs();"/>
|
||||||
|
+ <menuitem id="context_unpinSelectedTabs" label="&unpinSelectedTabs.label;" hidden="true"
|
||||||
|
+ accesskey="&unpinSelectedTabs.accesskey;"
|
||||||
|
+ oncommand="gBrowser.unpinMultiSelectedTabs();"/>
|
||||||
+ <menuitem id="context_duplicateTab" label="&duplicateTab.label;"
|
+ <menuitem id="context_duplicateTab" label="&duplicateTab.label;"
|
||||||
+ accesskey="&duplicateTab.accesskey;"
|
+ accesskey="&duplicateTab.accesskey;"
|
||||||
+ oncommand="duplicateTabIn(TabContextMenu.contextTab, 'tab');"/>
|
+ oncommand="duplicateTabIn(TabContextMenu.contextTab, 'tab');"/>
|
||||||
@ -124,13 +142,13 @@ new file mode 100644
|
|||||||
+ label="&reopenInContainer.label;"
|
+ label="&reopenInContainer.label;"
|
||||||
+ accesskey="&reopenInContainer.accesskey;"
|
+ accesskey="&reopenInContainer.accesskey;"
|
||||||
+ hidden="true">
|
+ hidden="true">
|
||||||
+ <menupopup oncommand="reopenInContainer(event);"
|
+ <menupopup oncommand="TabContextMenu.reopenInContainer(event);"
|
||||||
+ onpopupshowing="return createReopenInContainerMenu(event);" />
|
+ onpopupshowing="TabContextMenu.createReopenInContainerMenu(event);"/>
|
||||||
+ </menu>
|
+ </menu>
|
||||||
+ <menuitem id="context_openTabInWindow" label="&moveToNewWindow.label;"
|
+ <menuitem id="context_openTabInWindow" label="&moveToNewWindow.label;"
|
||||||
+ accesskey="&moveToNewWindow.accesskey;"
|
+ accesskey="&moveToNewWindow.accesskey;"
|
||||||
+ tbattr="tabbrowser-multiple"
|
+ tbattr="tabbrowser-multiple"
|
||||||
+ oncommand="gBrowser.replaceTabWithWindow(TabContextMenu.contextTab);"/>
|
+ oncommand="gBrowser.replaceTabsWithWindow(TabContextMenu.contextTab);"/>
|
||||||
+ <menuseparator id="context_sendTabToDevice_separator" class="sync-ui-item"/>
|
+ <menuseparator id="context_sendTabToDevice_separator" class="sync-ui-item"/>
|
||||||
+ <menu id="context_sendTabToDevice" label="&sendTabToDevice.label;"
|
+ <menu id="context_sendTabToDevice" label="&sendTabToDevice.label;"
|
||||||
+ class="sync-ui-item"
|
+ class="sync-ui-item"
|
||||||
@ -142,6 +160,11 @@ new file mode 100644
|
|||||||
+ <menuitem id="context_reloadAllTabs" label="&reloadAllTabs.label;" accesskey="&reloadAllTabs.accesskey;"
|
+ <menuitem id="context_reloadAllTabs" label="&reloadAllTabs.label;" accesskey="&reloadAllTabs.accesskey;"
|
||||||
+ tbattr="tabbrowser-multiple-visible"
|
+ tbattr="tabbrowser-multiple-visible"
|
||||||
+ oncommand="gBrowser.reloadAllTabs();"/>
|
+ oncommand="gBrowser.reloadAllTabs();"/>
|
||||||
|
+ <menuitem id="context_bookmarkSelectedTabs"
|
||||||
|
+ hidden="true"
|
||||||
|
+ label="&bookmarkSelectedTabs.label;"
|
||||||
|
+ accesskey="&bookmarkSelectedTabs.accesskey;"
|
||||||
|
+ oncommand="PlacesCommandHook.bookmarkPages(PlacesCommandHook.uniqueSelectedPages);"/>
|
||||||
+ <menuitem id="context_bookmarkAllTabs"
|
+ <menuitem id="context_bookmarkAllTabs"
|
||||||
+ label="&bookmarkAllTabs.label;"
|
+ label="&bookmarkAllTabs.label;"
|
||||||
+ accesskey="&bookmarkAllTabs.accesskey;"
|
+ accesskey="&bookmarkAllTabs.accesskey;"
|
||||||
@ -237,7 +260,6 @@ new file mode 100644
|
|||||||
+ ignorekeys="true"
|
+ ignorekeys="true"
|
||||||
+ hidden="true"
|
+ hidden="true"
|
||||||
+ tabspecific="true"
|
+ tabspecific="true"
|
||||||
+ onpopupshown="StarUI.panelShown(event);"
|
|
||||||
+ aria-labelledby="editBookmarkPanelTitle">
|
+ aria-labelledby="editBookmarkPanelTitle">
|
||||||
+ <box class="panel-header">
|
+ <box class="panel-header">
|
||||||
+ <label id="editBookmarkPanelTitle"/>
|
+ <label id="editBookmarkPanelTitle"/>
|
||||||
@ -247,8 +269,15 @@ new file mode 100644
|
|||||||
+ </html:div>
|
+ </html:div>
|
||||||
+ <box id="editBookmarkPanelImage"/>
|
+ <box id="editBookmarkPanelImage"/>
|
||||||
+#include ../../components/places/content/editBookmarkPanel.inc.xul
|
+#include ../../components/places/content/editBookmarkPanel.inc.xul
|
||||||
|
+ <vbox id="editBookmarkPanelBottomContent"
|
||||||
|
+ flex="1">
|
||||||
|
+ <checkbox id="editBookmarkPanel_showForNewBookmarks"
|
||||||
|
+ label="&editBookmark.showForNewBookmarks.label;"
|
||||||
|
+ accesskey="&editBookmark.showForNewBookmarks.accesskey;"
|
||||||
|
+ oncommand="StarUI.onShowForNewBookmarksCheckboxCommand();"/>
|
||||||
|
+ </vbox>
|
||||||
+ <hbox id="editBookmarkPanelBottomButtons"
|
+ <hbox id="editBookmarkPanelBottomButtons"
|
||||||
+ style="min-width: 30em;">
|
+ style="min-width: &editBookmark.panel.width;;">
|
||||||
+#ifdef XP_UNIX
|
+#ifdef XP_UNIX
|
||||||
+ <button id="editBookmarkPanelDoneButton"
|
+ <button id="editBookmarkPanelDoneButton"
|
||||||
+ class="editBookmarkPanelBottomButton"
|
+ class="editBookmarkPanelBottomButton"
|
||||||
@ -316,27 +345,22 @@ new file mode 100644
|
|||||||
+ orient="vertical"
|
+ orient="vertical"
|
||||||
+ position="bottomcenter topleft">
|
+ position="bottomcenter topleft">
|
||||||
+ <toolbarbutton id="sidebar-switcher-bookmarks"
|
+ <toolbarbutton id="sidebar-switcher-bookmarks"
|
||||||
|
+ type="checkbox"
|
||||||
|
+ label="&bookmarksButton.label;"
|
||||||
+ class="subviewbutton subviewbutton-iconic"
|
+ class="subviewbutton subviewbutton-iconic"
|
||||||
+ key="viewBookmarksSidebarKb"
|
+ key="viewBookmarksSidebarKb"
|
||||||
+ observes="viewBookmarksSidebar"
|
+ oncommand="SidebarUI.show('viewBookmarksSidebar');"/>
|
||||||
+ oncommand="SidebarUI.show('viewBookmarksSidebar');">
|
|
||||||
+ <observes element="viewBookmarksSidebar" attribute="checked"/>
|
|
||||||
+ </toolbarbutton>
|
|
||||||
+ <toolbarbutton id="sidebar-switcher-history"
|
+ <toolbarbutton id="sidebar-switcher-history"
|
||||||
|
+ type="checkbox"
|
||||||
+ label="&historyButton.label;"
|
+ label="&historyButton.label;"
|
||||||
+ class="subviewbutton subviewbutton-iconic"
|
+ class="subviewbutton subviewbutton-iconic"
|
||||||
+ key="key_gotoHistory"
|
+ key="key_gotoHistory"
|
||||||
+ observes="viewHistorySidebar"
|
+ oncommand="SidebarUI.show('viewHistorySidebar');"/>
|
||||||
+ oncommand="SidebarUI.show('viewHistorySidebar');">
|
|
||||||
+ <observes element="viewHistorySidebar" attribute="checked"/>
|
|
||||||
+ </toolbarbutton>
|
|
||||||
+ <toolbarbutton id="sidebar-switcher-tabs"
|
+ <toolbarbutton id="sidebar-switcher-tabs"
|
||||||
|
+ type="checkbox"
|
||||||
+ label="&syncedTabs.sidebar.label;"
|
+ label="&syncedTabs.sidebar.label;"
|
||||||
+ class="subviewbutton subviewbutton-iconic sync-ui-item"
|
+ class="subviewbutton subviewbutton-iconic sync-ui-item"
|
||||||
+ observes="viewTabsSidebar"
|
+ oncommand="SidebarUI.show('viewTabsSidebar');"/>
|
||||||
+ oncommand="SidebarUI.show('viewTabsSidebar');">
|
|
||||||
+ <observes element="viewTabsSidebar" attribute="checked"/>
|
|
||||||
+ </toolbarbutton>
|
|
||||||
+ <toolbarseparator/>
|
+ <toolbarseparator/>
|
||||||
+ <!-- Extension toolbarbuttons go here. -->
|
+ <!-- Extension toolbarbuttons go here. -->
|
||||||
+ <toolbarseparator id="sidebar-extensions-separator"/>
|
+ <toolbarseparator id="sidebar-extensions-separator"/>
|
||||||
@ -409,10 +433,22 @@ new file mode 100644
|
|||||||
+ <menupopup id="blockedPopupOptions"
|
+ <menupopup id="blockedPopupOptions"
|
||||||
+ onpopupshowing="gPopupBlockerObserver.fillPopupList(event);"
|
+ onpopupshowing="gPopupBlockerObserver.fillPopupList(event);"
|
||||||
+ onpopuphiding="gPopupBlockerObserver.onPopupHiding(event);">
|
+ onpopuphiding="gPopupBlockerObserver.onPopupHiding(event);">
|
||||||
+ <menuitem observes="blockedPopupAllowSite"/>
|
+ <menuitem id="blockedPopupAllowSite"
|
||||||
+ <menuitem observes="blockedPopupEditSettings"/>
|
+ accesskey="&allowPopups.accesskey;"
|
||||||
+ <menuitem observes="blockedPopupDontShowMessage"/>
|
+ oncommand="gPopupBlockerObserver.toggleAllowPopupsForSite(event);"/>
|
||||||
+ <menuseparator observes="blockedPopupsSeparator"/>
|
+ <menuitem
|
||||||
|
+#ifdef XP_WIN
|
||||||
|
+ label="&editPopupSettings.label;"
|
||||||
|
+#else
|
||||||
|
+ label="&editPopupSettingsUnix.label;"
|
||||||
|
+#endif
|
||||||
|
+ accesskey="&editPopupSettings.accesskey;"
|
||||||
|
+ oncommand="gPopupBlockerObserver.editPopupSettings();"/>
|
||||||
|
+ <menuitem id="blockedPopupDontShowMessage"
|
||||||
|
+ accesskey="&dontShowMessage.accesskey;"
|
||||||
|
+ type="checkbox"
|
||||||
|
+ oncommand="gPopupBlockerObserver.dontShowMessage();"/>
|
||||||
|
+ <menuseparator id="blockedPopupsSeparator"/>
|
||||||
+ </menupopup>
|
+ </menupopup>
|
||||||
+
|
+
|
||||||
+ <menupopup id="autohide-context"
|
+ <menupopup id="autohide-context"
|
||||||
@ -462,7 +498,8 @@ new file mode 100644
|
|||||||
+ emailLink-title="&emailPageCmd.label;"
|
+ emailLink-title="&emailPageCmd.label;"
|
||||||
+ sendToDevice-title="&pageAction.sendTabToDevice.label;"
|
+ sendToDevice-title="&pageAction.sendTabToDevice.label;"
|
||||||
+ sendToDevice-notReadyTitle="&sendToDevice.syncNotReady.label;"
|
+ sendToDevice-notReadyTitle="&sendToDevice.syncNotReady.label;"
|
||||||
+ shareURL-title="&pageAction.shareUrl.label;">
|
+ shareURL-title="&pageAction.shareUrl.label;"
|
||||||
|
+ shareMore-label="&pageAction.shareMore.label;">
|
||||||
+ <panelmultiview id="pageActionPanelMultiView"
|
+ <panelmultiview id="pageActionPanelMultiView"
|
||||||
+ mainViewId="pageActionPanelMainView"
|
+ mainViewId="pageActionPanelMainView"
|
||||||
+ viewCacheId="appMenu-viewCache">
|
+ viewCacheId="appMenu-viewCache">
|
||||||
@ -605,6 +642,16 @@ new file mode 100644
|
|||||||
+ accesskey="&syncSyncNowItem.accesskey;"
|
+ accesskey="&syncSyncNowItem.accesskey;"
|
||||||
+ id="syncedTabsRefreshFilter"/>
|
+ id="syncedTabsRefreshFilter"/>
|
||||||
+ </menupopup>
|
+ </menupopup>
|
||||||
|
+
|
||||||
|
+ <hbox id="statuspanel" inactive="true" layer="true">
|
||||||
|
+ <hbox id="statuspanel-inner">
|
||||||
|
+ <label id="statuspanel-label"
|
||||||
|
+ role="status"
|
||||||
|
+ aria-live="off"
|
||||||
|
+ flex="1"
|
||||||
|
+ crop="end"/>
|
||||||
|
+ </hbox>
|
||||||
|
+ </hbox>
|
||||||
+ </popupset>
|
+ </popupset>
|
||||||
+ <box id="appMenu-viewCache" hidden="true"/>
|
+ <box id="appMenu-viewCache" hidden="true"/>
|
||||||
+
|
+
|
||||||
@ -633,7 +680,7 @@ new file mode 100644
|
|||||||
+ <toolbox id="navigator-toolbox">
|
+ <toolbox id="navigator-toolbox">
|
||||||
+ <!-- Menu -->
|
+ <!-- Menu -->
|
||||||
+ <toolbar type="menubar" id="toolbar-menubar"
|
+ <toolbar type="menubar" id="toolbar-menubar"
|
||||||
+ class="chromeclass-menubar titlebar-color"
|
+ class="browser-toolbar chromeclass-menubar titlebar-color"
|
||||||
+ customizable="true"
|
+ customizable="true"
|
||||||
+ mode="icons"
|
+ mode="icons"
|
||||||
+#ifdef MENUBAR_CAN_AUTOHIDE
|
+#ifdef MENUBAR_CAN_AUTOHIDE
|
||||||
@ -655,7 +702,7 @@ new file mode 100644
|
|||||||
+ </toolbar>
|
+ </toolbar>
|
||||||
+
|
+
|
||||||
+ <toolbar id="TabsToolbar"
|
+ <toolbar id="TabsToolbar"
|
||||||
+ class="titlebar-color"
|
+ class="browser-toolbar titlebar-color"
|
||||||
+ fullscreentoolbar="true"
|
+ fullscreentoolbar="true"
|
||||||
+ customizable="true"
|
+ customizable="true"
|
||||||
+ mode="icons"
|
+ mode="icons"
|
||||||
@ -714,6 +761,7 @@ new file mode 100644
|
|||||||
+ </toolbar>
|
+ </toolbar>
|
||||||
+
|
+
|
||||||
+ <toolbar id="nav-bar"
|
+ <toolbar id="nav-bar"
|
||||||
|
+ class="browser-toolbar"
|
||||||
+ aria-label="&navbarCmd.label;"
|
+ aria-label="&navbarCmd.label;"
|
||||||
+ fullscreentoolbar="true" mode="icons" customizable="true"
|
+ fullscreentoolbar="true" mode="icons" customizable="true"
|
||||||
+ customizationtarget="nav-bar-customization-target"
|
+ customizationtarget="nav-bar-customization-target"
|
||||||
@ -771,7 +819,7 @@ new file mode 100644
|
|||||||
+ key="goHome"
|
+ key="goHome"
|
||||||
+ onclick="BrowserGoHome(event);"
|
+ onclick="BrowserGoHome(event);"
|
||||||
+ cui-areatype="toolbar"
|
+ cui-areatype="toolbar"
|
||||||
+ aboutHomeOverrideTooltip="&homeButton.defaultPage.tooltip;"/>
|
+ tooltiptext="&homeButton.defaultPage.tooltip;"/>
|
||||||
+ <toolbarspring cui-areatype="toolbar" class="chromeclass-toolbar-additional"/>
|
+ <toolbarspring cui-areatype="toolbar" class="chromeclass-toolbar-additional"/>
|
||||||
+ <toolbaritem id="urlbar-container" flex="400" persist="width"
|
+ <toolbaritem id="urlbar-container" flex="400" persist="width"
|
||||||
+ removable="false"
|
+ removable="false"
|
||||||
@ -785,7 +833,6 @@ new file mode 100644
|
|||||||
+ autocompletesearchparam="enable-actions"
|
+ autocompletesearchparam="enable-actions"
|
||||||
+ autocompletepopup="PopupAutoCompleteRichResult"
|
+ autocompletepopup="PopupAutoCompleteRichResult"
|
||||||
+ completeselectedindex="true"
|
+ completeselectedindex="true"
|
||||||
+ shrinkdelay="250"
|
|
||||||
+ tabscrolling="true"
|
+ tabscrolling="true"
|
||||||
+ newlines="stripsurroundingwhitespace"
|
+ newlines="stripsurroundingwhitespace"
|
||||||
+ ontextentered="this.handleCommand(param);"
|
+ ontextentered="this.handleCommand(param);"
|
||||||
@ -803,7 +850,12 @@ new file mode 100644
|
|||||||
+ consumeanchor="identity-box"
|
+ consumeanchor="identity-box"
|
||||||
+ onclick="PageProxyClickHandler(event);"/>
|
+ onclick="PageProxyClickHandler(event);"/>
|
||||||
+ <image id="sharing-icon" mousethrough="always"/>
|
+ <image id="sharing-icon" mousethrough="always"/>
|
||||||
|
+ <box id="tracking-protection-icon-box" animationsenabled="true">
|
||||||
+ <image id="tracking-protection-icon"/>
|
+ <image id="tracking-protection-icon"/>
|
||||||
|
+ <box id="tracking-protection-icon-animatable-box" flex="1">
|
||||||
|
+ <image id="tracking-protection-icon-animatable-image" flex="1"/>
|
||||||
|
+ </box>
|
||||||
|
+ </box>
|
||||||
+ <box id="blocked-permissions-container" align="center">
|
+ <box id="blocked-permissions-container" align="center">
|
||||||
+ <image data-permission-id="geo" class="blocked-permission-icon geo-icon" role="button"
|
+ <image data-permission-id="geo" class="blocked-permission-icon geo-icon" role="button"
|
||||||
+ tooltiptext="&urlbar.geolocationBlocked.tooltip;"/>
|
+ tooltiptext="&urlbar.geolocationBlocked.tooltip;"/>
|
||||||
@ -889,6 +941,14 @@ new file mode 100644
|
|||||||
+ <label id="extension" class="urlbar-display urlbar-display-extension" value="&urlbar.extension.label;"/>
|
+ <label id="extension" class="urlbar-display urlbar-display-extension" value="&urlbar.extension.label;"/>
|
||||||
+ </box>
|
+ </box>
|
||||||
+ <hbox id="page-action-buttons" context="pageActionContextMenu">
|
+ <hbox id="page-action-buttons" context="pageActionContextMenu">
|
||||||
|
+ <hbox id="contextual-feature-recommendation" role="button" hidden="true">
|
||||||
|
+ <hbox id="cfr-label-container">
|
||||||
|
+ <label id="cfr-label"/>
|
||||||
|
+ </hbox>
|
||||||
|
+ <image id="cfr-button"
|
||||||
|
+ class="urlbar-icon urlbar-page-action"
|
||||||
|
+ role="presentation"/>
|
||||||
|
+ </hbox>
|
||||||
+ <hbox id="userContext-icons" hidden="true">
|
+ <hbox id="userContext-icons" hidden="true">
|
||||||
+ <label id="userContext-label"/>
|
+ <label id="userContext-label"/>
|
||||||
+ <image id="userContext-indicator"/>
|
+ <image id="userContext-indicator"/>
|
||||||
@ -915,12 +975,10 @@ new file mode 100644
|
|||||||
+ onclick="BrowserPageActions.doCommandForAction(PageActions.actionForID('bookmark'), event, this);">
|
+ onclick="BrowserPageActions.doCommandForAction(PageActions.actionForID('bookmark'), event, this);">
|
||||||
+ <image id="star-button"
|
+ <image id="star-button"
|
||||||
+ class="urlbar-icon"
|
+ class="urlbar-icon"
|
||||||
+ role="button"
|
+ role="button"/>
|
||||||
+ observes="bookmarkThisPageBroadcaster"/>
|
|
||||||
+ <hbox id="star-button-animatable-box">
|
+ <hbox id="star-button-animatable-box">
|
||||||
+ <image id="star-button-animatable-image"
|
+ <image id="star-button-animatable-image"
|
||||||
+ role="presentation"
|
+ role="presentation"/>
|
||||||
+ observes="bookmarkThisPageBroadcaster"/>
|
|
||||||
+ </hbox>
|
+ </hbox>
|
||||||
+ </hbox>
|
+ </hbox>
|
||||||
+ </hbox>
|
+ </hbox>
|
||||||
@ -1010,7 +1068,7 @@ new file mode 100644
|
|||||||
+
|
+
|
||||||
+ <toolbar id="PersonalToolbar"
|
+ <toolbar id="PersonalToolbar"
|
||||||
+ mode="icons"
|
+ mode="icons"
|
||||||
+ class="chromeclass-directories"
|
+ class="browser-toolbar chromeclass-directories"
|
||||||
+ context="toolbar-context-menu"
|
+ context="toolbar-context-menu"
|
||||||
+ toolbarname="&personalbarCmd.label;" accesskey="&personalbarCmd.accesskey;"
|
+ toolbarname="&personalbarCmd.label;" accesskey="&personalbarCmd.accesskey;"
|
||||||
+ collapsed="true"
|
+ collapsed="true"
|
||||||
@ -1101,13 +1159,12 @@ new file mode 100644
|
|||||||
+ ondragleave="PlacesMenuDNDHandler.onDragLeave(event);"
|
+ ondragleave="PlacesMenuDNDHandler.onDragLeave(event);"
|
||||||
+ ondrop="PlacesMenuDNDHandler.onDrop(event);"
|
+ ondrop="PlacesMenuDNDHandler.onDrop(event);"
|
||||||
+ oncommand="BookmarkingUI.onCommand(event);">
|
+ oncommand="BookmarkingUI.onCommand(event);">
|
||||||
+ <observes element="bookmarkThisPageBroadcaster" attribute="starred"/>
|
|
||||||
+ <observes element="bookmarkThisPageBroadcaster" attribute="buttontooltiptext"/>
|
|
||||||
+ <menupopup id="BMB_bookmarksPopup"
|
+ <menupopup id="BMB_bookmarksPopup"
|
||||||
+ class="cui-widget-panel cui-widget-panelview cui-widget-panelWithFooter PanelUI-subView"
|
+ class="cui-widget-panel cui-widget-panelview cui-widget-panelWithFooter PanelUI-subView"
|
||||||
+ placespopup="true"
|
+ placespopup="true"
|
||||||
+ context="placesContext"
|
+ context="placesContext"
|
||||||
+ openInTabs="children"
|
+ openInTabs="children"
|
||||||
|
+ side="top"
|
||||||
+ onmouseup="BookmarksEventHandler.onMouseUp(event);"
|
+ onmouseup="BookmarksEventHandler.onMouseUp(event);"
|
||||||
+ oncommand="BookmarksEventHandler.onCommand(event);"
|
+ oncommand="BookmarksEventHandler.onCommand(event);"
|
||||||
+ onclick="BookmarksEventHandler.onClick(event, this.parentNode._placesView);"
|
+ onclick="BookmarksEventHandler.onClick(event, this.parentNode._placesView);"
|
||||||
@ -1202,7 +1259,7 @@ new file mode 100644
|
|||||||
+ <sidebarheader id="sidebar-header" align="center">
|
+ <sidebarheader id="sidebar-header" align="center">
|
||||||
+ <toolbarbutton id="sidebar-switcher-target" flex="1" class="tabbable">
|
+ <toolbarbutton id="sidebar-switcher-target" flex="1" class="tabbable">
|
||||||
+ <image id="sidebar-icon" consumeanchor="sidebar-switcher-target"/>
|
+ <image id="sidebar-icon" consumeanchor="sidebar-switcher-target"/>
|
||||||
+ <label id="sidebar-title" persist="value" crop="end" flex="1" control="sidebar"/>
|
+ <label id="sidebar-title" crop="end" flex="1" control="sidebar"/>
|
||||||
+ <image id="sidebar-switcher-arrow"/>
|
+ <image id="sidebar-switcher-arrow"/>
|
||||||
+ </toolbarbutton>
|
+ </toolbarbutton>
|
||||||
+ <image id="sidebar-throbber"/>
|
+ <image id="sidebar-throbber"/>
|
||||||
@ -1221,40 +1278,9 @@ new file mode 100644
|
|||||||
+ <vbox id="appcontent" flex="1">
|
+ <vbox id="appcontent" flex="1">
|
||||||
+ <notificationbox id="high-priority-global-notificationbox" notificationside="top"/>
|
+ <notificationbox id="high-priority-global-notificationbox" notificationside="top"/>
|
||||||
+ <tabbox id="tabbrowser-tabbox"
|
+ <tabbox id="tabbrowser-tabbox"
|
||||||
+ flex="1" eventnode="document" tabcontainer="tabbrowser-tabs">
|
+ flex="1" tabcontainer="tabbrowser-tabs">
|
||||||
+ <tabpanels id="tabbrowser-tabpanels"
|
+ <tabpanels id="tabbrowser-tabpanels"
|
||||||
+ flex="1" class="plain" selectedIndex="0"
|
+ flex="1" class="plain" selectedIndex="0"/>
|
||||||
+ onselect="if (event.target == this) gBrowser.updateCurrentBrowser();">
|
|
||||||
+ <notificationbox flex="1" notificationside="top">
|
|
||||||
+ <!-- Set large flex to allow the devtools toolbox to set a flex attribute.
|
|
||||||
+ We don't want the toolbox to actually take up free space, but we do want it to collapse when the window shrinks, and with flex=0 it can't.
|
|
||||||
+ When the toolbox is on the bottom it's a sibling of browserSidebarContainer,
|
|
||||||
+ and when it's on the side it's a sibling of browserContainer. -->
|
|
||||||
+ <hbox flex="10000" class="browserSidebarContainer">
|
|
||||||
+ <vbox flex="10000" class="browserContainer">
|
|
||||||
+ <stack flex="1" class="browserStack">
|
|
||||||
+ <browser id="tabbrowser-initialBrowser" type="content"
|
|
||||||
+ message="true" messagemanagergroup="browsers"
|
|
||||||
+ primary="true" blank="true"
|
|
||||||
+ tooltip="aHTMLTooltip"
|
|
||||||
+ contextmenu="contentAreaContextMenu"
|
|
||||||
+ autocompletepopup="PopupAutoComplete"
|
|
||||||
+ selectmenulist="ContentSelectDropdown"
|
|
||||||
+ datetimepicker="DateTimePickerPanel"/>
|
|
||||||
+ </stack>
|
|
||||||
+ <hbox id="statuspanel" inactive="true" layer="true">
|
|
||||||
+ <hbox id="statuspanel-inner">
|
|
||||||
+ <label id="statuspanel-label"
|
|
||||||
+ role="status"
|
|
||||||
+ aria-live="off"
|
|
||||||
+ flex="1"
|
|
||||||
+ crop="end"/>
|
|
||||||
+ </hbox>
|
|
||||||
+ </hbox>
|
|
||||||
+ </vbox>
|
|
||||||
+ </hbox>
|
|
||||||
+ </notificationbox>
|
|
||||||
+ </tabpanels>
|
|
||||||
+ </tabbox>
|
+ </tabbox>
|
||||||
+ </vbox>
|
+ </vbox>
|
||||||
+ <vbox id="browser-border-end" hidden="true" layer="true"/>
|
+ <vbox id="browser-border-end" hidden="true" layer="true"/>
|
||||||
@ -1300,14 +1326,14 @@ new file mode 100644
|
|||||||
diff --git a/browser/base/jar.mn b/browser/base/jar.mn
|
diff --git a/browser/base/jar.mn b/browser/base/jar.mn
|
||||||
--- a/browser/base/jar.mn
|
--- a/browser/base/jar.mn
|
||||||
+++ b/browser/base/jar.mn
|
+++ b/browser/base/jar.mn
|
||||||
@@ -24,16 +24,18 @@ browser.jar:
|
@@ -28,16 +28,18 @@ browser.jar:
|
||||||
content/browser/aboutRobots-icon.png (content/aboutRobots-icon.png)
|
|
||||||
content/browser/aboutRobots-widget-left.png (content/aboutRobots-widget-left.png)
|
|
||||||
content/browser/aboutTabCrashed.css (content/aboutTabCrashed.css)
|
|
||||||
content/browser/aboutTabCrashed.js (content/aboutTabCrashed.js)
|
content/browser/aboutTabCrashed.js (content/aboutTabCrashed.js)
|
||||||
content/browser/aboutTabCrashed.xhtml (content/aboutTabCrashed.xhtml)
|
content/browser/aboutTabCrashed.xhtml (content/aboutTabCrashed.xhtml)
|
||||||
* content/browser/browser.css (content/browser.css)
|
* content/browser/browser.css (content/browser.css)
|
||||||
content/browser/browser.js (content/browser.js)
|
content/browser/browser.js (content/browser.js)
|
||||||
|
#ifdef MOZ_BROWSER_XHTML
|
||||||
|
* content/browser/browser.xhtml (content/browser.xhtml)
|
||||||
|
#endif
|
||||||
* content/browser/browser.xul (content/browser.xul)
|
* content/browser/browser.xul (content/browser.xul)
|
||||||
+* content/browser/browser-kde.xul (content/browser-kde.xul)
|
+* content/browser/browser-kde.xul (content/browser-kde.xul)
|
||||||
+% override chrome://browser/content/browser.xul chrome://browser/content/browser-kde.xul desktop=kde
|
+% override chrome://browser/content/browser.xul chrome://browser/content/browser-kde.xul desktop=kde
|
||||||
@ -1318,7 +1344,7 @@ diff --git a/browser/base/jar.mn b/browser/base/jar.mn
|
|||||||
content/browser/browser-customization.js (content/browser-customization.js)
|
content/browser/browser-customization.js (content/browser-customization.js)
|
||||||
content/browser/browser-data-submission-info-bar.js (content/browser-data-submission-info-bar.js)
|
content/browser/browser-data-submission-info-bar.js (content/browser-data-submission-info-bar.js)
|
||||||
content/browser/browser-compacttheme.js (content/browser-compacttheme.js)
|
content/browser/browser-compacttheme.js (content/browser-compacttheme.js)
|
||||||
#ifndef MOZILLA_OFFICIAL
|
content/browser/browser-contentblocking.js (content/browser-contentblocking.js)
|
||||||
diff --git a/browser/components/build/nsModule.cpp b/browser/components/build/nsModule.cpp
|
diff --git a/browser/components/build/nsModule.cpp b/browser/components/build/nsModule.cpp
|
||||||
--- a/browser/components/build/nsModule.cpp
|
--- a/browser/components/build/nsModule.cpp
|
||||||
+++ b/browser/components/build/nsModule.cpp
|
+++ b/browser/components/build/nsModule.cpp
|
||||||
@ -1335,13 +1361,13 @@ diff --git a/browser/components/build/nsModule.cpp b/browser/components/build/ns
|
|||||||
+#include "nsUnixShellService.h"
|
+#include "nsUnixShellService.h"
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#if defined(XP_WIN)
|
#if defined(MOZ_WIDGET_COCOA)
|
||||||
#include "nsIEHistoryEnumerator.h"
|
#include "nsMacAttribution.h"
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#include "nsFeedSniffer.h"
|
#if defined(XP_WIN)
|
||||||
#include "AboutRedirector.h"
|
#include "nsIEHistoryEnumerator.h"
|
||||||
@@ -30,18 +30,16 @@ using namespace mozilla::browser;
|
@@ -34,18 +34,16 @@ using namespace mozilla::browser;
|
||||||
|
|
||||||
/////////////////////////////////////////////////////////////////////////////
|
/////////////////////////////////////////////////////////////////////////////
|
||||||
|
|
||||||
@ -1354,14 +1380,14 @@ diff --git a/browser/components/build/nsModule.cpp b/browser/components/build/ns
|
|||||||
-NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(nsGNOMEShellService, Init)
|
-NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(nsGNOMEShellService, Init)
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#if defined(XP_WIN)
|
#if defined(MOZ_WIDGET_COCOA)
|
||||||
NS_GENERIC_FACTORY_CONSTRUCTOR(nsIEHistoryEnumerator)
|
NS_GENERIC_FACTORY_CONSTRUCTOR(nsMacAttributionService)
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
NS_GENERIC_FACTORY_CONSTRUCTOR(nsFeedSniffer)
|
#if defined(XP_WIN)
|
||||||
|
NS_GENERIC_FACTORY_CONSTRUCTOR(nsIEHistoryEnumerator)
|
||||||
@@ -59,17 +57,17 @@ NS_DEFINE_NAMED_CID(NS_WINIEHISTORYENUME
|
@@ -70,17 +68,17 @@ NS_DEFINE_NAMED_CID(NS_SHELLSERVICE_CID)
|
||||||
NS_DEFINE_NAMED_CID(NS_SHELLSERVICE_CID);
|
NS_DEFINE_NAMED_CID(NS_MACATTRIBUTIONSERVICE_CID);
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
static const mozilla::Module::CIDEntry kBrowserCIDs[] = {
|
static const mozilla::Module::CIDEntry kBrowserCIDs[] = {
|
||||||
@ -1382,7 +1408,7 @@ diff --git a/browser/components/build/nsModule.cpp b/browser/components/build/ns
|
|||||||
diff --git a/browser/components/preferences/in-content/main.js b/browser/components/preferences/in-content/main.js
|
diff --git a/browser/components/preferences/in-content/main.js b/browser/components/preferences/in-content/main.js
|
||||||
--- a/browser/components/preferences/in-content/main.js
|
--- a/browser/components/preferences/in-content/main.js
|
||||||
+++ b/browser/components/preferences/in-content/main.js
|
+++ b/browser/components/preferences/in-content/main.js
|
||||||
@@ -321,16 +321,23 @@ var gMainPane = {
|
@@ -327,16 +327,23 @@ var gMainPane = {
|
||||||
this._backoffIndex++ : backoffTimes.length - 1]);
|
this._backoffIndex++ : backoffTimes.length - 1]);
|
||||||
};
|
};
|
||||||
|
|
||||||
@ -1406,7 +1432,7 @@ diff --git a/browser/components/preferences/in-content/main.js b/browser/compone
|
|||||||
performanceSettingsLink.setAttribute("href", performanceSettingsUrl);
|
performanceSettingsLink.setAttribute("href", performanceSettingsUrl);
|
||||||
|
|
||||||
this.updateDefaultPerformanceSettingsPref();
|
this.updateDefaultPerformanceSettingsPref();
|
||||||
@@ -861,16 +868,27 @@ var gMainPane = {
|
@@ -962,16 +969,27 @@ var gMainPane = {
|
||||||
// Reset exponential backoff delay time in order to do visual update in pollForDefaultBrowser.
|
// Reset exponential backoff delay time in order to do visual update in pollForDefaultBrowser.
|
||||||
this._backoffIndex = 0;
|
this._backoffIndex = 0;
|
||||||
|
|
||||||
@ -1750,7 +1776,7 @@ new file mode 100644
|
|||||||
diff --git a/browser/installer/package-manifest.in b/browser/installer/package-manifest.in
|
diff --git a/browser/installer/package-manifest.in b/browser/installer/package-manifest.in
|
||||||
--- a/browser/installer/package-manifest.in
|
--- a/browser/installer/package-manifest.in
|
||||||
+++ b/browser/installer/package-manifest.in
|
+++ b/browser/installer/package-manifest.in
|
||||||
@@ -455,16 +455,18 @@
|
@@ -462,16 +462,18 @@
|
||||||
@RESPATH@/browser/defaults/settings/pinning
|
@RESPATH@/browser/defaults/settings/pinning
|
||||||
@RESPATH@/browser/defaults/settings/main
|
@RESPATH@/browser/defaults/settings/main
|
||||||
|
|
||||||
|
@ -1,3 +0,0 @@
|
|||||||
version https://git-lfs.github.com/spec/v1
|
|
||||||
oid sha256:86f022b153053311810143d088010c4f66ad1527ffecf1d996406a75ff92879e
|
|
||||||
size 54184272
|
|
3
l10n-63.0.tar.xz
Normal file
3
l10n-63.0.tar.xz
Normal file
@ -0,0 +1,3 @@
|
|||||||
|
version https://git-lfs.github.com/spec/v1
|
||||||
|
oid sha256:2ae5f088b5896142de8ca19478a42d85b4d6bba45bf4de540bb5c8345b1194df
|
||||||
|
size 50087576
|
@ -1,5 +1,5 @@
|
|||||||
# HG changeset patch
|
# HG changeset patch
|
||||||
# Parent 989a507ffc5faf9a3bd950c2391a24afa9f463c8
|
# Parent 06a62125ffbb15e88dacb486169d8e6a9595bd78
|
||||||
Description: Add KDE integration to Firefox (toolkit parts)
|
Description: Add KDE integration to Firefox (toolkit parts)
|
||||||
Author: Wolfgang Rosenauer <wolfgang@rosenauer.org>
|
Author: Wolfgang Rosenauer <wolfgang@rosenauer.org>
|
||||||
Author: Lubos Lunak <lunak@suse.com>
|
Author: Lubos Lunak <lunak@suse.com>
|
||||||
@ -9,7 +9,7 @@ Bug: https://bugzilla.mozilla.org/show_bug.cgi?id=140751
|
|||||||
diff --git a/modules/libpref/Preferences.cpp b/modules/libpref/Preferences.cpp
|
diff --git a/modules/libpref/Preferences.cpp b/modules/libpref/Preferences.cpp
|
||||||
--- a/modules/libpref/Preferences.cpp
|
--- a/modules/libpref/Preferences.cpp
|
||||||
+++ b/modules/libpref/Preferences.cpp
|
+++ b/modules/libpref/Preferences.cpp
|
||||||
@@ -77,16 +77,17 @@
|
@@ -80,16 +80,17 @@
|
||||||
#include "nsXPCOMCID.h"
|
#include "nsXPCOMCID.h"
|
||||||
#include "nsXPCOM.h"
|
#include "nsXPCOM.h"
|
||||||
#include "nsXULAppAPI.h"
|
#include "nsXULAppAPI.h"
|
||||||
@ -20,14 +20,14 @@ diff --git a/modules/libpref/Preferences.cpp b/modules/libpref/Preferences.cpp
|
|||||||
#include "prlink.h"
|
#include "prlink.h"
|
||||||
+#include "nsKDEUtils.h"
|
+#include "nsKDEUtils.h"
|
||||||
|
|
||||||
|
#ifdef MOZ_MEMORY
|
||||||
|
#include "mozmemory.h"
|
||||||
|
#endif
|
||||||
|
|
||||||
#ifdef XP_WIN
|
#ifdef XP_WIN
|
||||||
#include "windows.h"
|
#include "windows.h"
|
||||||
#endif
|
#endif
|
||||||
|
@@ -4932,25 +4933,37 @@ Preferences::InitInitialObjects(bool aIs
|
||||||
using namespace mozilla;
|
|
||||||
|
|
||||||
#ifdef DEBUG
|
|
||||||
@@ -4189,25 +4190,37 @@ Preferences::InitInitialObjects(bool aIs
|
|
||||||
// application pref files for backwards compatibility.
|
// application pref files for backwards compatibility.
|
||||||
static const char* specialFiles[] = {
|
static const char* specialFiles[] = {
|
||||||
#if defined(XP_MACOSX)
|
#if defined(XP_MACOSX)
|
||||||
@ -65,7 +65,7 @@ diff --git a/modules/libpref/Preferences.cpp b/modules/libpref/Preferences.cpp
|
|||||||
|
|
||||||
// Load jar:$app/omni.jar!/defaults/preferences/*.js
|
// Load jar:$app/omni.jar!/defaults/preferences/*.js
|
||||||
// or jar:$gre/omni.jar!/defaults/preferences/*.js.
|
// or jar:$gre/omni.jar!/defaults/preferences/*.js.
|
||||||
@@ -4256,17 +4269,17 @@ Preferences::InitInitialObjects(bool aIs
|
@@ -4999,17 +5012,17 @@ Preferences::InitInitialObjects(bool aIs
|
||||||
}
|
}
|
||||||
|
|
||||||
nsCOMPtr<nsIFile> path = do_QueryInterface(elem);
|
nsCOMPtr<nsIFile> path = do_QueryInterface(elem);
|
||||||
@ -87,13 +87,13 @@ diff --git a/modules/libpref/Preferences.cpp b/modules/libpref/Preferences.cpp
|
|||||||
diff --git a/modules/libpref/moz.build b/modules/libpref/moz.build
|
diff --git a/modules/libpref/moz.build b/modules/libpref/moz.build
|
||||||
--- a/modules/libpref/moz.build
|
--- a/modules/libpref/moz.build
|
||||||
+++ b/modules/libpref/moz.build
|
+++ b/modules/libpref/moz.build
|
||||||
@@ -29,16 +29,20 @@ EXPORTS.mozilla += [
|
@@ -31,16 +31,20 @@ EXPORTS.mozilla += [
|
||||||
'Preferences.h',
|
|
||||||
'StaticPrefs.h',
|
'StaticPrefs.h',
|
||||||
]
|
]
|
||||||
|
|
||||||
UNIFIED_SOURCES += [
|
UNIFIED_SOURCES += [
|
||||||
'Preferences.cpp',
|
'Preferences.cpp',
|
||||||
|
'SharedPrefMap.cpp',
|
||||||
]
|
]
|
||||||
|
|
||||||
+LOCAL_INCLUDES += [
|
+LOCAL_INCLUDES += [
|
||||||
@ -167,11 +167,11 @@ diff --git a/toolkit/components/downloads/moz.build b/toolkit/components/downloa
|
|||||||
+]
|
+]
|
||||||
+
|
+
|
||||||
with Files('**'):
|
with Files('**'):
|
||||||
BUG_COMPONENT = ('Toolkit', 'Download Manager')
|
BUG_COMPONENT = ('Toolkit', 'Downloads API')
|
||||||
diff --git a/toolkit/content/jar.mn b/toolkit/content/jar.mn
|
diff --git a/toolkit/content/jar.mn b/toolkit/content/jar.mn
|
||||||
--- a/toolkit/content/jar.mn
|
--- a/toolkit/content/jar.mn
|
||||||
+++ b/toolkit/content/jar.mn
|
+++ b/toolkit/content/jar.mn
|
||||||
@@ -69,16 +69,18 @@ toolkit.jar:
|
@@ -70,16 +70,18 @@ toolkit.jar:
|
||||||
content/global/bindings/checkbox.xml (widgets/checkbox.xml)
|
content/global/bindings/checkbox.xml (widgets/checkbox.xml)
|
||||||
content/global/bindings/colorpicker.xml (widgets/colorpicker.xml)
|
content/global/bindings/colorpicker.xml (widgets/colorpicker.xml)
|
||||||
content/global/bindings/datekeeper.js (widgets/datekeeper.js)
|
content/global/bindings/datekeeper.js (widgets/datekeeper.js)
|
||||||
@ -182,19 +182,19 @@ diff --git a/toolkit/content/jar.mn b/toolkit/content/jar.mn
|
|||||||
* content/global/bindings/dialog.xml (widgets/dialog.xml)
|
* content/global/bindings/dialog.xml (widgets/dialog.xml)
|
||||||
+* content/global/bindings/dialog-kde.xml (widgets/dialog-kde.xml)
|
+* content/global/bindings/dialog-kde.xml (widgets/dialog-kde.xml)
|
||||||
+% override chrome://global/content/bindings/dialog.xml chrome://global/content/bindings/dialog-kde.xml desktop=kde
|
+% override chrome://global/content/bindings/dialog.xml chrome://global/content/bindings/dialog-kde.xml desktop=kde
|
||||||
content/global/bindings/editor.xml (widgets/editor.xml)
|
|
||||||
* content/global/bindings/findbar.xml (widgets/findbar.xml)
|
* content/global/bindings/findbar.xml (widgets/findbar.xml)
|
||||||
content/global/bindings/general.xml (widgets/general.xml)
|
content/global/bindings/general.xml (widgets/general.xml)
|
||||||
content/global/bindings/groupbox.xml (widgets/groupbox.xml)
|
content/global/bindings/groupbox.xml (widgets/groupbox.xml)
|
||||||
content/global/bindings/listbox.xml (widgets/listbox.xml)
|
|
||||||
content/global/bindings/menu.xml (widgets/menu.xml)
|
content/global/bindings/menu.xml (widgets/menu.xml)
|
||||||
content/global/bindings/menulist.xml (widgets/menulist.xml)
|
content/global/bindings/menulist.xml (widgets/menulist.xml)
|
||||||
content/global/bindings/notification.xml (widgets/notification.xml)
|
content/global/bindings/notification.xml (widgets/notification.xml)
|
||||||
|
content/global/bindings/numberbox.xml (widgets/numberbox.xml)
|
||||||
|
content/global/bindings/popup.xml (widgets/popup.xml)
|
||||||
diff --git a/toolkit/content/widgets/dialog-kde.xml b/toolkit/content/widgets/dialog-kde.xml
|
diff --git a/toolkit/content/widgets/dialog-kde.xml b/toolkit/content/widgets/dialog-kde.xml
|
||||||
new file mode 100644
|
new file mode 100644
|
||||||
--- /dev/null
|
--- /dev/null
|
||||||
+++ b/toolkit/content/widgets/dialog-kde.xml
|
+++ b/toolkit/content/widgets/dialog-kde.xml
|
||||||
@@ -0,0 +1,478 @@
|
@@ -0,0 +1,475 @@
|
||||||
+<?xml version="1.0"?>
|
+<?xml version="1.0"?>
|
||||||
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
|
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
|
||||||
+ - License, v. 2.0. If a copy of the MPL was not distributed with this
|
+ - License, v. 2.0. If a copy of the MPL was not distributed with this
|
||||||
@ -211,9 +211,6 @@ new file mode 100644
|
|||||||
+ xmlns:xbl="http://www.mozilla.org/xbl">
|
+ xmlns:xbl="http://www.mozilla.org/xbl">
|
||||||
+
|
+
|
||||||
+ <binding id="dialog">
|
+ <binding id="dialog">
|
||||||
+ <resources>
|
|
||||||
+ <stylesheet src="chrome://global/skin/dialog.css"/>
|
|
||||||
+ </resources>
|
|
||||||
+ <content>
|
+ <content>
|
||||||
+ <xul:vbox class="box-inherit dialog-content-box" flex="1">
|
+ <xul:vbox class="box-inherit dialog-content-box" flex="1">
|
||||||
+ <children/>
|
+ <children/>
|
||||||
@ -676,7 +673,7 @@ new file mode 100644
|
|||||||
diff --git a/toolkit/mozapps/downloads/nsHelperAppDlg.js b/toolkit/mozapps/downloads/nsHelperAppDlg.js
|
diff --git a/toolkit/mozapps/downloads/nsHelperAppDlg.js b/toolkit/mozapps/downloads/nsHelperAppDlg.js
|
||||||
--- a/toolkit/mozapps/downloads/nsHelperAppDlg.js
|
--- a/toolkit/mozapps/downloads/nsHelperAppDlg.js
|
||||||
+++ b/toolkit/mozapps/downloads/nsHelperAppDlg.js
|
+++ b/toolkit/mozapps/downloads/nsHelperAppDlg.js
|
||||||
@@ -1035,30 +1035,60 @@ nsUnknownContentTypeDialog.prototype = {
|
@@ -1030,30 +1030,60 @@ nsUnknownContentTypeDialog.prototype = {
|
||||||
|
|
||||||
if (params.handlerApp &&
|
if (params.handlerApp &&
|
||||||
params.handlerApp.executable &&
|
params.handlerApp.executable &&
|
||||||
@ -848,7 +845,7 @@ diff --git a/toolkit/system/unixproxy/nsUnixSystemProxySettings.cpp b/toolkit/sy
|
|||||||
diff --git a/toolkit/xre/moz.build b/toolkit/xre/moz.build
|
diff --git a/toolkit/xre/moz.build b/toolkit/xre/moz.build
|
||||||
--- a/toolkit/xre/moz.build
|
--- a/toolkit/xre/moz.build
|
||||||
+++ b/toolkit/xre/moz.build
|
+++ b/toolkit/xre/moz.build
|
||||||
@@ -71,17 +71,19 @@ elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'co
|
@@ -67,17 +67,19 @@ elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'co
|
||||||
'../components/printingui',
|
'../components/printingui',
|
||||||
]
|
]
|
||||||
elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'uikit':
|
elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'uikit':
|
||||||
@ -1313,7 +1310,7 @@ diff --git a/uriloader/exthandler/HandlerServiceParent.cpp b/uriloader/exthandle
|
|||||||
diff --git a/uriloader/exthandler/moz.build b/uriloader/exthandler/moz.build
|
diff --git a/uriloader/exthandler/moz.build b/uriloader/exthandler/moz.build
|
||||||
--- a/uriloader/exthandler/moz.build
|
--- a/uriloader/exthandler/moz.build
|
||||||
+++ b/uriloader/exthandler/moz.build
|
+++ b/uriloader/exthandler/moz.build
|
||||||
@@ -77,17 +77,19 @@ else:
|
@@ -76,17 +76,19 @@ else:
|
||||||
SOURCES += [
|
SOURCES += [
|
||||||
osdir + '/nsOSHelperAppService.cpp',
|
osdir + '/nsOSHelperAppService.cpp',
|
||||||
]
|
]
|
||||||
@ -1330,10 +1327,10 @@ diff --git a/uriloader/exthandler/moz.build b/uriloader/exthandler/moz.build
|
|||||||
elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'android':
|
elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'android':
|
||||||
UNIFIED_SOURCES += [
|
UNIFIED_SOURCES += [
|
||||||
'android/nsAndroidHandlerApp.cpp',
|
'android/nsAndroidHandlerApp.cpp',
|
||||||
'android/nsExternalSharingAppService.cpp',
|
|
||||||
'android/nsExternalURLHandlerService.cpp',
|
'android/nsExternalURLHandlerService.cpp',
|
||||||
'android/nsMIMEInfoAndroid.cpp',
|
'android/nsMIMEInfoAndroid.cpp',
|
||||||
@@ -122,16 +124,17 @@ include('/ipc/chromium/chromium-config.m
|
]
|
||||||
|
@@ -120,16 +122,17 @@ include('/ipc/chromium/chromium-config.m
|
||||||
FINAL_LIBRARY = 'xul'
|
FINAL_LIBRARY = 'xul'
|
||||||
|
|
||||||
LOCAL_INCLUDES += [
|
LOCAL_INCLUDES += [
|
||||||
@ -1691,7 +1688,7 @@ diff --git a/uriloader/exthandler/unix/nsOSHelperAppService.cpp b/uriloader/exth
|
|||||||
#include "nsIURL.h"
|
#include "nsIURL.h"
|
||||||
#include "nsIFileStreams.h"
|
#include "nsIFileStreams.h"
|
||||||
#include "nsILineInputStream.h"
|
#include "nsILineInputStream.h"
|
||||||
@@ -1128,17 +1128,17 @@ nsOSHelperAppService::GetHandlerAndDescr
|
@@ -1125,17 +1125,17 @@ nsOSHelperAppService::GetHandlerAndDescr
|
||||||
|
|
||||||
nsresult nsOSHelperAppService::OSProtocolHandlerExists(const char * aProtocolScheme, bool * aHandlerExists)
|
nsresult nsOSHelperAppService::OSProtocolHandlerExists(const char * aProtocolScheme, bool * aHandlerExists)
|
||||||
{
|
{
|
||||||
@ -1710,7 +1707,7 @@ diff --git a/uriloader/exthandler/unix/nsOSHelperAppService.cpp b/uriloader/exth
|
|||||||
nsCOMPtr<nsIHandlerService> handlerSvc = do_GetService(NS_HANDLERSERVICE_CONTRACTID, &rv);
|
nsCOMPtr<nsIHandlerService> handlerSvc = do_GetService(NS_HANDLERSERVICE_CONTRACTID, &rv);
|
||||||
if (NS_SUCCEEDED(rv) && handlerSvc) {
|
if (NS_SUCCEEDED(rv) && handlerSvc) {
|
||||||
rv = handlerSvc->ExistsForProtocol(nsCString(aProtocolScheme), aHandlerExists);
|
rv = handlerSvc->ExistsForProtocol(nsCString(aProtocolScheme), aHandlerExists);
|
||||||
@@ -1146,17 +1146,17 @@ nsresult nsOSHelperAppService::OSProtoco
|
@@ -1143,17 +1143,17 @@ nsresult nsOSHelperAppService::OSProtoco
|
||||||
}
|
}
|
||||||
|
|
||||||
return rv;
|
return rv;
|
||||||
@ -1729,7 +1726,7 @@ diff --git a/uriloader/exthandler/unix/nsOSHelperAppService.cpp b/uriloader/exth
|
|||||||
|
|
||||||
nsresult nsOSHelperAppService::GetFileTokenForPath(const char16_t * platformAppPath, nsIFile ** aFile)
|
nsresult nsOSHelperAppService::GetFileTokenForPath(const char16_t * platformAppPath, nsIFile ** aFile)
|
||||||
{
|
{
|
||||||
@@ -1243,17 +1243,17 @@ nsOSHelperAppService::GetFromExtension(c
|
@@ -1240,17 +1240,17 @@ nsOSHelperAppService::GetFromExtension(c
|
||||||
mime_types_description,
|
mime_types_description,
|
||||||
true);
|
true);
|
||||||
|
|
||||||
@ -1748,7 +1745,7 @@ diff --git a/uriloader/exthandler/unix/nsOSHelperAppService.cpp b/uriloader/exth
|
|||||||
|
|
||||||
rv = LookUpTypeAndDescription(NS_ConvertUTF8toUTF16(aFileExt),
|
rv = LookUpTypeAndDescription(NS_ConvertUTF8toUTF16(aFileExt),
|
||||||
majorType,
|
majorType,
|
||||||
@@ -1364,17 +1364,17 @@ nsOSHelperAppService::GetFromType(const
|
@@ -1361,17 +1361,17 @@ nsOSHelperAppService::GetFromType(const
|
||||||
nsAutoString extensions, mime_types_description;
|
nsAutoString extensions, mime_types_description;
|
||||||
LookUpExtensionsAndDescription(majorType,
|
LookUpExtensionsAndDescription(majorType,
|
||||||
minorType,
|
minorType,
|
||||||
@ -1770,12 +1767,12 @@ diff --git a/uriloader/exthandler/unix/nsOSHelperAppService.cpp b/uriloader/exth
|
|||||||
diff --git a/widget/gtk/moz.build b/widget/gtk/moz.build
|
diff --git a/widget/gtk/moz.build b/widget/gtk/moz.build
|
||||||
--- a/widget/gtk/moz.build
|
--- a/widget/gtk/moz.build
|
||||||
+++ b/widget/gtk/moz.build
|
+++ b/widget/gtk/moz.build
|
||||||
@@ -122,16 +122,17 @@ else:
|
@@ -123,16 +123,17 @@ include('/ipc/chromium/chromium-config.m
|
||||||
include('/ipc/chromium/chromium-config.mozbuild')
|
|
||||||
|
|
||||||
FINAL_LIBRARY = 'xul'
|
FINAL_LIBRARY = 'xul'
|
||||||
|
|
||||||
LOCAL_INCLUDES += [
|
LOCAL_INCLUDES += [
|
||||||
|
'/layout/base',
|
||||||
'/layout/generic',
|
'/layout/generic',
|
||||||
'/layout/xul',
|
'/layout/xul',
|
||||||
'/other-licenses/atk-1.0',
|
'/other-licenses/atk-1.0',
|
||||||
@ -2166,7 +2163,7 @@ diff --git a/xpcom/components/ManifestParser.cpp b/xpcom/components/ManifestPars
|
|||||||
const char* directive;
|
const char* directive;
|
||||||
int argc;
|
int argc;
|
||||||
|
|
||||||
@@ -437,16 +438,17 @@ ParseManifest(NSLocationType aType, File
|
@@ -419,16 +420,17 @@ ParseManifest(NSLocationType aType, File
|
||||||
NS_NAMED_LITERAL_STRING(kRemoteEnabled, "remoteenabled");
|
NS_NAMED_LITERAL_STRING(kRemoteEnabled, "remoteenabled");
|
||||||
NS_NAMED_LITERAL_STRING(kRemoteRequired, "remoterequired");
|
NS_NAMED_LITERAL_STRING(kRemoteRequired, "remoterequired");
|
||||||
NS_NAMED_LITERAL_STRING(kApplication, "application");
|
NS_NAMED_LITERAL_STRING(kApplication, "application");
|
||||||
@ -2184,7 +2181,7 @@ diff --git a/xpcom/components/ManifestParser.cpp b/xpcom/components/ManifestPars
|
|||||||
NS_NAMED_LITERAL_STRING(kMain, "main");
|
NS_NAMED_LITERAL_STRING(kMain, "main");
|
||||||
NS_NAMED_LITERAL_STRING(kContent, "content");
|
NS_NAMED_LITERAL_STRING(kContent, "content");
|
||||||
|
|
||||||
@@ -492,44 +494,49 @@ ParseManifest(NSLocationType aType, File
|
@@ -474,44 +476,49 @@ ParseManifest(NSLocationType aType, File
|
||||||
CopyUTF8toUTF16(s, abi);
|
CopyUTF8toUTF16(s, abi);
|
||||||
abi.Insert(char16_t('_'), 0);
|
abi.Insert(char16_t('_'), 0);
|
||||||
abi.Insert(osTarget, 0);
|
abi.Insert(osTarget, 0);
|
||||||
@ -2234,7 +2231,7 @@ diff --git a/xpcom/components/ManifestParser.cpp b/xpcom/components/ManifestPars
|
|||||||
process = kMain;
|
process = kMain;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -631,25 +638,27 @@ ParseManifest(NSLocationType aType, File
|
@@ -598,25 +605,27 @@ ParseManifest(NSLocationType aType, File
|
||||||
TriState stOsVersion = eUnspecified;
|
TriState stOsVersion = eUnspecified;
|
||||||
TriState stOs = eUnspecified;
|
TriState stOs = eUnspecified;
|
||||||
TriState stABI = eUnspecified;
|
TriState stABI = eUnspecified;
|
||||||
@ -2262,7 +2259,7 @@ diff --git a/xpcom/components/ManifestParser.cpp b/xpcom/components/ManifestPars
|
|||||||
}
|
}
|
||||||
|
|
||||||
#if defined(MOZ_WIDGET_ANDROID)
|
#if defined(MOZ_WIDGET_ANDROID)
|
||||||
@@ -694,16 +703,17 @@ ParseManifest(NSLocationType aType, File
|
@@ -661,16 +670,17 @@ ParseManifest(NSLocationType aType, File
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!ok ||
|
if (!ok ||
|
||||||
@ -2303,7 +2300,7 @@ diff --git a/xpcom/io/nsLocalFileUnix.cpp b/xpcom/io/nsLocalFileUnix.cpp
|
|||||||
@@ -47,16 +47,17 @@
|
@@ -47,16 +47,17 @@
|
||||||
#include "prproces.h"
|
#include "prproces.h"
|
||||||
#include "nsIDirectoryEnumerator.h"
|
#include "nsIDirectoryEnumerator.h"
|
||||||
#include "nsISimpleEnumerator.h"
|
#include "nsSimpleEnumerator.h"
|
||||||
#include "private/pprio.h"
|
#include "private/pprio.h"
|
||||||
#include "prlink.h"
|
#include "prlink.h"
|
||||||
|
|
||||||
@ -2318,7 +2315,7 @@ diff --git a/xpcom/io/nsLocalFileUnix.cpp b/xpcom/io/nsLocalFileUnix.cpp
|
|||||||
#include "prmem.h"
|
#include "prmem.h"
|
||||||
#include "plbase64.h"
|
#include "plbase64.h"
|
||||||
|
|
||||||
@@ -1999,63 +2000,78 @@ nsLocalFile::SetPersistentDescriptor(con
|
@@ -2007,63 +2008,78 @@ nsLocalFile::SetPersistentDescriptor(con
|
||||||
NS_IMETHODIMP
|
NS_IMETHODIMP
|
||||||
nsLocalFile::Reveal()
|
nsLocalFile::Reveal()
|
||||||
{
|
{
|
||||||
|
@ -1,40 +0,0 @@
|
|||||||
# HG changeset patch
|
|
||||||
# User Wolfgang Rosenauer <wr@rosenauer.org>
|
|
||||||
# Parent 242712e5a1879111d1a93a5d55dfae3fd5d47abc
|
|
||||||
|
|
||||||
diff --git a/intl/icu/source/i18n/number_grouping.cpp b/intl/icu/source/i18n/number_grouping.cpp
|
|
||||||
--- a/intl/icu/source/i18n/number_grouping.cpp
|
|
||||||
+++ b/intl/icu/source/i18n/number_grouping.cpp
|
|
||||||
@@ -43,16 +43,17 @@ Grouper Grouper::forStrategy(UGroupingSt
|
|
||||||
case UNUM_GROUPING_MIN2:
|
|
||||||
return {-2, -2, -3};
|
|
||||||
case UNUM_GROUPING_ON_ALIGNED:
|
|
||||||
return {-4, -4, 1};
|
|
||||||
case UNUM_GROUPING_THOUSANDS:
|
|
||||||
return {3, 3, 1};
|
|
||||||
default:
|
|
||||||
U_ASSERT(FALSE);
|
|
||||||
+ return {0, 0, 0};
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
void Grouper::setLocaleData(const impl::ParsedPatternInfo &patternInfo, const Locale& locale) {
|
|
||||||
if (fGrouping1 != -2 && fGrouping2 != -4) {
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
auto grouping1 = static_cast<int16_t> (patternInfo.positive.groupingSizes & 0xffff);
|
|
||||||
diff --git a/media/libcubeb/src/cubeb_utils.cpp b/media/libcubeb/src/cubeb_utils.cpp
|
|
||||||
--- a/media/libcubeb/src/cubeb_utils.cpp
|
|
||||||
+++ b/media/libcubeb/src/cubeb_utils.cpp
|
|
||||||
@@ -14,10 +14,11 @@ size_t cubeb_sample_size(cubeb_sample_fo
|
|
||||||
case CUBEB_SAMPLE_S16BE:
|
|
||||||
return sizeof(int16_t);
|
|
||||||
case CUBEB_SAMPLE_FLOAT32LE:
|
|
||||||
case CUBEB_SAMPLE_FLOAT32BE:
|
|
||||||
return sizeof(float);
|
|
||||||
default:
|
|
||||||
// should never happen as all cases are handled above.
|
|
||||||
assert(false);
|
|
||||||
+ return sizeof(float);
|
|
||||||
}
|
|
||||||
}
|
|
@ -1,25 +0,0 @@
|
|||||||
# HG changeset patch
|
|
||||||
# User Wolfgang Rosenauer <wr@rosenauer.org>
|
|
||||||
# Parent f62746698c37af9593338fe75fbff6b319cd370c
|
|
||||||
|
|
||||||
diff --git a/config/config.mk b/config/config.mk
|
|
||||||
--- a/config/config.mk
|
|
||||||
+++ b/config/config.mk
|
|
||||||
@@ -471,17 +471,16 @@ ifeq ($(MOZ_WIDGET_TOOLKIT),android)
|
|
||||||
# of the linker command line), if libmozglue.so ends up after libc.so, all
|
|
||||||
# hell breaks loose, so better safe than sorry, and check it's actually the
|
|
||||||
# case.
|
|
||||||
CHECK_MOZGLUE_ORDER = @$(TOOLCHAIN_PREFIX)readelf -d $(1) | grep NEEDED | awk '{ libs[$$NF] = ++n } END { if (libs["[libmozglue.so]"] && libs["[libc.so]"] < libs["[libmozglue.so]"]) { print "libmozglue.so must be linked before libc.so"; exit 1 } }'
|
|
||||||
endif
|
|
||||||
|
|
||||||
define CHECK_BINARY
|
|
||||||
$(call CHECK_GLIBC,$(1))
|
|
||||||
-$(call CHECK_STDCXX,$(1))
|
|
||||||
$(call CHECK_TEXTREL,$(1))
|
|
||||||
$(call LOCAL_CHECKS,$(1))
|
|
||||||
$(call CHECK_MOZGLUE_ORDER,$(1))
|
|
||||||
endef
|
|
||||||
|
|
||||||
# autoconf.mk sets OBJ_SUFFIX to an error to avoid use before including
|
|
||||||
# this file
|
|
||||||
OBJ_SUFFIX := $(_OBJ_SUFFIX)
|
|
@ -1,2 +1,2 @@
|
|||||||
REV=c9ed11ae5c79
|
REV=84219fbf133c
|
||||||
REPO=http://hg.mozilla.org/releases/mozilla-release
|
REPO=http://hg.mozilla.org/releases/mozilla-release
|
||||||
|
Loading…
Reference in New Issue
Block a user