Merge branch 'master' into f26
This commit is contained in:
Martin Stransky
commit
26b96d52ee
2
.gitignore
vendored
2
.gitignore
vendored
@ -237,3 +237,5 @@ firefox-3.6.4.source.tar.bz2
|
||||
/firefox-langpacks-54.0-20170613.tar.xz
|
||||
/firefox-54.0.1.source.tar.xz
|
||||
/firefox-langpacks-54.0.1-20170725.tar.xz
|
||||
/firefox-55.0.source.tar.xz
|
||||
/firefox-langpacks-55.0-20170802.tar.xz
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
diff -ru firefox-53.0.3/gfx/skia/skia/include/core/SkColorPriv.h firefox-53.0.3-changed/gfx/skia/skia/include/core/SkColorPriv.h
|
||||
--- firefox-53.0.3/gfx/skia/skia/include/core/SkColorPriv.h 2017-01-16 17:16:50.000000000 +0100
|
||||
+++ firefox-53.0.3-changed/gfx/skia/skia/include/core/SkColorPriv.h 2017-05-30 12:42:18.032534367 +0200
|
||||
diff -up firefox-55.0/gfx/skia/skia/include/core/SkColorPriv.h.big-endian firefox-55.0/gfx/skia/skia/include/core/SkColorPriv.h
|
||||
--- firefox-55.0/gfx/skia/skia/include/core/SkColorPriv.h.big-endian 2017-07-31 18:20:55.000000000 +0200
|
||||
+++ firefox-55.0/gfx/skia/skia/include/core/SkColorPriv.h 2017-08-02 10:09:36.350124031 +0200
|
||||
@@ -31,7 +31,7 @@
|
||||
*
|
||||
* Here we enforce this constraint.
|
||||
@ -27,10 +27,10 @@ diff -ru firefox-53.0.3/gfx/skia/skia/include/core/SkColorPriv.h firefox-53.0.3-
|
||||
|
||||
#if defined(SK_PMCOLOR_IS_RGBA) && defined(SK_PMCOLOR_IS_BGRA)
|
||||
#error "can't define PMCOLOR to be RGBA and BGRA"
|
||||
diff -ru firefox-53.0.3/gfx/skia/skia/include/core/SkImageInfo.h firefox-53.0.3-changed/gfx/skia/skia/include/core/SkImageInfo.h
|
||||
--- firefox-53.0.3/gfx/skia/skia/include/core/SkImageInfo.h 2017-02-27 17:10:59.000000000 +0100
|
||||
+++ firefox-53.0.3-changed/gfx/skia/skia/include/core/SkImageInfo.h 2017-05-30 12:44:00.250165657 +0200
|
||||
@@ -83,7 +83,8 @@
|
||||
diff -up firefox-55.0/gfx/skia/skia/include/core/SkImageInfo.h.big-endian firefox-55.0/gfx/skia/skia/include/core/SkImageInfo.h
|
||||
--- firefox-55.0/gfx/skia/skia/include/core/SkImageInfo.h.big-endian 2017-07-31 18:20:55.000000000 +0200
|
||||
+++ firefox-55.0/gfx/skia/skia/include/core/SkImageInfo.h 2017-08-02 10:09:36.350124031 +0200
|
||||
@@ -83,7 +83,8 @@ enum SkColorType {
|
||||
#elif SK_PMCOLOR_BYTE_ORDER(R,G,B,A)
|
||||
kN32_SkColorType = kRGBA_8888_SkColorType,
|
||||
#else
|
||||
@ -40,10 +40,10 @@ diff -ru firefox-53.0.3/gfx/skia/skia/include/core/SkImageInfo.h firefox-53.0.3-
|
||||
#endif
|
||||
};
|
||||
|
||||
diff -ru firefox-53.0.3/gfx/skia/skia/include/gpu/GrColor.h firefox-53.0.3-changed/gfx/skia/skia/include/gpu/GrColor.h
|
||||
--- firefox-53.0.3/gfx/skia/skia/include/gpu/GrColor.h 2017-02-27 17:10:59.000000000 +0100
|
||||
+++ firefox-53.0.3-changed/gfx/skia/skia/include/gpu/GrColor.h 2017-05-31 09:01:50.756536464 +0200
|
||||
@@ -74,8 +74,13 @@
|
||||
diff -up firefox-55.0/gfx/skia/skia/include/gpu/GrColor.h.big-endian firefox-55.0/gfx/skia/skia/include/gpu/GrColor.h
|
||||
--- firefox-55.0/gfx/skia/skia/include/gpu/GrColor.h.big-endian 2017-07-31 18:20:55.000000000 +0200
|
||||
+++ firefox-55.0/gfx/skia/skia/include/gpu/GrColor.h 2017-08-02 10:09:36.350124031 +0200
|
||||
@@ -74,8 +74,13 @@ static inline GrColor GrColorPackA4(unsi
|
||||
* Since premultiplied means that alpha >= color, we construct a color with
|
||||
* each component==255 and alpha == 0 to be "illegal"
|
||||
*/
|
||||
@ -58,25 +58,20 @@ diff -ru firefox-53.0.3/gfx/skia/skia/include/gpu/GrColor.h firefox-53.0.3-chang
|
||||
#define GrColor_WHITE 0xFFFFFFFF
|
||||
#define GrColor_TRANSPARENT_BLACK 0x0
|
||||
|
||||
diff -ru firefox-53.0.3/gfx/skia/skia/include/gpu/GrTypes.h firefox-53.0.3-changed/gfx/skia/skia/include/gpu/GrTypes.h
|
||||
--- firefox-53.0.3/gfx/skia/skia/include/gpu/GrTypes.h 2017-02-27 17:10:59.000000000 +0100
|
||||
+++ firefox-53.0.3-changed/gfx/skia/skia/include/gpu/GrTypes.h 2017-05-30 17:21:27.782537859 +0200
|
||||
@@ -275,9 +275,9 @@
|
||||
diff -up firefox-55.0/gfx/skia/skia/include/gpu/GrTypes.h.big-endian firefox-55.0/gfx/skia/skia/include/gpu/GrTypes.h
|
||||
--- firefox-55.0/gfx/skia/skia/include/gpu/GrTypes.h.big-endian 2017-08-02 10:09:36.351124028 +0200
|
||||
+++ firefox-55.0/gfx/skia/skia/include/gpu/GrTypes.h 2017-08-02 10:13:40.512303982 +0200
|
||||
@@ -326,15 +326,13 @@ enum GrPixelConfig {
|
||||
static const int kGrPixelConfigCnt = kLast_GrPixelConfig + 1;
|
||||
|
||||
// Aliases for pixel configs that match skia's byte order.
|
||||
-#ifndef SK_CPU_LENDIAN
|
||||
- #error "Skia gpu currently assumes little endian"
|
||||
-#endif
|
||||
+//#ifndef SK_CPU_LENDIAN
|
||||
+// #error "Skia gpu currently assumes little endian"
|
||||
+//#endif
|
||||
#if SK_PMCOLOR_BYTE_ORDER(B,G,R,A)
|
||||
static const GrPixelConfig kSkia8888_GrPixelConfig = kBGRA_8888_GrPixelConfig;
|
||||
static const GrPixelConfig kSkiaGamma8888_GrPixelConfig = kSBGRA_8888_GrPixelConfig;
|
||||
@@ -285,7 +285,8 @@
|
||||
#elif SK_PMCOLOR_BYTE_ORDER(R,G,B,A)
|
||||
static const GrPixelConfig kSkia8888_GrPixelConfig = kRGBA_8888_GrPixelConfig;
|
||||
static const GrPixelConfig kSkiaGamma8888_GrPixelConfig = kSRGBA_8888_GrPixelConfig;
|
||||
#else
|
||||
- #error "SK_*32_SHIFT values must correspond to GL_BGRA or GL_RGBA format."
|
||||
+ static const GrPixelConfig kSkia8888_GrPixelConfig = kBGRA_8888_GrPixelConfig;
|
||||
@ -84,14 +79,16 @@ diff -ru firefox-53.0.3/gfx/skia/skia/include/gpu/GrTypes.h firefox-53.0.3-chang
|
||||
#endif
|
||||
|
||||
// Returns true if the pixel config is a GPU-specific compressed format
|
||||
diff -ru firefox-53.0.3/js/src/jit/none/MacroAssembler-none.h firefox-53.0.3-changed/js/src/jit/none/MacroAssembler-none.h
|
||||
--- firefox-53.0.3/js/src/jit/none/MacroAssembler-none.h 2017-04-11 06:15:18.000000000 +0200
|
||||
+++ firefox-53.0.3-changed/js/src/jit/none/MacroAssembler-none.h 2017-05-30 16:03:20.475810030 +0200
|
||||
@@ -196,7 +196,7 @@
|
||||
static bool SupportsSimd() { return false; }
|
||||
diff -up firefox-55.0/js/src/jit/none/MacroAssembler-none.h.big-endian firefox-55.0/js/src/jit/none/MacroAssembler-none.h
|
||||
--- firefox-55.0/js/src/jit/none/MacroAssembler-none.h.big-endian 2017-08-02 10:09:36.351124028 +0200
|
||||
+++ firefox-55.0/js/src/jit/none/MacroAssembler-none.h 2017-08-02 10:14:38.295109906 +0200
|
||||
@@ -197,8 +197,8 @@ class MacroAssemblerNone : public Assemb
|
||||
static bool SupportsUnalignedAccesses() { return false; }
|
||||
|
||||
static bool HasRoundInstruction(RoundingMode) { return false; }
|
||||
-
|
||||
- void executableCopy(void*, bool) { MOZ_CRASH(); }
|
||||
+
|
||||
+ void executableCopy(void*, bool flushICache = true) { MOZ_CRASH(); }
|
||||
void copyJumpRelocationTable(uint8_t*) { MOZ_CRASH(); }
|
||||
void copyDataRelocationTable(uint8_t*) { MOZ_CRASH(); }
|
||||
|
||||
@ -1,8 +1,7 @@
|
||||
diff -up firefox-54.0/build/mozconfig.rust firefox-54.0/build/mozconfig
|
||||
diff -up firefox-54.0/build/moz.configure/rust.configure.rust firefox-54.0/build/moz.configure/rust.configure
|
||||
--- firefox-54.0/build/moz.configure/rust.configure.rust 2017-06-09 22:29:36.273878229 +0200
|
||||
+++ firefox-54.0/build/moz.configure/rust.configure 2017-06-09 23:00:49.330699698 +0200
|
||||
@@ -151,6 +150,9 @@ def rust_triple_alias(host_or_target):
|
||||
diff -up firefox-55.0/build/moz.configure/rust.configure.rust-ppc64le firefox-55.0/build/moz.configure/rust.configure
|
||||
--- firefox-55.0/build/moz.configure/rust.configure.rust-ppc64le 2017-07-31 18:20:49.000000000 +0200
|
||||
+++ firefox-55.0/build/moz.configure/rust.configure 2017-08-02 10:19:03.254220003 +0200
|
||||
@@ -151,6 +151,9 @@ def rust_triple_alias(host_or_target):
|
||||
('sparc64', 'Linux'): 'sparc64-unknown-linux-gnu',
|
||||
('x86', 'Linux'): 'i686-unknown-linux-gnu',
|
||||
('x86_64', 'Linux'): 'x86_64-unknown-linux-gnu',
|
||||
@ -12,8 +11,8 @@ diff -up firefox-54.0/build/moz.configure/rust.configure.rust firefox-54.0/build
|
||||
# OS X
|
||||
('x86', 'OSX'): 'i686-apple-darwin',
|
||||
('x86_64', 'OSX'): 'x86_64-apple-darwin',
|
||||
@@ -170,8 +172,10 @@ def rust_triple_alias(host_or_target):
|
||||
('x86_64', 'WINNT'): 'x86_64-pc-windows-msvc',
|
||||
@@ -174,8 +177,10 @@ def rust_triple_alias(host_or_target):
|
||||
('sparc64', 'SunOS'): 'sparcv9-sun-solaris',
|
||||
}.get((host_or_target.cpu, os_or_kernel), None)
|
||||
|
||||
+ if (rustc_target == 'powerpc64-unknown-linux-gnu' and host_or_target.endianness == 'little'):
|
||||
@ -24,7 +23,3 @@ diff -up firefox-54.0/build/moz.configure/rust.configure.rust firefox-54.0/build
|
||||
|
||||
# Check to see whether our rustc has a reasonably functional stdlib
|
||||
# for our chosen target.
|
||||
diff -up firefox-54.0/third_party/rust/aho-corasick/ctags.rust firefox-54.0/third_party/rust/aho-corasick/ctags
|
||||
diff -up firefox-54.0/third_party/rust/memchr/ctags.rust firefox-54.0/third_party/rust/memchr/ctags
|
||||
diff -up firefox-54.0/third_party/rust/utf8-ranges/ctags.rust firefox-54.0/third_party/rust/utf8-ranges/ctags
|
||||
diff -up firefox-54.0/third_party/rust/walkdir/ctags.rust firefox-54.0/third_party/rust/walkdir/ctags
|
||||
|
||||
@ -1,13 +1,13 @@
|
||||
diff -up firefox-54.0/browser/app/profile/firefox.js.addons firefox-54.0/browser/app/profile/firefox.js
|
||||
--- firefox-54.0/browser/app/profile/firefox.js.addons 2017-06-08 13:59:20.504220317 +0200
|
||||
+++ firefox-54.0/browser/app/profile/firefox.js 2017-06-08 14:01:54.388653599 +0200
|
||||
@@ -66,7 +66,8 @@ pref("extensions.screenshots.system-disa
|
||||
diff -up firefox-55.0/browser/app/profile/firefox.js.addons firefox-55.0/browser/app/profile/firefox.js
|
||||
--- firefox-55.0/browser/app/profile/firefox.js.addons 2017-08-02 10:58:30.566363833 +0200
|
||||
+++ firefox-55.0/browser/app/profile/firefox.js 2017-08-02 10:59:15.377216959 +0200
|
||||
@@ -65,7 +65,8 @@ pref("extensions.systemAddon.update.url"
|
||||
|
||||
// Disable add-ons that are not installed by the user in all scopes by default.
|
||||
// See the SCOPE constants in AddonManager.jsm for values to use here.
|
||||
-pref("extensions.autoDisableScopes", 15);
|
||||
+pref("extensions.autoDisableScopes", 0);
|
||||
+pref("extensions.showMismatchUI", false);
|
||||
// Scopes to scan for changes at startup.
|
||||
pref("extensions.startupScanScopes", 0);
|
||||
|
||||
// Add-on content security policies.
|
||||
pref("extensions.webextensions.base-content-security-policy", "script-src 'self' https://* moz-extension: blob: filesystem: 'unsafe-eval' 'unsafe-inline'; object-src 'self' https://* moz-extension: blob: filesystem:;");
|
||||
|
||||
16
firefox.spec
16
firefox.spec
@ -93,14 +93,14 @@
|
||||
|
||||
Summary: Mozilla Firefox Web browser
|
||||
Name: firefox
|
||||
Version: 54.0.1
|
||||
Version: 55.0
|
||||
Release: 1%{?pre_tag}%{?dist}
|
||||
URL: https://www.mozilla.org/firefox/
|
||||
License: MPLv1.1 or GPLv2+ or LGPLv2+
|
||||
Group: Applications/Internet
|
||||
Source0: https://archive.mozilla.org/pub/firefox/releases/%{version}%{?pre_version}/source/firefox-%{version}%{?pre_version}.source.tar.xz
|
||||
%if %{build_langpacks}
|
||||
Source1: firefox-langpacks-%{version}%{?pre_version}-20170725.tar.xz
|
||||
Source1: firefox-langpacks-%{version}%{?pre_version}-20170802.tar.xz
|
||||
%endif
|
||||
Source10: firefox-mozconfig
|
||||
Source12: firefox-redhat-default-prefs.js
|
||||
@ -145,8 +145,6 @@ Patch304: mozilla-1253216.patch
|
||||
Patch402: mozilla-1196777.patch
|
||||
Patch406: mozilla-256180.patch
|
||||
Patch407: mozilla-1348576.patch
|
||||
Patch408: mozilla-1158076-1.patch
|
||||
Patch409: mozilla-1158076-2.patch
|
||||
Patch410: mozilla-1321521.patch
|
||||
Patch411: mozilla-1321521-2.patch
|
||||
Patch412: mozilla-1337988.patch
|
||||
@ -308,7 +306,7 @@ This package contains results of tests executed during build.
|
||||
# For branding specific patches.
|
||||
|
||||
# Fedora patches
|
||||
%patch204 -p2 -b .966424
|
||||
#%patch204 -p2 -b .966424
|
||||
%patch215 -p1 -b .addons
|
||||
%patch219 -p2 -b .rhbz-1173156
|
||||
%patch221 -p2 -b .fedora-ua
|
||||
@ -322,8 +320,6 @@ This package contains results of tests executed during build.
|
||||
%patch304 -p1 -b .1253216
|
||||
%patch402 -p1 -b .1196777
|
||||
%patch406 -p1 -b .256180
|
||||
%patch408 -p1 -b .1158076-1
|
||||
%patch409 -p1 -b .1158076-2
|
||||
%ifarch %{arm}
|
||||
%if 0%{?fedora} < 26
|
||||
# Workaround for mozbz#1337988
|
||||
@ -848,6 +844,12 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
|
||||
#---------------------------------------------------------------------
|
||||
|
||||
%changelog
|
||||
* Wed Aug 2 2017 Martin Stransky <stransky@redhat.com> - 55.0-1
|
||||
- Updated to 55.0 (B1)
|
||||
|
||||
* Wed Jul 26 2017 Fedora Release Engineering <releng@fedoraproject.org> - 54.0.1-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
|
||||
|
||||
* Tue Jul 25 2017 Jan Horak <jhorak@redhat.com> - 54.0.1-1
|
||||
- Update to 54.0.1
|
||||
|
||||
|
||||
@ -1,74 +0,0 @@
|
||||
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
|
||||
@@ -4733,16 +4733,18 @@ pref("gfx.content.always-paint", false);
|
||||
|
||||
#ifdef ANDROID
|
||||
pref("gfx.apitrace.enabled",false);
|
||||
#endif
|
||||
|
||||
#ifdef MOZ_X11
|
||||
#ifdef MOZ_WIDGET_GTK
|
||||
pref("gfx.xrender.enabled",false);
|
||||
+pref("widget.chrome.allow-gtk-dark-theme", false);
|
||||
+pref("widget.content.allow-gtk-dark-theme", false);
|
||||
#endif
|
||||
#endif
|
||||
|
||||
#ifdef XP_WIN
|
||||
// Whether to disable the automatic detection and use of direct2d.
|
||||
pref("gfx.direct2d.disabled", false);
|
||||
|
||||
// Whether to attempt to enable Direct2D regardless of automatic detection or
|
||||
diff --git a/widget/gtk/nsLookAndFeel.cpp b/widget/gtk/nsLookAndFeel.cpp
|
||||
--- a/widget/gtk/nsLookAndFeel.cpp
|
||||
+++ b/widget/gtk/nsLookAndFeel.cpp
|
||||
@@ -1128,26 +1128,39 @@ nsLookAndFeel::Init()
|
||||
GdkRGBA color;
|
||||
GtkStyleContext *style;
|
||||
|
||||
// Gtk manages a screen's CSS in the settings object so we
|
||||
// ask Gtk to create it explicitly. Otherwise we may end up
|
||||
// with wrong color theme, see Bug 972382
|
||||
GtkSettings *settings = gtk_settings_get_for_screen(gdk_screen_get_default());
|
||||
|
||||
- // Disable dark theme because it interacts poorly with widget styling in
|
||||
- // web content (see bug 1216658).
|
||||
+ // Dark themes interacts poorly with widget styling (see bug 1216658).
|
||||
+ // We disable dark themes by default for all processes (chrome, web content)
|
||||
+ // but allow user to overide it by prefs.
|
||||
+ const gchar* dark_setting = "gtk-application-prefer-dark-theme";
|
||||
+ gboolean darkThemeDefault;
|
||||
+ g_object_get(settings, dark_setting, &darkThemeDefault, nullptr);
|
||||
+
|
||||
// To avoid triggering reload of theme settings unnecessarily, only set the
|
||||
// setting when necessary.
|
||||
- const gchar* dark_setting = "gtk-application-prefer-dark-theme";
|
||||
- gboolean dark;
|
||||
- g_object_get(settings, dark_setting, &dark, nullptr);
|
||||
-
|
||||
- if (dark && !PR_GetEnv("MOZ_ALLOW_GTK_DARK_THEME")) {
|
||||
- g_object_set(settings, dark_setting, FALSE, nullptr);
|
||||
+ if (darkThemeDefault) {
|
||||
+ bool allowDarkTheme;
|
||||
+ if (XRE_IsContentProcess()) {
|
||||
+ allowDarkTheme =
|
||||
+ mozilla::Preferences::GetBool("widget.content.allow-gtk-dark-theme",
|
||||
+ false);
|
||||
+ } else {
|
||||
+ allowDarkTheme = (PR_GetEnv("MOZ_ALLOW_GTK_DARK_THEME") != nullptr) ||
|
||||
+ mozilla::Preferences::GetBool("widget.chrome.allow-gtk-dark-theme",
|
||||
+ false);
|
||||
+ }
|
||||
+ if (!allowDarkTheme) {
|
||||
+ g_object_set(settings, dark_setting, FALSE, nullptr);
|
||||
+ }
|
||||
}
|
||||
|
||||
// Scrollbar colors
|
||||
style = ClaimStyleContext(MOZ_GTK_SCROLLBAR_TROUGH_VERTICAL);
|
||||
gtk_style_context_get_background_color(style, GTK_STATE_FLAG_NORMAL, &color);
|
||||
sMozScrollbar = GDK_RGBA_TO_NS_RGBA(color);
|
||||
ReleaseStyleContext(style);
|
||||
|
||||
|
||||
@ -1,100 +0,0 @@
|
||||
diff -up firefox-53.0/widget/gtk/nsLookAndFeel.cpp.1158076-2 firefox-53.0/widget/gtk/nsLookAndFeel.cpp
|
||||
--- firefox-53.0/widget/gtk/nsLookAndFeel.cpp.1158076-2 2017-04-18 13:09:01.756315856 +0200
|
||||
+++ firefox-53.0/widget/gtk/nsLookAndFeel.cpp 2017-04-18 13:10:10.615069083 +0200
|
||||
@@ -49,9 +49,9 @@ nsLookAndFeel::nsLookAndFeel()
|
||||
mStyle(nullptr),
|
||||
#endif
|
||||
mDefaultFontCached(false), mButtonFontCached(false),
|
||||
- mFieldFontCached(false), mMenuFontCached(false)
|
||||
+ mFieldFontCached(false), mMenuFontCached(false),
|
||||
+ mInitialized(false)
|
||||
{
|
||||
- Init();
|
||||
}
|
||||
|
||||
nsLookAndFeel::~nsLookAndFeel()
|
||||
@@ -223,6 +223,8 @@ GetBorderColors(GtkStyleContext* aContex
|
||||
nsresult
|
||||
nsLookAndFeel::NativeGetColor(ColorID aID, nscolor& aColor)
|
||||
{
|
||||
+ EnsureInit();
|
||||
+
|
||||
#if (MOZ_WIDGET_GTK == 3)
|
||||
GdkRGBA gdk_color;
|
||||
#endif
|
||||
@@ -674,6 +676,11 @@ nsLookAndFeel::GetIntImpl(IntID aID, int
|
||||
return res;
|
||||
res = NS_OK;
|
||||
|
||||
+ // We use delayed initialization by EnsureInit() here
|
||||
+ // to make sure mozilla::Preferences is available (Bug 115807).
|
||||
+ // eIntID_UseAccessibilityTheme is requested before user preferences
|
||||
+ // are read, and so EnsureInit(), which depends on preference values,
|
||||
+ // is deliberately delayed until required.
|
||||
switch (aID) {
|
||||
case eIntID_CaretBlinkTime:
|
||||
{
|
||||
@@ -836,6 +843,7 @@ nsLookAndFeel::GetIntImpl(IntID aID, int
|
||||
aResult = NS_STYLE_TEXT_DECORATION_STYLE_WAVY;
|
||||
break;
|
||||
case eIntID_MenuBarDrag:
|
||||
+ EnsureInit();
|
||||
aResult = sMenuSupportsDrag;
|
||||
break;
|
||||
case eIntID_ScrollbarButtonAutoRepeatBehavior:
|
||||
@@ -876,6 +884,7 @@ nsLookAndFeel::GetFloatImpl(FloatID aID,
|
||||
aResult = 1.0f;
|
||||
break;
|
||||
case eFloatID_CaretAspectRatio:
|
||||
+ EnsureInit();
|
||||
aResult = sCaretRatio;
|
||||
break;
|
||||
default:
|
||||
@@ -1056,11 +1065,15 @@ nsLookAndFeel::GetFontImpl(FontID aID, n
|
||||
}
|
||||
|
||||
void
|
||||
-nsLookAndFeel::Init()
|
||||
+nsLookAndFeel::EnsureInit()
|
||||
{
|
||||
GdkColor colorValue;
|
||||
GdkColor *colorValuePtr;
|
||||
|
||||
+ if (mInitialized)
|
||||
+ return;
|
||||
+ mInitialized = true;
|
||||
+
|
||||
#if (MOZ_WIDGET_GTK == 2)
|
||||
NS_ASSERTION(!mStyle, "already initialized");
|
||||
// GtkInvisibles come with a refcount that is not floating
|
||||
@@ -1451,6 +1464,7 @@ nsLookAndFeel::Init()
|
||||
char16_t
|
||||
nsLookAndFeel::GetPasswordCharacterImpl()
|
||||
{
|
||||
+ EnsureInit();
|
||||
return sInvisibleCharacter;
|
||||
}
|
||||
|
||||
@@ -1469,7 +1483,7 @@ nsLookAndFeel::RefreshImpl()
|
||||
mStyle = nullptr;
|
||||
#endif
|
||||
|
||||
- Init();
|
||||
+ mInitialized = false;
|
||||
}
|
||||
|
||||
bool
|
||||
diff -up firefox-53.0/widget/gtk/nsLookAndFeel.h.1158076-2 firefox-53.0/widget/gtk/nsLookAndFeel.h
|
||||
--- firefox-53.0/widget/gtk/nsLookAndFeel.h.1158076-2 2017-04-11 06:15:20.000000000 +0200
|
||||
+++ firefox-53.0/widget/gtk/nsLookAndFeel.h 2017-04-18 13:09:01.759315845 +0200
|
||||
@@ -81,8 +81,9 @@ protected:
|
||||
char16_t sInvisibleCharacter;
|
||||
float sCaretRatio;
|
||||
bool sMenuSupportsDrag;
|
||||
+ bool mInitialized;
|
||||
|
||||
- void Init();
|
||||
+ void EnsureInit();
|
||||
};
|
||||
|
||||
#endif
|
||||
@ -1,9 +1,9 @@
|
||||
diff -up firefox-53.0/js/src/jit/AtomicOperations.h.1253216 firefox-53.0/js/src/jit/AtomicOperations.h
|
||||
--- firefox-53.0/js/src/jit/AtomicOperations.h.1253216 2017-04-18 10:07:25.939282630 +0200
|
||||
+++ firefox-53.0/js/src/jit/AtomicOperations.h 2017-04-18 10:15:50.965436343 +0200
|
||||
diff -up firefox-55.0/js/src/jit/AtomicOperations.h.1253216 firefox-55.0/js/src/jit/AtomicOperations.h
|
||||
--- firefox-55.0/js/src/jit/AtomicOperations.h.1253216 2017-08-02 11:00:24.115991657 +0200
|
||||
+++ firefox-55.0/js/src/jit/AtomicOperations.h 2017-08-02 11:01:17.373817096 +0200
|
||||
@@ -348,7 +348,7 @@ AtomicOperations::isLockfree(int32_t siz
|
||||
#elif defined(__sh__)
|
||||
# include "jit/none/AtomicOperations-ppc.h"
|
||||
# elif defined(__sh__)
|
||||
# include "jit/none/AtomicOperations-feeling-lucky.h"
|
||||
# else
|
||||
-# include "jit/none/AtomicOperations-none.h" // These MOZ_CRASH() always
|
||||
+# include "jit/none/AtomicOperations-ppc.h"
|
||||
|
||||
4
sources
4
sources
@ -1,2 +1,2 @@
|
||||
SHA512 (firefox-54.0.1.source.tar.xz) = 43607c2c0af995a21dc7f0f68b24b7e5bdb3faa5ee06025901c826bfe4d169256ea1c9eb5fcc604c4d6426ced53e80787c12fc07cda014eca09199ef3df783a2
|
||||
SHA512 (firefox-langpacks-54.0.1-20170725.tar.xz) = 1e861c56cd431008b833bee770631745d9690af8bff6e54fd332e845cd08658bb33c5fb6fd50fb3549634a5dffc119a8e00d13e8468b9ab55bd905db8ecaf41b
|
||||
SHA512 (firefox-55.0.source.tar.xz) = df7b5dbde55d1c5c94a41e49757fd764bb3469582015c5268bc0c15b455e3ce2ee917a0a39714e99811ccc36d6e8048a22af8a51fd732c1d1d9cd2eb62d31feb
|
||||
SHA512 (firefox-langpacks-55.0-20170802.tar.xz) = d962288029e418e1c0379bcf1e81d4bcb7fe8d112411b3babcbceaf2b194b954aa342d532a034845895eafab6de437d04c6d13dc90c412e2fcd3c97bf5292ee8
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
diff -up firefox-48.0/memory/mozjemalloc/jemalloc.c.jemalloc-ppc firefox-48.0/memory/mozjemalloc/jemalloc.c
|
||||
--- firefox-48.0/memory/mozjemalloc/jemalloc.c.jemalloc-ppc 2016-07-26 10:51:46.385434384 +0200
|
||||
+++ firefox-48.0/memory/mozjemalloc/jemalloc.c 2016-07-26 10:53:49.061023106 +0200
|
||||
--- firefox-48.0/memory/mozjemalloc/mozjemalloc.cpp.jemalloc-ppc 2016-07-26 10:51:46.385434384 +0200
|
||||
+++ firefox-48.0/memory/mozjemalloc/mozjemalloc.cpp 2016-07-26 10:53:49.061023106 +0200
|
||||
@@ -1090,7 +1090,7 @@ static const bool config_recycle = false
|
||||
* controlling the malloc behavior are defined as compile-time constants
|
||||
* for best performance and cannot be altered at runtime.
|
||||
|
||||
Loading…
Reference in New Issue
Block a user