Attachment #201365 for bug #235161

View | Details | Raw Unified | Return to bug 235161
Collapse All | Expand All

Lines 2-12 Link Here

(-)b/mail/thunderbird-i18n/Makefile (-3 / +2 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= thunderbird-i18n	4	PORTNAME= thunderbird-i18n
5	PORTVERSION= 60.4.0	5	PORTVERSION= 60.5.0
6	PORTREVISION= 1
7	CATEGORIES= mail news net-im	6	CATEGORIES= mail news net-im
8	MASTER_SITES= MOZILLA/${PORTNAME:S\|-i18n\|\|}/releases/${DISTVERSION}/linux-x86_64/xpi \	7	MASTER_SITES= MOZILLA/${PORTNAME:S\|-i18n\|\|}/releases/${DISTVERSION}/linux-x86_64/xpi \
9	MOZILLA/${PORTNAME:S\|-i18n\|\|}/candidates/${DISTVERSION}-candidates/build1/linux-x86_64/xpi	8	MOZILLA/${PORTNAME:S\|-i18n\|\|}/candidates/${DISTVERSION}-candidates/build2/linux-x86_64/xpi
10	PKGNAMEPREFIX=	9	PKGNAMEPREFIX=
11	DISTFILES= ${THUNDERBIRD_I18N_:S/$/.xpi/}	10	DISTFILES= ${THUNDERBIRD_I18N_:S/$/.xpi/}
12	DIST_SUBDIR= xpi/${DISTNAME}	11	DIST_SUBDIR= xpi/${DISTNAME}




TIMESTAMP = 1548238106
SHA256 (xpi/thunderbird-i18n-60.5.0/ar.xpi) = 396a13fc6535a68fb1c0f754243b220f6bcfec2a186a5567b9369147ff3975d0
SIZE (xpi/thunderbird-i18n-60.5.0/ar.xpi) = 627179
SHA256 (xpi/thunderbird-i18n-60.5.0/ast.xpi) = 7563dbb731f7ea8f9a13dbec1f3a295fc89839fe484b6a2fda57be6eec5e2ce2
SIZE (xpi/thunderbird-i18n-60.5.0/ast.xpi) = 559643
SHA256 (xpi/thunderbird-i18n-60.5.0/be.xpi) = a098bc35e3703e422ed548883216d534b8aef0ef47a446aa2acd6955b0fdac29
SIZE (xpi/thunderbird-i18n-60.5.0/be.xpi) = 659079
SHA256 (xpi/thunderbird-i18n-60.5.0/bg.xpi) = 647d26bf395c3f885617f1a970ea67e1436ae266d0d9c8b089490e1e12afb1ac
SIZE (xpi/thunderbird-i18n-60.5.0/bg.xpi) = 669318
SHA256 (xpi/thunderbird-i18n-60.5.0/br.xpi) = 75c2b8578e5cc30035b9f6faad4feab1c43d83a1ed95ec45c9f4d8ab0bfd0c4b
SIZE (xpi/thunderbird-i18n-60.5.0/br.xpi) = 580371
SHA256 (xpi/thunderbird-i18n-60.5.0/ca.xpi) = d9e87182418d6c89ba332a4e78078f81e9aac14fe0abce255b673122c0735f71
SIZE (xpi/thunderbird-i18n-60.5.0/ca.xpi) = 591971
SHA256 (xpi/thunderbird-i18n-60.5.0/cs.xpi) = 1dc5fd93a43b997adb28fc7ac24ba1a25e040d02ebd7a7978f8d6bce318f22e0
SIZE (xpi/thunderbird-i18n-60.5.0/cs.xpi) = 611203
SHA256 (xpi/thunderbird-i18n-60.5.0/cy.xpi) = 6039174a0c761416ef49f0face6f88b4d79a49fa56c4bb473bb5cee750a3e208
SIZE (xpi/thunderbird-i18n-60.5.0/cy.xpi) = 586038
SHA256 (xpi/thunderbird-i18n-60.5.0/da.xpi) = 4d515134ef90ff95523ff687088bebcacec23ed8fbe4f6d616b68ae0710f249a
SIZE (xpi/thunderbird-i18n-60.5.0/da.xpi) = 570807
SHA256 (xpi/thunderbird-i18n-60.5.0/de.xpi) = 1664dd8842851d29647dbb1fcfa4ecafb9501b5ab358302bcbacb77cab634559
SIZE (xpi/thunderbird-i18n-60.5.0/de.xpi) = 582575
SHA256 (xpi/thunderbird-i18n-60.5.0/dsb.xpi) = e0f34880b25f7d1e361dc8b502405918a51d402d0c14370f863259d5609bd6d5
SIZE (xpi/thunderbird-i18n-60.5.0/dsb.xpi) = 617569
SHA256 (xpi/thunderbird-i18n-60.5.0/el.xpi) = 510d046f3bb350a7d5847834d37fa3895209df1d2bf609dd826af594404e2e53
SIZE (xpi/thunderbird-i18n-60.5.0/el.xpi) = 694860
SHA256 (xpi/thunderbird-i18n-60.5.0/en-GB.xpi) = e8fa1a81c509b42e630a0d51eef58b0f027b6a9a6b648cfabb407cd4e1ef5d15
SIZE (xpi/thunderbird-i18n-60.5.0/en-GB.xpi) = 553895
SHA256 (xpi/thunderbird-i18n-60.5.0/en-US.xpi) = 6bd4ee055fa3c7dc6b2756220b4cc192ff4c2b1509662fc02bbbbd77d83276d1
SIZE (xpi/thunderbird-i18n-60.5.0/en-US.xpi) = 550807
SHA256 (xpi/thunderbird-i18n-60.5.0/es-AR.xpi) = f31f9ddd6f2bd7f14b7ba660dca44a44d1ce63f6b696fcf3402de508a44fdf84
SIZE (xpi/thunderbird-i18n-60.5.0/es-AR.xpi) = 595048
SHA256 (xpi/thunderbird-i18n-60.5.0/es-ES.xpi) = f328d5a6e0e3c155da02acb7f22264941f85991b587c8c73554eba4bc0ec6658
SIZE (xpi/thunderbird-i18n-60.5.0/es-ES.xpi) = 492211
SHA256 (xpi/thunderbird-i18n-60.5.0/et.xpi) = 68329563dc48cc899007d846d1d1c78bc4690d54955e2e377ac204284aa3a4fc
SIZE (xpi/thunderbird-i18n-60.5.0/et.xpi) = 570867
SHA256 (xpi/thunderbird-i18n-60.5.0/eu.xpi) = 96c124681a083f7d44a1a27fe8cabd287b73152a0aba324ecc89c099f07ebe2b
SIZE (xpi/thunderbird-i18n-60.5.0/eu.xpi) = 581384
SHA256 (xpi/thunderbird-i18n-60.5.0/fi.xpi) = 2fbc3ebbeda7770dad1031056dd8568decc68e92041043c2fa537580d68be3b6
SIZE (xpi/thunderbird-i18n-60.5.0/fi.xpi) = 575755
SHA256 (xpi/thunderbird-i18n-60.5.0/fr.xpi) = 8b7e334e832ca60dc5f5972df0e070a0bc64aa3d21f9f4fd4a0a4fb09eab68a7
SIZE (xpi/thunderbird-i18n-60.5.0/fr.xpi) = 608467
SHA256 (xpi/thunderbird-i18n-60.5.0/fy-NL.xpi) = d4e058e7449baaa68a87f6147081ab849134e3c487c5a46ebe874ee769f380f5
SIZE (xpi/thunderbird-i18n-60.5.0/fy-NL.xpi) = 593851
SHA256 (xpi/thunderbird-i18n-60.5.0/ga-IE.xpi) = 565c05ad8e1841c06571e9877d7e1dbdd0d3b2dcb7caecdd525cb24684e1ee7c
SIZE (xpi/thunderbird-i18n-60.5.0/ga-IE.xpi) = 603506
SHA256 (xpi/thunderbird-i18n-60.5.0/gd.xpi) = 6526a9b5e70600234a5bce76548fc8aa30bfabb4bab081991a0ec28f375e11ef
SIZE (xpi/thunderbird-i18n-60.5.0/gd.xpi) = 599262
SHA256 (xpi/thunderbird-i18n-60.5.0/gl.xpi) = bc3ae2e961b058a37e5977ec23d1a3636c1547f424b913680b01b312e31c2eb8
SIZE (xpi/thunderbird-i18n-60.5.0/gl.xpi) = 580353
SHA256 (xpi/thunderbird-i18n-60.5.0/he.xpi) = fb735a51a263d7c12624b106b4b11afe55b4192b6c3752cd5a3de10f0ea4589b
SIZE (xpi/thunderbird-i18n-60.5.0/he.xpi) = 617144
SHA256 (xpi/thunderbird-i18n-60.5.0/hr.xpi) = 46ab5cd64c814a6f8f930539e7757ec6d859c652c121be09f7d0984e15feb945
SIZE (xpi/thunderbird-i18n-60.5.0/hr.xpi) = 582238
SHA256 (xpi/thunderbird-i18n-60.5.0/hsb.xpi) = 58dfbff6977c8c0144c4bf9a40d60915b248620c391c9a814ad53825ced57daf
SIZE (xpi/thunderbird-i18n-60.5.0/hsb.xpi) = 615132
SHA256 (xpi/thunderbird-i18n-60.5.0/hu.xpi) = bb5ded142be6f62c0aeac040d7720fd12558ae5b2cf1c62cfb4de10a507cd97a
SIZE (xpi/thunderbird-i18n-60.5.0/hu.xpi) = 615346
SHA256 (xpi/thunderbird-i18n-60.5.0/hy-AM.xpi) = 0cae5f9e6e9ba0317a508335bfe430ae1efc4ec259c8c535373a6b1004801ab6
SIZE (xpi/thunderbird-i18n-60.5.0/hy-AM.xpi) = 653530
SHA256 (xpi/thunderbird-i18n-60.5.0/id.xpi) = f0b0710ba277f373bdfff2c161ca97300fc773c400f0505430ba9a2163a511e5
SIZE (xpi/thunderbird-i18n-60.5.0/id.xpi) = 568861
SHA256 (xpi/thunderbird-i18n-60.5.0/is.xpi) = 40781ed3bbf9af0bbff1c2a144c101505192480e49f599d69af19aadc9cbee38
SIZE (xpi/thunderbird-i18n-60.5.0/is.xpi) = 579047
SHA256 (xpi/thunderbird-i18n-60.5.0/it.xpi) = 22803ad551daed6a6101b2c856a79386240a4fceeb4160e83dcde0c0e2944d06
SIZE (xpi/thunderbird-i18n-60.5.0/it.xpi) = 477500
SHA256 (xpi/thunderbird-i18n-60.5.0/ja.xpi) = 3bb74a119f76062428ba889723e6e878dabed760757a90bb247ec19d1ce58e0e
SIZE (xpi/thunderbird-i18n-60.5.0/ja.xpi) = 653342
SHA256 (xpi/thunderbird-i18n-60.5.0/kab.xpi) = f04752503fa8884e6aa814977b7ddbf1651378fe9f971553a1d6f258da032a1b
SIZE (xpi/thunderbird-i18n-60.5.0/kab.xpi) = 594016
SHA256 (xpi/thunderbird-i18n-60.5.0/kk.xpi) = c62955e2fc253b1f7a685089dc399317d8889680144cb804a20dd2e1b56a962a
SIZE (xpi/thunderbird-i18n-60.5.0/kk.xpi) = 669231
SHA256 (xpi/thunderbird-i18n-60.5.0/ko.xpi) = bd8c8e5000ffd97577a74f3866489bc941e02d4a98b8543233821b334b215191
SIZE (xpi/thunderbird-i18n-60.5.0/ko.xpi) = 619730
SHA256 (xpi/thunderbird-i18n-60.5.0/lt.xpi) = 5d51778174d5043fb79d2339afa3952934bddd1c29020a1256e6e14e0b8ad9af
SIZE (xpi/thunderbird-i18n-60.5.0/lt.xpi) = 605441
SHA256 (xpi/thunderbird-i18n-60.5.0/ms.xpi) = 715cb9b93e28839c5f939952a0c6929f5b11bbe294ffc7ef82c5f1f5146f75ab
SIZE (xpi/thunderbird-i18n-60.5.0/ms.xpi) = 574307
SHA256 (xpi/thunderbird-i18n-60.5.0/nb-NO.xpi) = 1c8bb1cedbfd2a297f11947b1b99bef28690e26d33be826a55e04efa3c3f4611
SIZE (xpi/thunderbird-i18n-60.5.0/nb-NO.xpi) = 577003
SHA256 (xpi/thunderbird-i18n-60.5.0/nl.xpi) = 830b93c1afad284e406f12df76f5fe5fb011fdafbd4ce9f10e44284a5a4a1fc5
SIZE (xpi/thunderbird-i18n-60.5.0/nl.xpi) = 583914
SHA256 (xpi/thunderbird-i18n-60.5.0/nn-NO.xpi) = a33c9e8b7dcffeb1702b12c25c6a719096d65d69dc85877c066a35babb4b2824
SIZE (xpi/thunderbird-i18n-60.5.0/nn-NO.xpi) = 576422
SHA256 (xpi/thunderbird-i18n-60.5.0/pl.xpi) = 1a5b60e65adfb3f4024d25165e3e864ffb210166e61dff47bb9abdbea2b99dcb
SIZE (xpi/thunderbird-i18n-60.5.0/pl.xpi) = 480725
SHA256 (xpi/thunderbird-i18n-60.5.0/pt-BR.xpi) = 8fbbb1022f49ca9fce1aa1481afff4ed377d1281e9da3d3a3f51faf42b4ab0b0
SIZE (xpi/thunderbird-i18n-60.5.0/pt-BR.xpi) = 588834
SHA256 (xpi/thunderbird-i18n-60.5.0/pt-PT.xpi) = b7f8f9e440778e3a19929ce6f04c98af905767b888a87380a108b28f8455426f
SIZE (xpi/thunderbird-i18n-60.5.0/pt-PT.xpi) = 593186
SHA256 (xpi/thunderbird-i18n-60.5.0/rm.xpi) = b8de1432cb2440d07ed0624367dca3629f0494dd6a5f3052c7f7e5b6df715c54
SIZE (xpi/thunderbird-i18n-60.5.0/rm.xpi) = 578384
SHA256 (xpi/thunderbird-i18n-60.5.0/ro.xpi) = 03e25d7e493d13f156e75885dd5adc4686202d01976750c433169f3ba2bbdf62
SIZE (xpi/thunderbird-i18n-60.5.0/ro.xpi) = 584308
SHA256 (xpi/thunderbird-i18n-60.5.0/ru.xpi) = 2b4398c00a09d7a1a306933d25fced39bbc73b1455ff816f7a288aae70b8bcc5
SIZE (xpi/thunderbird-i18n-60.5.0/ru.xpi) = 694705
SHA256 (xpi/thunderbird-i18n-60.5.0/si.xpi) = bd82a180d5f2081505a3ff8c09de9936511d1d616e9947c913c5d45ae0105ca4
SIZE (xpi/thunderbird-i18n-60.5.0/si.xpi) = 647596
SHA256 (xpi/thunderbird-i18n-60.5.0/sk.xpi) = 26901d561b82c040e733fe061829c9d688b4869cf4ff5dcda3d84b3e1178a0a5
SIZE (xpi/thunderbird-i18n-60.5.0/sk.xpi) = 612216
SHA256 (xpi/thunderbird-i18n-60.5.0/sl.xpi) = 202dfacbe227291e69e81ff96540aac1e3444209d62b083c172fc23c72d54ee2
SIZE (xpi/thunderbird-i18n-60.5.0/sl.xpi) = 589947
SHA256 (xpi/thunderbird-i18n-60.5.0/sq.xpi) = 82fc6083998e6362b0bfc8e263edad82346463a226eddc6b04bcf7fb380b6788
SIZE (xpi/thunderbird-i18n-60.5.0/sq.xpi) = 593096
SHA256 (xpi/thunderbird-i18n-60.5.0/sr.xpi) = dc931da27dda3502cd22abf0837afaecda15160476758e5e2aa194d517bb463f
SIZE (xpi/thunderbird-i18n-60.5.0/sr.xpi) = 641527
SHA256 (xpi/thunderbird-i18n-60.5.0/sv-SE.xpi) = f1be900c89ec7b88b7b3511360729b0b237d01f10d26aaad2857a8f9d295bc9b
SIZE (xpi/thunderbird-i18n-60.5.0/sv-SE.xpi) = 594079
SHA256 (xpi/thunderbird-i18n-60.5.0/tr.xpi) = c1a1b0135c22ab60c2a6542fb1571413e9d78d5a70a4efa57e798b6998381971
SIZE (xpi/thunderbird-i18n-60.5.0/tr.xpi) = 598010
SHA256 (xpi/thunderbird-i18n-60.5.0/uk.xpi) = a3e95424e17a6b370c510aba63ee49521beddb7b843971e540b2ae7e7785747f
SIZE (xpi/thunderbird-i18n-60.5.0/uk.xpi) = 684154
SHA256 (xpi/thunderbird-i18n-60.5.0/vi.xpi) = 24367d6109f0e0a996e3623e15aaa75a84a8373b7a025edf7e84e8f56421b315
SIZE (xpi/thunderbird-i18n-60.5.0/vi.xpi) = 637199
SHA256 (xpi/thunderbird-i18n-60.5.0/zh-CN.xpi) = ccb35f028c1741133ba6449858fd543fc9fad93d17c1887df55dd5e751f2799f
SIZE (xpi/thunderbird-i18n-60.5.0/zh-CN.xpi) = 626283
SHA256 (xpi/thunderbird-i18n-60.5.0/zh-TW.xpi) = 08ce589a9ee4e41ab1d23338dcc9758b6eb866cfdf27cee44e6cfa7fbc460c59
SIZE (xpi/thunderbird-i18n-60.5.0/zh-TW.xpi) = 626190




# $FreeBSD$

PORTNAME=	thunderbird
DISTVERSION=	60.5.0
PORTREVISION=	3
CATEGORIES=	mail news net-im ipv6
MASTER_SITES=	MOZILLA/${PORTNAME}/releases/${DISTVERSION}/source \
		MOZILLA/${PORTNAME}/candidates/${DISTVERSION}-candidates/build2/source
DISTFILES=	${DISTNAME}.source${EXTRACT_SUFX}

MAINTAINER=	gecko@FreeBSD.org
COMMENT=	Mozilla Thunderbird is standalone mail and news that stands above

BUILD_DEPENDS=	nspr>=4.19:devel/nspr \
		nss>=3.36.7:security/nss \
		icu>=59.1,1:devel/icu \
		libevent>=2.1.8:devel/libevent \
		harfbuzz>=1.7.6:print/harfbuzz \

Lines 1-3 Link Here

(-)b/mail/thunderbird/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1545056672	1	TIMESTAMP = 1548237843
2	SHA256 (thunderbird-60.4.0.source.tar.xz) = 27a6cdd9cfdd7ce70b1d193c64739db6be6b39eec308f0122d8472a6cd243e75	2	SHA256 (thunderbird-60.5.0.source.tar.xz) = 6f96e87e832e4089c69418db64e19afd54a0acefe3e0364087a8bc6f442b9566
3	SIZE (thunderbird-60.4.0.source.tar.xz) = 284938284	3	SIZE (thunderbird-60.5.0.source.tar.xz) = 285636196




index c8c178965c488..5badf328ede4f 100644
--- js/src/vm/UnboxedObject.cpp
+++ js/src/vm/UnboxedObject.cpp
@@ -86,8 +86,15 @@ static const uintptr_t CLEAR_CONSTRUCTOR_CODE_TOKEN = 
 #endif
 
 #ifdef JS_CODEGEN_ARM64
-  // ARM64 communicates stack address via sp, but uses a pseudo-sp for
-  // addressing.
+  // ARM64 communicates stack address via sp, but uses a pseudo-sp (PSP) for
+  // addressing.  The register we use for PSP may however also be used by
+  // calling code, and it is nonvolatile, so save it.  Do this as a special
+  // case first because the generic save/restore code needs the PSP to be
+  // initialized already.
+  MOZ_ASSERT(PseudoStackPointer64.Is(masm.GetStackPointer64()));
+  masm.Str(PseudoStackPointer64, vixl::MemOperand(sp, -16, vixl::PreIndex));
+
+  // Initialize the PSP from the SP.
   masm.initStackPtr();
 #endif
 
@@ -239,7 +246,22 @@ static const uintptr_t CLEAR_CONSTRUCTOR_CODE_TOKEN = 
   if (ScratchDoubleReg.volatile_()) masm.pop(ScratchDoubleReg);
   masm.PopRegsInMask(savedNonVolatileRegisters);
 
+#ifdef JS_CODEGEN_ARM64
+  // Now restore the value that was in the PSP register on entry, and return.
+
+  // Obtain the correct SP from the PSP.
+  masm.Mov(sp, PseudoStackPointer64);
+
+  // Restore the saved value of the PSP register, this value is whatever the
+  // caller had saved in it, not any actual SP value, and it must not be
+  // overwritten subsequently.
+  masm.Ldr(PseudoStackPointer64, vixl::MemOperand(sp, 16, vixl::PostIndex));
+
+  // Perform a plain Ret(), as abiret() will move SP <- PSP and that is wrong.
+  masm.Ret(vixl::lr);
+#else
   masm.abiret();
+#endif
 
   masm.bind(&failureStoreOther);
 




index ef3f868bdbf7..8666564b4d0c 100644
--- dom/canvas/CanvasRenderingContext2D.cpp
+++ dom/canvas/CanvasRenderingContext2D.cpp
@@ -1358,7 +1358,8 @@ bool CanvasRenderingContext2D::AllowOpenGLCanvas() con
   // HTMLCanvasElement::GetCompositorBackendType would return LAYERS_NONE
   // as well, so it wouldn't help much.
 
-  return (mCompositorBackend == LayersBackend::LAYERS_OPENGL) &&
+  return (mCompositorBackend == LayersBackend::LAYERS_OPENGL ||
+          mCompositorBackend == LayersBackend::LAYERS_WR) &&
          gfxPlatform::GetPlatform()->AllowOpenGLCanvas();
 }
 
diff --git gfx/thebes/gfxPlatform.cpp gfx/thebes/gfxPlatform.cpp
index b9beea68d8c5..82635f9ab3ce 100644
--- gfx/thebes/gfxPlatform.cpp
+++ gfx/thebes/gfxPlatform.cpp
@@ -1341,7 +1341,8 @@ bool gfxPlatform::AllowOpenGLCanvas() {
   // so we let content process always assume correct compositor backend.
   // The callers have to do the right thing.
   bool correctBackend =
       !XRE_IsParentProcess() ||
-      ((mCompositorBackend == LayersBackend::LAYERS_OPENGL) &&
+      ((mCompositorBackend == LayersBackend::LAYERS_OPENGL ||
+        mCompositorBackend == LayersBackend::LAYERS_WR) &&
        (GetContentBackendFor(mCompositorBackend) == BackendType::SKIA));
 
   if (gfxPrefs::CanvasAzureAccelerated() && correctBackend) {
diff --git gfx/thebes/gfxPlatform.h gfx/thebes/gfxPlatform.h
index c988eb1168a8..3bbf2b763f26 100644
--- gfx/thebes/gfxPlatform.h
+++ gfx/thebes/gfxPlatform.h
@@ -265,7 +265,7 @@ class gfxPlatform {
   /// asking for it, we will examine the commands in the first few seconds
   /// of the canvas usage, and potentially change to accelerated or
   /// non-accelerated canvas.
-  bool AllowOpenGLCanvas();
+  virtual bool AllowOpenGLCanvas();
   virtual void InitializeSkiaCacheLimits();
 
   static bool AsyncPanZoomEnabled();
diff --git gfx/thebes/gfxWindowsPlatform.cpp gfx/thebes/gfxWindowsPlatform.cpp
index 9ba6f40c6cc0..4d65791d075f 100644
--- gfx/thebes/gfxWindowsPlatform.cpp
+++ gfx/thebes/gfxWindowsPlatform.cpp
@@ -466,6 +466,11 @@ void gfxWindowsPlatform::UpdateRenderMode() {
   }
 }
 
+bool gfxWindowsPlatform::AllowOpenGLCanvas() {
+gfxWindowsPlatform::AllowOpenGLCanvas()
+{
+  // OpenGL canvas is not supported on windows
+  return false;
+}
+
 mozilla::gfx::BackendType gfxWindowsPlatform::GetContentBackendFor(
     mozilla::layers::LayersBackend aLayers) {
   mozilla::gfx::BackendType defaultBackend =
diff --git gfx/thebes/gfxWindowsPlatform.h gfx/thebes/gfxWindowsPlatform.h
index 47048de8f5f5..47ec0e9e5547 100644
--- gfx/thebes/gfxWindowsPlatform.h
+++ gfx/thebes/gfxWindowsPlatform.h
@@ -171,6 +171,8 @@ class gfxWindowsPlatform : public gfxPlatform {
   void SchedulePaintIfDeviceReset() override;
   void CheckForContentOnlyDeviceReset();
 
+  bool AllowOpenGLCanvas() override;
+
   mozilla::gfx::BackendType GetContentBackendFor(
       mozilla::layers::LayersBackend aLayers) override;
 
     mozilla::gfx::BackendType GetPreferredCanvasBackend() override;




 
 #include "ContentParent.h"
 #include "TabParent.h"
@@ -1857,64 +1858,56 @@ bool ContentParent::LaunchSubprocess(
   extraArgs.push_back(idStr);
   extraArgs.push_back(IsForBrowser() ? "-isForBrowser" : "-notForBrowser");
 

 
-  for (unsigned int i = 0; i < prefsLen; i++) {
-    const char* prefName = ContentPrefs::GetEarlyPref(i);
-    MOZ_ASSERT(
-        i == 0 || strcmp(prefName, ContentPrefs::GetEarlyPref(i - 1)) > 0,
-        "Content process preferences should be sorted alphabetically.");
-
-    if (!Preferences::MustSendToContentProcesses(prefName)) {
-      continue;
-    }
-
-    switch (Preferences::GetType(prefName)) {
-      case nsIPrefBranch::PREF_INT:
-        intPrefs.Append(
-            nsPrintfCString("%u:%d|", i, Preferences::GetInt(prefName)));
-        break;
-      case nsIPrefBranch::PREF_BOOL:
-        boolPrefs.Append(
-            nsPrintfCString("%u:%d|", i, Preferences::GetBool(prefName)));
-        break;
-      case nsIPrefBranch::PREF_STRING: {
-        nsAutoCString value;
-        Preferences::GetCString(prefName, value);
-        stringPrefs.Append(
-            nsPrintfCString("%u:%d;%s|", i, value.Length(), value.get()));
-      } break;
-      case nsIPrefBranch::PREF_INVALID:
-        break;
-      default:
-        printf("preference type: %x\n", Preferences::GetType(prefName));
-        MOZ_CRASH();
-    }
+  // Set up the shared memory.
+  base::SharedMemory shm;

+    NS_ERROR("failed to create shared memory in the parent");
+    MarkAsDead();
+    return false;
   }
+  if (!shm.Map(prefs.Length())) {
+    NS_ERROR("failed to map shared memory in the parent");
+    MarkAsDead();
+    return false;
+  }
 
-  nsCString schedulerPrefs = Scheduler::GetPrefs();
+  // Copy the serialized prefs into the shared memory.

+  mSubprocess->AddHandleToShare(prefsHandle);
+  extraArgs.push_back("-prefsHandle");
+  extraArgs.push_back(
+      nsPrintfCString("%zu", reinterpret_cast<uintptr_t>(prefsHandle)).get());
+#else
+  // In contrast, Unix fds are per-process. So remap the fd to a fixed one that
+  // will be used in the child.

+  // remapping so it doesn't get closed in the child.
+  mSubprocess->AddFdToRemap(shm.handle().fd, kPrefsFileDescriptor);
+#endif
 
+  // Pass the length via a command flag.
+  extraArgs.push_back("-prefsLen");
+  extraArgs.push_back(nsPrintfCString("%zu", uintptr_t(prefs.Length())).get());
+
   // Scheduler prefs need to be handled differently because the scheduler needs
   // to start up in the content process before the normal preferences service.
+  nsCString schedulerPrefs = Scheduler::GetPrefs();
   extraArgs.push_back("-schedulerPrefs");
   extraArgs.push_back(schedulerPrefs.get());
 
@@ -1923,6 +1916,7 @@ bool ContentParent::LaunchSubprocess(
   }
 
   if (!mSubprocess->LaunchAndWaitForProcessHandle(extraArgs)) {

 #include "mozilla/SandboxSettings.h"
 #include "nsAppDirectoryServiceDefs.h"
 #include "nsDirectoryService.h"
@@ -76,14 +77,21 @@ static void SetUpSandboxEnvironment() {
 }
 #endif
 
+#ifdef ANDROID
+static int gPrefsFd = -1;
+
+void SetPrefsFd(int aFd) { gPrefsFd = aFd; }
+SetPrefsFd(int aFd)
+{
+  gPrefsFd = aFd;
+}
+#endif
+
 bool ContentProcess::Init(int aArgc, char* aArgv[]) {
   // If passed in grab the application path for xpcom init
 {
@@ -88,9 +99,10 @@ ContentProcess::Init(int aArgc, char* aArgv[])
   bool foundAppdir = false;
   bool foundChildID = false;
   bool foundIsForBrowser = false;

   bool foundSchedulerPrefs = false;
 
   uint64_t childID;
@@ -96,7 +104,8 @@ bool ContentProcess::Init(int aArgc, char* aArgv[]) {
 #endif
 
   char* schedulerPrefs = nullptr;

   for (int idx = aArgc; idx > 0; idx--) {
     if (!aArgv[idx]) {
       continue;
@@ -128,55 +137,24 @@ bool ContentProcess::Init(int aArgc, char* aArgv[]) {
       }
       isForBrowser = strcmp(aArgv[idx], "-notForBrowser");
       foundIsForBrowser = true;
-    } else if (!strcmp(aArgv[idx], "-intPrefs")) {
+#ifdef XP_WIN
+    } else if (!strcmp(aArgv[idx], "-prefsHandle")) {
       char* str = aArgv[idx + 1];
-      while (*str) {
-        int32_t index = strtol(str, &str, 10);
-        MOZ_ASSERT(str[0] == ':');
-        str++;
-        MaybePrefValue value(
-            PrefValue(static_cast<int32_t>(strtol(str, &str, 10))));
-        MOZ_ASSERT(str[0] == '|');
-        str++;
-        // XXX: we assume these values as default values, which may not be

-      }
-      foundIntPrefs = true;
-    } else if (!strcmp(aArgv[idx], "-boolPrefs")) {
+      MOZ_ASSERT(str[0] != '\0');
+      // ContentParent uses %zu to print a word-sized unsigned integer. So even
+      // though strtoull() returns a long long int, it will fit in a uintptr_t.
+      prefsHandle = reinterpret_cast<HANDLE>(strtoull(str, &str, 10));
+      MOZ_ASSERT(str[0] == '\0');
+      foundPrefsHandle = true;
+#endif
+    } else if (!strcmp(aArgv[idx], "-prefsLen")) {
       char* str = aArgv[idx + 1];
-      while (*str) {
-        int32_t index = strtol(str, &str, 10);

-      }
-      foundBoolPrefs = true;
-    } else if (!strcmp(aArgv[idx], "-stringPrefs")) {
-      char* str = aArgv[idx + 1];
+      // ContentParent uses %zu to print a word-sized unsigned integer. So even
+      // though strtoull() returns a long long int, it will fit in a uintptr_t.
+      prefsHandle = reinterpret_cast<HANDLE>(strtoull(str, &str, 10));
+      MOZ_ASSERT(str[0] == '\0');
+      foundPrefsHandle = true;
+#endif
+    } else if (!strcmp(aArgv[idx], "-prefsLen")) {
       char* str = aArgv[idx + 1];
-      while (*str) {
-        int32_t index = strtol(str, &str, 10);
-        MOZ_ASSERT(str[0] == ':');

     } else if (!strcmp(aArgv[idx], "-schedulerPrefs")) {
       schedulerPrefs = aArgv[idx + 1];
       foundSchedulerPrefs = true;
@@ -201,19 +179,42 @@ bool ContentProcess::Init(int aArgc, char* aArgv[]) {
 #endif /* XP_MACOSX && MOZ_CONTENT_SANDBOX */
 
     bool allFound = foundAppdir && foundChildID && foundIsForBrowser &&
-                    foundIntPrefs && foundBoolPrefs && foundStringPrefs &&
-                    foundSchedulerPrefs;
-                 && foundStringPrefs
-                 && foundSchedulerPrefs;
-
+                    foundPrefsLen && foundSchedulerPrefs
+                 && foundSchedulerPrefs
+#ifdef XP_WIN
+                    && foundPrefsHandle
+#endif
 #if defined(XP_MACOSX) && defined(MOZ_CONTENT_SANDBOX)
-    allFound &= foundProfile;
+                    && foundProfile
 #endif
+                    && true;
 
     if (allFound) {
       break;

+                                           prefsLen);
+
   Scheduler::SetPrefs(schedulerPrefs);
   mContent.Init(IOThreadChild::message_loop(), ParentPid(),
                 IOThreadChild::channel(), childID, isForBrowser);
diff --git dom/ipc/ContentProcess.h dom/ipc/ContentProcess.h
index a3854c761e10..6582c94da496 100644
--- dom/ipc/ContentProcess.h
+++ dom/ipc/ContentProcess.h
@@ -45,6 +45,11 @@ class ContentProcess : public mozilla::ipc::ProcessChi
   DISALLOW_EVIL_CONSTRUCTORS(ContentProcess);
 };
 

+void SetPrefsFd(int aFd);
+#endif
+
 }  // namespace dom
 }  // namespace mozilla
 
diff --git ipc/chromium/src/base/process_util_win.cc ipc/chromium/src/base/process_util_win.cc
index 3ed54cd744ac..46667985cd71 100644
--- ipc/chromium/src/base/process_util_win.cc
+++ ipc/chromium/src/base/process_util_win.cc
@@ -320,6 +320,11 @@ bool LaunchApp(const std::wstring& cmdline, const Laun
   LPPROC_THREAD_ATTRIBUTE_LIST lpAttributeList = NULL;
   std::vector<HANDLE> handlesToInherit;
   for (HANDLE h : options.handles_to_inherit) {
+    if (SetHandleInformation(h, HANDLE_FLAG_INHERIT, HANDLE_FLAG_INHERIT) ==
+        0) {
+      MOZ_DIAGNOSTIC_ASSERT(false, "SetHandleInformation failed");
+      return false;
+    }

index d18ed9edd4ca..3be1c51d10bb 100644
--- ipc/glue/GeckoChildProcessHost.cpp
+++ ipc/glue/GeckoChildProcessHost.cpp
@@ -1018,9 +1018,6 @@ bool GeckoChildProcessHost::PerformAsyncLaunchInternal
 
   if (!CrashReporter::IsDummy()) {
     PROsfd h = PR_FileDesc2NativeHandle(crashAnnotationWritePipe);
-#if defined(MOZ_SANDBOX)
-    mSandboxBroker.AddHandleToShare(reinterpret_cast<HANDLE>(h));
-#endif  // defined(MOZ_SANDBOX)
     mLaunchOptions->handles_to_inherit.push_back(reinterpret_cast<HANDLE>(h));
     std::string hStr = std::to_string(h);
     cmdLine.AppendLooseValue(UTF8ToWide(hStr));
@@ -1031,6 +1028,11 @@ bool GeckoChildProcessHost::PerformAsyncLaunchInternal
 
 #if defined(MOZ_SANDBOX)
   if (shouldSandboxCurrentProcess) {
+    // Mark the handles to inherit as inheritable.
+    for (HANDLE h : mLaunchOptions->handles_to_inherit) {

+
     if (mSandboxBroker.LaunchApp(cmdLine.program().c_str(),
                                  cmdLine.command_line_string().c_str(),
                                  mLaunchOptions->env_map, mProcessType,
@@ -1154,7 +1156,7 @@ void GeckoChildProcessHost::LaunchAndroidService(
     const char* type, const std::vector<std::string>& argv,
     const base::file_handle_mapping_vector& fds_to_remap,
     ProcessHandle* process_handle) {
-  MOZ_ASSERT((fds_to_remap.size() > 0) && (fds_to_remap.size() <= 3));
+  MOZ_RELEASE_ASSERT((2 <= fds_to_remap.size()) && (fds_to_remap.size() <= 4));
   JNIEnv* const env = mozilla::jni::GetEnvForThread();
   MOZ_ASSERT(env);
 
@@ -1164,23 +1166,26 @@ void GeckoChildProcessHost::LaunchAndroidService(
   for (int ix = 0; ix < argvSize; ix++) {
     jargs->SetElement(ix, jni::StringParam(argv[ix].c_str(), env));
   }
-  base::file_handle_mapping_vector::const_iterator it = fds_to_remap.begin();
-  int32_t ipcFd = it->first;
-  it++;
-  // If the Crash Reporter is disabled, there will not be a second file
-  // descriptor.
+
+  // XXX: this processing depends entirely on the internals of
+  // ContentParent::LaunchSubprocess()

+    crashFd = fds_to_remap[2].first;
+    crashAnnotationFd = fds_to_remap[3].first;
   }
-  int32_t handle = java::GeckoProcessManager::Start(type, jargs, ipcFd, crashFd,
-                                                    crashAnnotationFd);
+
+  int32_t handle = java::GeckoProcessManager::Start(type, jargs, prefsFd, ipcFd,
+                                                    crashFd, crashAnnotationFd);
 
   if (process_handle) {
     *process_handle = handle;

index 631c42066bc7..0345e221abcc 100644
--- ipc/glue/GeckoChildProcessHost.h
+++ ipc/glue/GeckoChildProcessHost.h
@@ -94,6 +94,16 @@ class GeckoChildProcessHost : public ChildProcessHost 
   task_t GetChildTask() { return mChildTask; }
 #endif
 
+#ifdef XP_WIN

index 330ed4a09b54..b884591c9271 100644
--- modules/libpref/Preferences.cpp
+++ modules/libpref/Preferences.cpp
@@ -2637,7 +2637,7 @@ class AddPreferencesMemoryReporterRunnable : public Ru
 
 }  // namespace
 
-// A list of prefs sent early from the parent, via the command line.
+// A list of prefs sent early from the parent, via shared memory.
 static InfallibleTArray<dom::Pref>* gEarlyDomPrefs;
 
 /* static */ already_AddRefed<Preferences>
@@ -2782,12 +2782,123 @@ Preferences::~Preferences() {
 NS_IMPL_ISUPPORTS(Preferences, nsIPrefService, nsIObserver, nsIPrefBranch,
                   nsISupportsWeakReference)
 
-/* static */ void Preferences::SetEarlyPreferences(
-    const nsTArray<dom::Pref>* aDomPrefs) {
+/* static */ void Preferences::SerializeEarlyPreferences(nsCString& aStr) {
+{
+  MOZ_RELEASE_ASSERT(InitStaticMembers());
+
+  nsAutoCStringN<256> boolPrefs, intPrefs, stringPrefs;

+    switch (pref->Type()) {
+      case PrefType::Bool:
+        boolPrefs.Append(
+            nsPrintfCString("%u:%d|", i, Preferences::GetBool(prefName)));
+        break;
+      case PrefType::Int:
+        intPrefs.Append(
+            nsPrintfCString("%u:%d|", i, Preferences::GetInt(prefName)));
+        break;
+      case PrefType::String: {
+        nsAutoCString value;
+        Preferences::GetCString(prefName, value);
+        stringPrefs.Append(
+            nsPrintfCString("%u:%d;%s|", i, value.Length(), value.get()));
+      } break;
+      case PrefType::None:
+        break;

+  aStr.Append('\0');
+}
+
+/* static */ void Preferences::DeserializeEarlyPreferences(char* aStr,
+                                                           size_t aStrLen) {
 {
   MOZ_ASSERT(!XRE_IsParentProcess());
 
-  gEarlyDomPrefs = new InfallibleTArray<dom::Pref>(mozilla::Move(*aDomPrefs));
+  MOZ_ASSERT(!gEarlyDomPrefs);
+  gEarlyDomPrefs = new InfallibleTArray<dom::Pref>();
 
+  char* p = aStr;
+
+  // XXX: we assume these pref values are default values, which may not be

+    MOZ_ASSERT(p[0] == '|');
+    p++;
+    dom::Pref pref(nsCString(dom::ContentPrefs::GetEarlyPref(index)),
+                   /* isLocked */ false, value, dom::MaybePrefValue());
+                   value,
+                   dom::MaybePrefValue());
+    gEarlyDomPrefs->AppendElement(pref);
+  }
+  p++;

+    MOZ_ASSERT(p[0] == ':');
+    p++;
+    dom::MaybePrefValue value(
+        dom::PrefValue(static_cast<int32_t>(strtol(p, &p, 10))));
+    MOZ_ASSERT(p[0] == '|');
+    p++;
+    dom::Pref pref(nsCString(dom::ContentPrefs::GetEarlyPref(index)),
+                   /* isLocked */ false, value, dom::MaybePrefValue());
+                   value,
+                   dom::MaybePrefValue());
+    gEarlyDomPrefs->AppendElement(pref);
+  }
+  p++;

+    p++;
+    dom::MaybePrefValue value(dom::PrefValue(nsCString(p, length)));
+    dom::Pref pref(nsCString(dom::ContentPrefs::GetEarlyPref(index)),
+                   /* isLocked */ false, value, dom::MaybePrefValue());
+                   value,
+                   dom::MaybePrefValue());
+    gEarlyDomPrefs->AppendElement(pref);
+    p += length + 1;
+    MOZ_ASSERT(*(p - 1) == '|');

+  // We finished parsing on a '\0'. That should be the last char in the shared
+  // memory.
+  MOZ_ASSERT(aStr + aStrLen - 1 == p);
+
 #ifdef DEBUG
   MOZ_ASSERT(gPhase == ContentProcessPhase::eNoPrefsSet);
   gPhase = ContentProcessPhase::eEarlyPrefsSet;
@@ -3894,14 +4005,6 @@ static nsresult pref_ReadPrefFromJar(nsZipArchive* aJa
 }
 
   Pref* pref = pref_HashTableLookup(aPrefName);
   return pref && pref->HasUserValue();
-}
-
-/* static */ bool Preferences::MustSendToContentProcesses(
-    const char* aPrefName) {
-  NS_ENSURE_TRUE(InitStaticMembers(), false);
-
-  Pref* pref = pref_HashTableLookup(aPrefName);
-  return pref && pref->MustSendToContentProcesses();
 }
 
 /* static */ int32_t Preferences::GetType(const char* aPrefName) {
 Preferences::GetType(const char* aPrefName)
 {
diff --git modules/libpref/Preferences.h modules/libpref/Preferences.h
index 1cb825ecbfe5..c149db62b525 100644
--- modules/libpref/Preferences.h

+#endif
+
 // Keep this in sync with PrefType in parser/src/lib.rs.
 enum class PrefValueKind : uint8_t { Default, User };
 
@@ -191,9 +196,6 @@ class Preferences final : public nsIPrefService,
   // Whether the pref has a user value or not.
   static bool HasUserValue(const char* aPref);
 

   // Adds/Removes the observer for the root pref branch. See nsIPrefBranch.idl
   // for details.
   static nsresult AddStrongObserver(nsIObserver* aObserver, const char* aPref);
@@ -277,11 +279,12 @@ class Preferences final : public nsIPrefService,
 
   // When a content process is created these methods are used to pass prefs in
   // bulk from the parent process. "Early" preferences are ones that are needed

index 5f1ef55b605e..b57192488725 100644
--- mozglue/android/APKOpen.cpp
+++ mozglue/android/APKOpen.cpp
@@ -378,7 +378,8 @@ static void FreeArgv(char** argv, int argc) {
 }
 
 extern "C" APKOPEN_EXPORT void MOZ_JNICALL
 Java_org_mozilla_gecko_mozglue_GeckoLoader_nativeRun(JNIEnv* jenv, jclass jc,
                                                      jobjectArray jargs,
-                                                     int ipcFd, int crashFd,
+                                                     int prefsFd, int ipcFd,
+                                                     int crashFd,
                                                      int crashAnnotationFd) {
   int argc = 0;
   char** argv = CreateArgvFromObjectArray(jenv, jargs, &argc);
@@ -393,7 +394,8 @@ Java_org_mozilla_gecko_mozglue_GeckoLoader_nativeRun(J
     gBootstrap->GeckoStart(jenv, argv, argc, sAppData);
     ElfLoader::Singleton.ExpectShutdown(true);
   } else {
-    gBootstrap->XRE_SetAndroidChildFds(jenv, ipcFd, crashFd, crashAnnotationFd);
+    gBootstrap->XRE_SetAndroidChildFds(jenv, prefsFd, ipcFd, crashFd,
+                                       crashAnnotationFd);
     gBootstrap->XRE_SetProcessType(argv[argc - 1]);
 
     XREChildData childData;

index 5688519822a9..7e857969a4fb 100644
--- toolkit/xre/Bootstrap.cpp
+++ toolkit/xre/Bootstrap.cpp
@@ -71,9 +71,11 @@ class BootstrapImpl final : public Bootstrap {
     ::GeckoStart(aEnv, argv, argc, aAppData);
   }
 
-  virtual void XRE_SetAndroidChildFds(JNIEnv* aEnv, int aIPCFd, int aCrashFd,
+  virtual void XRE_SetAndroidChildFds(JNIEnv* aEnv, int aPrefsFd, int aIPCFd,
+                                      int aCrashFd,
                                       int aCrashAnnotationFd) override {
-    ::XRE_SetAndroidChildFds(aEnv, aIPCFd, aCrashFd, aCrashAnnotationFd);
+    ::XRE_SetAndroidChildFds(aEnv, aPrefsFd, aIPCFd, aCrashFd,
+                             aCrashAnnotationFd);
   }
 #endif
 

index 686d0a38e324..77adcef80e1f 100644
--- toolkit/xre/Bootstrap.h
+++ toolkit/xre/Bootstrap.h
@@ -112,8 +112,8 @@ class Bootstrap {
   virtual void GeckoStart(JNIEnv* aEnv, char** argv, int argc,
                           const StaticXREAppData& aAppData) = 0;
 
-  virtual void XRE_SetAndroidChildFds(JNIEnv* aEnv, int aIPCFd, int aCrashFd,
-                                      int aCrashAnnotationFd) = 0;
+  virtual void XRE_SetAndroidChildFds(JNIEnv* aEnv, int aPrefsFd, int aIPCFd,
+                                      int aCrashFd, int aCrashAnnotationFd) = 0;
 #endif
 
 #ifdef LIBFUZZER

index 53bd2bc2eb47..83184e97ba92 100644
--- toolkit/xre/nsEmbedFunctions.cpp
+++ toolkit/xre/nsEmbedFunctions.cpp
@@ -226,9 +226,10 @@ GeckoProcessType sChildProcessType = GeckoProcessType_
 }  // namespace mozilla
 
 #if defined(MOZ_WIDGET_ANDROID)
-void XRE_SetAndroidChildFds(JNIEnv* env, int ipcFd, int crashFd,
+void XRE_SetAndroidChildFds(JNIEnv* env, int prefsFd, int ipcFd, int crashFd,
                             int crashAnnotationFd) {
 {
   mozilla::jni::SetGeckoThreadEnv(env);
+  mozilla::dom::SetPrefsFd(prefsFd);
   IPC::Channel::SetClientChannelFd(ipcFd);

index 94f6daf864c9..d6ac10d51d76 100644
--- xpcom/build/nsXULAppAPI.h
+++ xpcom/build/nsXULAppAPI.h
@@ -378,7 +378,8 @@ XRE_API(const char*, XRE_ChildProcessTypeToString,
 
 #if defined(MOZ_WIDGET_ANDROID)
 XRE_API(void, XRE_SetAndroidChildFds,
-        (JNIEnv * env, int ipcFd, int crashFd, int crashAnnotationFd))
+        (JNIEnv * env, int prefsFd, int ipcFd, int crashFd,
+         int crashAnnotationFd))
 #endif  // defined(MOZ_WIDGET_ANDROID)
 
 XRE_API(void, XRE_SetProcessType, (const char* aProcessTypeString))

Lines 21-39 index e763a9d68dc17..8a6d50b6a7845 100644 Link Here

(-)b/mail/thunderbird/files/patch-bug1442583 (-9 / +13 lines)
21		21
22	#include "gc/Memory.h"	22	#include "gc/Memory.h"
23	+#ifdef JS_CODEGEN_ARM64	23	+#ifdef JS_CODEGEN_ARM64
24	+# include "jit/arm64/vixl/Cpu-vixl.h"	24	+#include "jit/arm64/vixl/Cpu-vixl.h"
25	+#endif	25	+#endif
26	#include "threading/LockGuard.h"	26	#include "threading/LockGuard.h"
27	#include "threading/Mutex.h"	27	#include "threading/Mutex.h"
28	#include "util/Windows.h"	28	#include "util/Windows.h"
29	@@ -621,6 +624,10 @@ js::jit::DeallocateExecutableMemory(void* addr, size_t bytes)	29	@@ -574,7 +577,13 @@ void js::jit::DeallocateExecutableMemory(void* addr, s
30	bool	30	execMemory.deallocate(addr, bytes, /* decommit = */ true);
31	js::jit::InitProcessExecutableMemory()	31	}
32	{	32
		33	-bool js::jit::InitProcessExecutableMemory() { return execMemory.init(); }
		34	+bool js::jit::InitProcessExecutableMemory() {
33	+#ifdef JS_CODEGEN_ARM64	35	+#ifdef JS_CODEGEN_ARM64
34	+ // Initialize instruction cache flushing.	36	+ // Initialize instruction cache flushing.
35	+ vixl::CPU::SetUp();	37	+ vixl::CPU::SetUp();
36	+#endif	38	+#endif
37	return execMemory.init();	39	+ return execMemory.init();
38	}	40	+}
		41
		42	void js::jit::ReleaseProcessExecutableMemory() { execMemory.release(); }
39		43




index 7061cbfd93ebb..190442f7afa0a 100644
--- js/src/jit/arm64/MacroAssembler-arm64-inl.h
+++ js/src/jit/arm64/MacroAssembler-arm64-inl.h
@@ -268,6 +268,7 @@ void MacroAssembler::add64(Imm64 imm, Register64 dest)
 CodeOffset MacroAssembler::sub32FromStackPtrWithPatch(Register dest) {
   vixl::UseScratchRegisterScope temps(this);
   const ARMRegister scratch = temps.AcquireX();
+  AutoForbidPools afp(this, /* max number of instructions in scope = */ 3);
   CodeOffset offs = CodeOffset(currentOffset());
   movz(scratch, 0, 0);
   movk(scratch, 0, 16);
diff --git js/src/jit/arm64/MacroAssembler-arm64.cpp js/src/jit/arm64/MacroAssembler-arm64.cpp
index 7b599b7e9d610..4e8fdb6a67019 100644
--- js/src/jit/arm64/MacroAssembler-arm64.cpp
+++ js/src/jit/arm64/MacroAssembler-arm64.cpp
@@ -666,6 +666,7 @@ void MacroAssembler::patchNearJumpToNop(uint8_t* jump)
 }
 
 CodeOffset MacroAssembler::nopPatchableToCall(const wasm::CallSiteDesc& desc) {
+  AutoForbidPools afp(this, /* max number of instructions in scope = */ 1);
   CodeOffset offset(currentOffset());
   Nop();
   append(desc, CodeOffset(currentOffset()));
@@ -1002,6 +1003,7 @@ void MacroAssembler::comment(const char* msg) { Assemb
 // wasm support
 
 CodeOffset MacroAssembler::wasmTrapInstruction() {
+  AutoForbidPools afp(this, /* max number of instructions in scope = */ 1);
   CodeOffset offs(currentOffset());
   Unreachable();
   return offs;




index 4ea64b1225d00..a212de0ec2f45 100644
--- js/src/jit/arm64/MacroAssembler-arm64.cpp
+++ js/src/jit/arm64/MacroAssembler-arm64.cpp
@@ -249,8 +249,9 @@ void MacroAssemblerCompat::profilerEnterFrame(Register
 }
 
 void MacroAssemblerCompat::breakpoint() {
-  static int code = 0xA77;
-  Brk((code++) & 0xffff);
+  // Note, other payloads are possible, but GDB is known to misinterpret them
+  // sometimes and iloop on the breakpoint instead of stopping properly.
+  Brk(0);
 }
 
 // Either `any` is valid or `sixtyfour` is valid.  Return a 32-bit ARMRegister




index 134bf7f2e703a..3c3687fea1d5a 100644
--- dom/fetch/FetchConsumer.cpp
+++ dom/fetch/FetchConsumer.cpp
@@ -560,7 +560,7 @@ void FetchBodyConsumer<Derived>::ContinueConsumeBody(n
   RefPtr<Promise> localPromise = mConsumePromise.forget();
 
   RefPtr<FetchBodyConsumer<Derived>> self = this;
   auto autoReleaseObject =
-      mozilla::MakeScopeExit([&] { self->ReleaseObject(); });
+      mozilla::MakeScopeExit([self] { self->ReleaseObject(); });
   });
 
   if (aShuttingDown) {
     // If shutting down, we don't want to resolve any promise.




commit 4425b9140c4c
Author: Martin Stransky <stransky@redhat.com>
Date:   Mon Oct 22 09:14:07 2018 +0000

    Bug 1500850 - [Wayland] Add missing dbus header dbus-glib-lowlevel.h. r=jhorak, a=RyanVM
    
    Differential Revision: https://phabricator.services.mozilla.com/D9365
    
    --HG--
    extra : source : 5203edd6ea29e4b73681674d2a5268dd6a310102
---
 widget/xremoteclient/DBusRemoteClient.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git widget/xremoteclient/DBusRemoteClient.cpp widget/xremoteclient/DBusRemoteClient.cpp
index ba5bda06201d..b2f03dccc133 100644
--- widget/xremoteclient/DBusRemoteClient.cpp
+++ widget/xremoteclient/DBusRemoteClient.cpp
@@ -13,6 +13,7 @@
 #include "nsPrintfCString.h"
 
 #include <dlfcn.h>
+#include <dbus/dbus-glib-lowlevel.h>
 
 using mozilla::LogLevel;
 static mozilla::LazyLogModule sRemoteLm("DBusRemoteClient");




index f61ab07b81e2..af1ef9cf4c7e 100644
--- dom/ipc/ContentChild.cpp
+++ dom/ipc/ContentChild.cpp
@@ -1094,8 +1094,6 @@ void ContentChild::InitGraphicsDeviceData(const Conten
 void ContentChild::InitXPCOM(
     const XPCOMInitData& aXPCOMInit,
     const mozilla::dom::ipc::StructuredCloneData& aInitialData) {
-  Preferences::SetLatePreferences(&aXPCOMInit.prefs());
-
   // Do this as early as possible to get the parent process to initialize the

 #include "mozilla/Sprintf.h"
 
 #ifdef MOZ_WEBRTC
@@ -1863,7 +1862,7 @@ bool ContentParent::LaunchSubprocess(
 
   // Serialize the early prefs.
   nsAutoCStringN<1024> prefs;

 
   // Set up the shared memory.
   base::SharedMemory shm;
@@ -2034,7 +2033,6 @@ void ContentParent::InitInternal(ProcessPriority aInit
 
   XPCOMInitData xpcomInit;
 

index 808b797d9bee..000000000000
--- dom/ipc/ContentPrefs.cpp
+++ /dev/null
@@ -1,360 +0,0 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* vim: set ts=8 sts=2 et sw=2 tw=80: */
-/* This Source Code Form is subject to the terms of the Mozilla Public

- ******************************************************************************/
-
-const char* mozilla::dom::ContentPrefs::gEarlyPrefs[] = {
-    "accessibility.monoaudio.enable",
-    "accessibility.mouse_focuses_formcontrol",
-    "accessibility.tabfocus_applies_to_xul",
-    "app.update.channel",
-    "browser.autofocus",
-    "browser.dom.window.dump.enabled",
-    "browser.sessionhistory.max_entries",
-    "browser.sessionhistory.max_total_viewers",
-#if defined(NIGHTLY_BUILD) || defined(DEBUG)
-    "browser.startup.record",
-#endif
-#if defined(ANDROID)
-    "consoleservice.logcat",
-#endif
-    "content.cors.disable",
-    "content.cors.no_private_data",
-    "content.notify.backoffcount",
-    "content.notify.interval",
-    "content.notify.ontimer",
-    "content.sink.enable_perf_mode",
-    "content.sink.event_probe_rate",
-    "content.sink.initial_perf_time",
-    "content.sink.interactive_deflect_count",
-    "content.sink.interactive_parse_time",
-    "content.sink.interactive_time",
-    "content.sink.pending_event_mode",
-    "content.sink.perf_deflect_count",
-    "content.sink.perf_parse_time",
-    "device.storage.prompt.testing",
-    "device.storage.writable.name",
-    "devtools.enabled",
-    "dom.allow_XUL_XBL_for_file",
-    "dom.allow_cut_copy",
-    "dom.animations-api.core.enabled",
-    "dom.animations-api.element-animate.enabled",
-    "dom.animations-api.pending-member.enabled",
-    "dom.enable_frame_timing",
-    "dom.enable_performance",
-    "dom.enable_performance_navigation_timing",
-    "dom.enable_resource_timing",
-    "dom.event.handling-user-input-time-limit",
-    "dom.event.touch.coalescing.enabled",
-    "dom.forms.autocomplete.formautofill",
-    "dom.forms.inputmode",
-    "dom.input.skip_cursor_move_for_same_value_set",
-    "dom.ipc.processPriorityManager.backgroundGracePeriodMS",
-    "dom.ipc.processPriorityManager.backgroundPerceivableGracePeriodMS",
-    "dom.ipc.useNativeEventProcessing.content",
-    "dom.max_chrome_script_run_time",
-    "dom.max_ext_content_script_run_time",
-    "dom.max_script_run_time",
-    "dom.mozBrowserFramesEnabled",
-    "dom.performance.enable_notify_performance_timing",
-    "dom.performance.enable_user_timing_logging",
-    "dom.placeholder.show_on_focus",
-    "dom.requestIdleCallback.enabled",
-    "dom.script_loader.bytecode_cache.enabled",
-    "dom.script_loader.bytecode_cache.strategy",
-    "dom.storage.testing",
-    "dom.url.encode_decode_hash",
-    "dom.url.getters_decode_hash",
-    "dom.use_watchdog",
-    "dom.vibrator.enabled",
-    "dom.vibrator.max_vibrate_list_len",
-    "dom.vibrator.max_vibrate_ms",
-    "dom.webcomponents.customelements.enabled",
-    "dom.webcomponents.shadowdom.enabled",
-    "focusmanager.testmode",
-    "font.size.inflation.disabledInMasterProcess",
-    "font.size.inflation.emPerLine",
-    "font.size.inflation.forceEnabled",
-    "font.size.inflation.lineThreshold",
-    "font.size.inflation.mappingIntercept",
-    "font.size.inflation.maxRatio",
-    "font.size.inflation.minTwips",
-    "font.size.systemFontScale",
-    "full-screen-api.allow-trusted-requests-only",
-    "full-screen-api.enabled",
-    "full-screen-api.unprefix.enabled",
-#ifdef FUZZING
-    "fuzzing.enabled",
-#endif
-    "gfx.font_rendering.opentype_svg.enabled",
-    "hangmonitor.timeout",
-    "html5.flushtimer.initialdelay",
-    "html5.flushtimer.subsequentdelay",
-    "html5.offmainthread",
-    "intl.charset.fallback.tld",
-    "intl.charset.fallback.utf8_for_file",
-    "intl.ime.hack.on_ime_unaware_apps.fire_key_events_for_composition",
-    "javascript.enabled",
-    "javascript.options.array_prototype_values",
-    "javascript.options.asmjs",
-    "javascript.options.asyncstack",
-    "javascript.options.baselinejit",
-    "javascript.options.baselinejit.threshold",
-    "javascript.options.baselinejit.unsafe_eager_compilation",
-    "javascript.options.discardSystemSource",
-    "javascript.options.dump_stack_on_debuggee_would_run",
-    "javascript.options.gczeal",
-    "javascript.options.gczeal.frequency",
-    "javascript.options.ion",
-    "javascript.options.ion.offthread_compilation",
-    "javascript.options.ion.threshold",
-    "javascript.options.ion.unsafe_eager_compilation",
-    "javascript.options.jit.full_debug_checks",
-    "javascript.options.native_regexp",
-    "javascript.options.parallel_parsing",
-    "javascript.options.shared_memory",
-    "javascript.options.spectre.index_masking",
-    "javascript.options.spectre.jit_to_C++_calls",
-    "javascript.options.spectre.object_mitigations.barriers",
-    "javascript.options.spectre.object_mitigations.misc",
-    "javascript.options.spectre.string_mitigations",
-    "javascript.options.spectre.value_masking",
-    "javascript.options.streams",
-    "javascript.options.strict",
-    "javascript.options.strict.debug",
-    "javascript.options.throw_on_asmjs_validation_failure",
-    "javascript.options.throw_on_debuggee_would_run",
-    "javascript.options.wasm",
-    "javascript.options.wasm_baselinejit",
-    "javascript.options.wasm_ionjit",
-    "javascript.options.werror",
-    "javascript.use_us_english_locale",
-    "jsloader.shareGlobal",
-    "layout.css.all-shorthand.enabled",
-    "layout.css.background-blend-mode.enabled",
-    "layout.css.box-decoration-break.enabled",
-    "layout.css.color-adjust.enabled",
-    "layout.css.column-span.enabled",
-    "layout.css.contain.enabled",
-    "layout.css.control-characters.visible",
-    "layout.css.emulate-moz-box-with-flex",
-    "layout.css.expensive-style-struct-assertions.enabled",
-    "layout.css.float-logical-values.enabled",
-    "layout.css.font-display.enabled",
-    "layout.css.font-variations.enabled",
-    "layout.css.frames-timing.enabled",
-    "layout.css.getBoxQuads.enabled",
-    "layout.css.grid-template-subgrid-value.enabled",
-    "layout.css.grid.enabled",
-    "layout.css.image-orientation.enabled",
-    "layout.css.individual-transform.enabled",
-    "layout.css.initial-letter.enabled",
-    "layout.css.isolation.enabled",
-    "layout.css.mix-blend-mode.enabled",
-    "layout.css.moz-document.content.enabled",
-    "layout.css.osx-font-smoothing.enabled",
-    "layout.css.overflow-clip-box.enabled",
-    "layout.css.overscroll-behavior.enabled",
-    "layout.css.prefixes.animations",
-    "layout.css.prefixes.border-image",
-    "layout.css.prefixes.box-sizing",
-    "layout.css.prefixes.device-pixel-ratio-webkit",
-    "layout.css.prefixes.font-features",
-    "layout.css.prefixes.gradients",
-    "layout.css.prefixes.transforms",
-    "layout.css.prefixes.transitions",
-    "layout.css.prefixes.webkit",
-    "layout.css.scope-pseudo.enabled",
-    "layout.css.scoped-style.enabled",
-    "layout.css.scroll-behavior.property-enabled",
-    "layout.css.scroll-snap.enabled",
-#ifdef MOZ_STYLO
-    "layout.css.servo.chrome.enabled",
-    "layout.css.servo.enabled",
-#endif
-    "layout.css.shape-outside.enabled",
-    "layout.css.text-align-unsafe-value.enabled",
-    "layout.css.text-combine-upright-digits.enabled",
-    "layout.css.text-combine-upright.enabled",
-    "layout.css.text-justify.enabled",
-    "layout.css.touch_action.enabled",
-    "layout.css.visited_links_enabled",
-    "layout.idle_period.required_quiescent_frames",
-    "layout.idle_period.time_limit",
-    "layout.interruptible-reflow.enabled",
-    "mathml.disabled",
-    "media.audio-max-decode-error",
-    "media.cache_readahead_limit",
-    "media.cache_resume_threshold",
-    "media.cache_size",
-    "media.clearkey.persistent-license.enabled",
-    "media.cubeb.backend",
-    "media.cubeb.sandbox",
-    "media.cubeb_latency_msg_frames",
-    "media.cubeb_latency_playback_ms",
-    "media.decoder-doctor.wmf-disabled-is-failure",
-    "media.decoder.recycle.enabled",
-    "media.decoder.skip-to-next-key-frame.enabled",
-    "media.dormant-on-pause-timeout-ms",
-    "media.eme.audio.blank",
-    "media.eme.chromium-api.video-shmems",
-    "media.eme.enabled",
-    "media.eme.video.blank",
-    "media.ffmpeg.enabled",
-    "media.ffmpeg.low-latency.enabled",
-    "media.ffvpx.enabled",
-    "media.ffvpx.low-latency.enabled",
-    "media.flac.enabled",
-    "media.forcestereo.enabled",
-    "media.gmp.decoder.enabled",
-    "media.gmp.insecure.allow",
-    "media.gpu-process-decoder",
-    "media.hls.enabled",
-    "media.libavcodec.allow-obsolete",
-    "media.memory_cache_max_size",
-    "media.memory_caches_combined_limit_kb",
-    "media.memory_caches_combined_limit_pc_sysmem",
-    "media.mp4.enabled",
-    "media.navigator.mediadatadecoder_enabled",
-    "media.ogg.enabled",
-    "media.ogg.flac.enabled",
-    "media.playback.warnings-as-errors",
-    "media.playback.warnings-as-errors.stagefright-vs-rust",
-    "media.resampling.enabled",
-    "media.resume-bkgnd-video-on-tabhover",
-    "media.ruin-av-sync.enabled",
-    "media.rust.mp4parser",
-    "media.rust.test_mode",
-    "media.seamless-looping",
-    "media.suspend-bkgnd-video.delay-ms",
-    "media.suspend-bkgnd-video.enabled",
-    "media.use-blank-decoder",
-    "media.video-max-decode-error",
-    "media.video_stats.enabled",
-    "media.videocontrols.lock-video-orientation",
-    "media.volume_scale",
-    "media.webspeech.recognition.enable",
-    "media.webspeech.recognition.force_enable",
-    "media.webspeech.synth.force_global_queue",
-    "media.webspeech.test.enable",
-    "media.webspeech.test.fake_fsm_events",
-    "media.webspeech.test.fake_recognition_service",
-    "media.wmf.allow-unsupported-resolutions",
-    "media.wmf.enabled",
-    "media.wmf.skip-blacklist",
-    "media.wmf.vp9.enabled",
-    "network.IDN.blacklist_chars",
-    "network.IDN.restriction_profile",
-    "network.IDN.use_whitelist",
-    "network.IDN_show_punycode",
-    "network.buffer.cache.count",
-    "network.buffer.cache.size",
-    "network.captive-portal-service.enabled",
-    "network.cookie.cookieBehavior",
-    "network.cookie.lifetimePolicy",
-    "network.dns.disablePrefetch",
-    "network.dns.disablePrefetchFromHTTPS",
-    "network.file.disable_unc_paths",
-    "network.file.path_blacklist",
-    "network.http.tailing.enabled",
-    "network.jar.block-remote-files",
-    "network.loadinfo.skip_type_assertion",
-    "network.notify.changed",
-    "network.offline-mirrors-connectivity",
-    "network.protocol-handler.external.jar",
-    "network.proxy.type",
-    "network.security.ports.banned",
-    "network.security.ports.banned.override",
-    "network.standard-url.enable-rust",
-    "network.standard-url.max-length",
-    "network.standard-url.punycode-host",
-    "network.sts.max_time_for_events_between_two_polls",
-    "network.sts.max_time_for_pr_close_during_shutdown",
-    "network.tcp.keepalive.enabled",
-    "network.tcp.keepalive.idle_time",
-    "network.tcp.keepalive.probe_count",
-    "network.tcp.keepalive.retry_interval",
-    "network.tcp.sendbuffer",
-    "nglayout.debug.invalidation",
-    "privacy.donottrackheader.enabled",
-    "privacy.firstparty.isolate",
-    "privacy.firstparty.isolate.restrict_opener_access",
-    "privacy.reduceTimerPrecision",
-    "privacy.resistFingerprinting",
-    "privacy.resistFingerprinting.autoDeclineNoUserInputCanvasPrompts",
-    "privacy.resistFingerprinting.reduceTimerPrecision.jitter",
-    "privacy.resistFingerprinting.reduceTimerPrecision.microseconds",
-    "privacy.resistFingerprinting.target_video_res",
-    "privacy.resistFingerprinting.video_dropped_ratio",
-    "privacy.resistFingerprinting.video_frames_per_sec",
-    "privacy.spoof_english",
-    "privacy.trackingprotection.lower_network_priority",
-    "privacy.window.maxInnerHeight",
-    "privacy.window.maxInnerWidth",
-    "security.csp.enable",
-    "security.data_uri.block_toplevel_data_uri_navigations",
-    "security.data_uri.unique_opaque_origin",
-    "security.fileuri.strict_origin_policy",
-    "security.mixed_content.block_active_content",
-    "security.mixed_content.block_display_content",
-    "security.mixed_content.block_object_subrequest",
-    "security.mixed_content.hsts_priming_cache_timeout",
-    "security.mixed_content.send_hsts_priming",
-    "security.mixed_content.upgrade_display_content",
-    "security.mixed_content.use_hsts",
-    "security.sandbox.content.level",
-    "security.sandbox.content.tempDirSuffix",
-    "security.sandbox.logging.enabled",
-    "security.sandbox.mac.track.violations",
-    "security.sandbox.windows.log.stackTraceDepth",
-    "svg.disabled",
-    "svg.display-lists.hit-testing.enabled",
-    "svg.display-lists.painting.enabled",
-    "svg.new-getBBox.enabled",
-    "svg.path-caching.enabled",
-    "svg.transform-box.enabled",
-    "toolkit.asyncshutdown.crash_timeout",
-    "toolkit.asyncshutdown.log",
-    "toolkit.osfile.log",
-    "toolkit.osfile.log.redirect",
-    "toolkit.telemetry.enabled",
-    "toolkit.telemetry.idleTimeout",
-    "toolkit.telemetry.initDelay",
-    "toolkit.telemetry.log.dump",
-    "toolkit.telemetry.log.level",
-    "toolkit.telemetry.minSubsessionLength",
-    "toolkit.telemetry.scheduler.idleTickInterval",
-    "toolkit.telemetry.scheduler.tickInterval",
-    "toolkit.telemetry.testing.overridePreRelease",
-    "toolkit.telemetry.unified",
-    "ui.key.menuAccessKeyFocuses",
-    "ui.popup.disable_autohide",
-    "ui.use_activity_cursor",
-    "view_source.editor.external",
-    "zoom.maxPercent",
-    "zoom.minPercent"};
-
-const char** mozilla::dom::ContentPrefs::GetEarlyPrefs(size_t* aCount) {
-{
-  *aCount = ArrayLength(ContentPrefs::gEarlyPrefs);
-  return gEarlyPrefs;
-}
-
-const char* mozilla::dom::ContentPrefs::GetEarlyPref(size_t aIndex) {
-{
-  MOZ_ASSERT(aIndex < ArrayLength(ContentPrefs::gEarlyPrefs));
-  return gEarlyPrefs[aIndex];
-}

-namespace dom {
-
-class ContentPrefs {
- public:
-  static const char** GetEarlyPrefs(size_t* aCount);
-  static const char* GetEarlyPref(size_t aIndex);
-
- private:
-  static const char* gEarlyPrefs[];
-};
-
-}  // namespace dom
-}  // namespace mozilla
-
-#endif
diff --git dom/ipc/ContentProcess.cpp dom/ipc/ContentProcess.cpp

 #include "base/shared_memory.h"
 #include "mozilla/Preferences.h"
 #include "mozilla/Scheduler.h"
@@ -212,8 +211,8 @@ bool ContentProcess::Init(int aArgc, char* aArgv[]) {
     NS_ERROR("failed to map shared memory in the child");
     return false;
   }

+                                      prefsLen);
 
   Scheduler::SetPrefs(schedulerPrefs);
   mContent.Init(IOThreadChild::message_loop(), ParentPid(),
diff --git dom/ipc/PContent.ipdl dom/ipc/PContent.ipdl
index 5d077976569a..fb967ffc53a9 100644
--- dom/ipc/PContent.ipdl

index dce44bf61b35..80288336a08b 100644
--- layout/style/nsCSSProps.h
+++ layout/style/nsCSSProps.h
@@ -640,7 +640,7 @@ class nsCSSProps {
     // In the child process, assert that we're not trying to parse stylesheets
     // before we've gotten all our prefs.
     MOZ_ASSERT_IF(!XRE_IsParentProcess(),

 #include "mozilla/dom/PContent.h"
 #include "mozilla/HashFunctions.h"
 #include "mozilla/Logging.h"
@@ -129,6 +128,25 @@ enum class PrefType : uint8_t {
   Bool = 3,
 };
 
+// This is used for pref names and string pref values. We encode the string
+// length, then a '/', then the string chars. This encoding means there are no
+// special chars that are forbidden or require escaping.
+static void SerializeAndAppendString(const char* aChars, nsCString& aStr) {
+SerializeAndAppendString(const char* aChars, nsCString& aStr)
+{
+  aStr.AppendInt(uint32_t(strlen(aChars)));
+  aStr.Append('/');
+  aStr.Append(aChars);
+}
+
+static char* DeserializeString(char* aChars, nsCString& aStr) {
+DeserializeString(char* aChars, nsCString& aStr)
+{
+  char* p = aChars;
+  uint32_t length = strtol(p, &p, 10);
+  MOZ_ASSERT(p[0] == '/');
+  p++;  // move past the '/'
+  aStr.Assign(p, length);
+  p += length;  // move past the string itself
+  return p;
+}
+
 // Keep this in sync with PrefValue in prefs_parser/src/lib.rs.
 union PrefValue {
   const char* mStringVal;
@@ -215,6 +233,61 @@ union PrefValue {
         MOZ_CRASH();
     }
   }
+
+  void SerializeAndAppend(PrefType aType, nsCString& aStr) {
+  {
+    switch (aType) {
+      case PrefType::Bool:
+        aStr.Append(mBoolVal ? 'T' : 'F');

+    }
+  }
+
+  static char* Deserialize(PrefType aType, char* aStr,
+                           dom::MaybePrefValue* aDomValue) {
+                           dom::MaybePrefValue* aDomValue)
+  {
+    char* p = aStr;
+
+    switch (aType) {

 };
 
 #ifdef DEBUG
@@ -656,6 +729,157 @@ class Pref {
     return false;
   }
 

+  // - "S-:10/my.string2:5/1.234:\n"
+  // - "S-:10/my.string3::7/string!\n"
+
+  void SerializeAndAppend(nsCString& aStr) {
+  {
+    switch (Type()) {
+      case PrefType::Bool:
+        aStr.Append('B');

+    aStr.Append('\n');
+  }
+
+  static char* Deserialize(char* aStr, dom::Pref* aDomPref) {
+  {
+    char* p = aStr;
+
+    // The type.

+      NS_ERROR("bad pref type");
+      type = PrefType::None;
+    }
+    p++;  // move past the type char
+
+    // Locked?
+    bool isLocked;

+      NS_ERROR("bad pref locked status");
+      isLocked = false;
+    }
+    p++;  // move past the isLocked char
+
+    MOZ_ASSERT(*p == ':');
+    p++;  // move past the ':'
+
+    // The pref name.
+    nsCString name;
+    p = DeserializeString(p, name);
+
+    MOZ_ASSERT(*p == ':');
+    p++;  // move past the ':' preceding the default value
+
+    dom::MaybePrefValue maybeDefaultValue;
+    if (*p != ':') {

+    }
+
+    MOZ_ASSERT(*p == ':');
+    p++;  // move past the ':' between the default and user values
+
+    dom::MaybePrefValue maybeUserValue;
+    if (*p != '\n') {

+    }
+
+    MOZ_ASSERT(*p == '\n');
+    p++;  // move past the '\n' following the user value
+
+    *aDomPref = dom::Pref(name, isLocked, maybeDefaultValue, maybeUserValue);
+
+    return p;
+  }
+
   void AddSizeOfIncludingThis(MallocSizeOf aMallocSizeOf, PrefsSizes& aSizes) {
   {
     // Note: mName is allocated in gPrefNameArena, measured elsewhere.
     aSizes.mPrefValues += aMallocSizeOf(this);
@@ -817,57 +1041,17 @@ static PrefSaveData pref_savePrefs() {
 
 #ifdef DEBUG
 
-// For content processes, what prefs have been initialized?
-enum class ContentProcessPhase {
-{
-  eNoPrefsSet,
-  eEarlyPrefsSet,
-  eEarlyAndLatePrefsSet,

 // Note that this never changes in the parent process, and is only read in
 // content processes.
-static ContentProcessPhase gPhase = ContentProcessPhase::eNoPrefsSet;
+static bool gContentProcessPrefsAreInited = false;
 
-struct StringComparator {
-  const char* mPrefName;
-
-  explicit StringComparator(const char* aPrefName) : mPrefName(aPrefName) {}
-    : mPrefName(aPrefName)
-  {
-  }
-
-  int operator()(const char* aPrefName) const {
-  {
-    return strcmp(mPrefName, aPrefName);
-  }
-};
-
-static bool IsEarlyPref(const char* aPrefName) {
-IsEarlyPref(const char* aPrefName)
-{
-  size_t prefsLen;
-  size_t found;
-  const char** list = mozilla::dom::ContentPrefs::GetEarlyPrefs(&prefsLen);
-  return BinarySearchIf(list, 0, prefsLen, StringComparator(aPrefName), &found);
-}
-
 #endif  // DEBUG
 #endif // DEBUG
 
 static PrefEntry* pref_HashTableLookupInner(const char* aPrefName) {
 {
   MOZ_ASSERT(NS_IsMainThread() || mozilla::ServoStyleSet::IsInServoTraversal());
 
-#ifdef DEBUG

-      MOZ_CRASH_UNSAFE_PRINTF("accessing pref %s before early prefs are set",
-                              aPrefName);
-    }
+  MOZ_ASSERT_IF(!XRE_IsParentProcess(), gContentProcessPrefsAreInited);
 
-    if (gPhase == ContentProcessPhase::eEarlyPrefsSet &&
-        !IsEarlyPref(aPrefName)) {
-      // If you hit this crash, you have an early access of a non-early pref.
-      // Consider moving the access later or add the pref to the whitelist of
-      // early prefs in ContentPrefs.cpp and get review from a DOM peer.
-      MOZ_CRASH_UNSAFE_PRINTF(
-          "accessing non-early pref %s before late prefs are set", aPrefName);
-    }
-  }
-#endif
-
 
   return static_cast<PrefEntry*>(gHashTable->Search(aPrefName));
 }
@@ -2932,8 +3117,8 @@ public:
 
@@ -2637,8 +2821,8 @@ class AddPreferencesMemoryReporterRunnable : public Ru
 
 }  // namespace
 
-// A list of prefs sent early from the parent, via shared memory.
-static InfallibleTArray<dom::Pref>* gEarlyDomPrefs;
+// A list of changed prefs sent from the parent via shared memory.
+static InfallibleTArray<dom::Pref>* gChangedDomPrefs;
 
 /* static */ already_AddRefed<Preferences>
 Preferences::GetInstanceForService() {
@@ -2668,12 +2852,12 @@ Preferences::GetInstanceForService() {
   }
 
   if (!XRE_IsParentProcess()) {

 
   } else {
     // Check if there is a deployment configuration file. If so, set up the
@@ -2782,143 +2966,45 @@ Preferences::~Preferences() {
 NS_IMPL_ISUPPORTS(Preferences, nsIPrefService, nsIObserver, nsIPrefBranch,
                   nsISupportsWeakReference)
 
-/* static */ void Preferences::SerializeEarlyPreferences(nsCString& aStr) {
+/* static */ void Preferences::SerializePreferences(nsCString& aStr) {
+Preferences::SerializePreferences(nsCString& aStr)
 {
   MOZ_RELEASE_ASSERT(InitStaticMembers());
 
-  nsAutoCStringN<256> boolPrefs, intPrefs, stringPrefs;
-  size_t numEarlyPrefs;
-  dom::ContentPrefs::GetEarlyPrefs(&numEarlyPrefs);
+  aStr.Truncate();
 
-  for (unsigned int i = 0; i < numEarlyPrefs; i++) {
-    const char* prefName = dom::ContentPrefs::GetEarlyPref(i);
-    MOZ_ASSERT_IF(i > 0,

-    Pref* pref = pref_HashTableLookup(prefName);
-    if (!pref || !pref->MustSendToContentProcesses()) {
-      continue;
+  for (auto iter = gHashTable->Iter(); !iter.Done(); iter.Next()) {
+    Pref* pref = static_cast<PrefEntry*>(iter.Get())->mPref;
+    if (pref->MustSendToContentProcesses() && pref->HasAdvisablySizedValues()) {
+      pref->SerializeAndAppend(aStr);
     }
-
-    switch (pref->Type()) {
-      case PrefType::Bool:
-        boolPrefs.Append(
-            nsPrintfCString("%u:%d|", i, Preferences::GetBool(prefName)));
-        break;
-      case PrefType::Int:
-        intPrefs.Append(
-            nsPrintfCString("%u:%d|", i, Preferences::GetInt(prefName)));
-        break;
-      case PrefType::String: {
-        nsAutoCString value;
-        Preferences::GetCString(prefName, value);
-        stringPrefs.Append(
-            nsPrintfCString("%u:%d;%s|", i, value.Length(), value.get()));
-      } break;
-      case PrefType::None:
-        break;
-      default:
-        printf_stderr("preference type: %d\n", int(pref->Type()));
-        MOZ_CRASH();
-    }
+    Pref* pref = static_cast<PrefEntry*>(iter.Get())->mPref;
+    if (pref->MustSendToContentProcesses() && pref->HasAdvisablySizedValues()) {
+      pref->SerializeAndAppend(aStr);
     }
   }
 
-  aStr.Truncate();

   aStr.Append('\0');
 }
 
-/* static */ void Preferences::DeserializeEarlyPreferences(char* aStr,
-                                                           size_t aStrLen) {
+/* static */ void Preferences::DeserializePreferences(char* aStr,
+                                                      size_t aPrefsLen) {
   MOZ_ASSERT(!XRE_IsParentProcess());
 
-  MOZ_ASSERT(!gEarlyDomPrefs);

-    MOZ_ASSERT(p[0] == '|');
-    p++;
-    dom::Pref pref(nsCString(dom::ContentPrefs::GetEarlyPref(index)),
-                   /* isLocked */ false, value, dom::MaybePrefValue());
-                   value,
-                   dom::MaybePrefValue());
-    gEarlyDomPrefs->AppendElement(pref);
+  while (*p != '\0') {
+    dom::Pref pref;
+    p = Pref::Deserialize(p, &pref);
+    gChangedDomPrefs->AppendElement(pref);
   }
-  p++;
 
-  // Get the int prefs.
-  while (*p != '\n') {
-    int32_t index = strtol(p, &p, 10);
-    MOZ_ASSERT(p[0] == ':');
-    p++;
-    dom::MaybePrefValue value(
-        dom::PrefValue(static_cast<int32_t>(strtol(p, &p, 10))));
-    MOZ_ASSERT(p[0] == '|');
-    p++;
-    dom::Pref pref(nsCString(dom::ContentPrefs::GetEarlyPref(index)),
-                   /* isLocked */ false, value, dom::MaybePrefValue());
-                   value,
-                   dom::MaybePrefValue());
-    gEarlyDomPrefs->AppendElement(pref);
-  }
-  p++;

-    p++;
-    dom::MaybePrefValue value(dom::PrefValue(nsCString(p, length)));
-    dom::Pref pref(nsCString(dom::ContentPrefs::GetEarlyPref(index)),
-                   /* isLocked */ false, value, dom::MaybePrefValue());
-                   value,
-                   dom::MaybePrefValue());
-    gEarlyDomPrefs->AppendElement(pref);
-    p += length + 1;
-    MOZ_ASSERT(*(p - 1) == '|');

-  p++;
-
-  MOZ_ASSERT(*p == '\0');
-
+    dom::Pref pref;
+    p = Pref::Deserialize(p, &pref);
+    gChangedDomPrefs->AppendElement(pref);
+  }
 
   // We finished parsing on a '\0'. That should be the last char in the shared
-  // memory.
-  MOZ_ASSERT(aStr + aStrLen - 1 == p);
-
-#ifdef DEBUG
-  MOZ_ASSERT(gPhase == ContentProcessPhase::eNoPrefsSet);
-  gPhase = ContentProcessPhase::eEarlyPrefsSet;
-#endif
-}
-
-/* static */ void
-Preferences::SetLatePreferences(const nsTArray<dom::Pref>* aDomPrefs)
-{
-  MOZ_ASSERT(!XRE_IsParentProcess());
-
-  for (unsigned int i = 0; i < aDomPrefs->Length(); i++) {
-    Preferences::SetPreference(aDomPrefs->ElementAt(i));
-  }
+  // memory. (aPrefsLen includes the '\0'.)
+  MOZ_ASSERT(p == aStr + aPrefsLen - 1);
 
 #ifdef DEBUG
-  MOZ_ASSERT(gPhase == ContentProcessPhase::eNoPrefsSet);
-  gPhase = ContentProcessPhase::eEarlyPrefsSet;
+  MOZ_ASSERT(!gContentProcessPrefsAreInited);
+  gContentProcessPrefsAreInited = true;
 #endif
 }
 
-/* static */ void Preferences::SetLatePreferences(
-    const nsTArray<dom::Pref>* aDomPrefs) {
-  MOZ_ASSERT(!XRE_IsParentProcess());
-
-  for (unsigned int i = 0; i < aDomPrefs->Length(); i++) {
-    Preferences::SetPreference(aDomPrefs->ElementAt(i));
-  }
-
-#ifdef DEBUG
-  MOZ_ASSERT(gPhase == ContentProcessPhase::eEarlyPrefsSet);
-  gPhase = ContentProcessPhase::eEarlyAndLatePrefsSet;
-#endif
-}
-
 /* static */ void Preferences::InitializeUserPrefs() {
   MOZ_ASSERT(XRE_IsParentProcess());
   MOZ_ASSERT(!sPreferences->mCurrentFile, "Should only initialize prefs once");
@@ -3133,32 +3219,10 @@ Preferences::SavePrefFile(nsIFile* aFile) {
   }
 }
 
-void Preferences::GetPreferences(InfallibleTArray<dom::Pref>* aDomPrefs) {
-Preferences::GetPreferences(InfallibleTArray<dom::Pref>* aDomPrefs)
-{
-  MOZ_ASSERT(XRE_IsParentProcess());
-  MOZ_ASSERT(NS_IsMainThread());
-

-}
-
 #ifdef DEBUG
-bool Preferences::AreAllPrefsSetInContentProcess() {
+bool Preferences::ArePrefsInitedInContentProcess() {
+Preferences::ArePrefsInitedInContentProcess()
 {
   MOZ_ASSERT(!XRE_IsParentProcess());
-  return gPhase == ContentProcessPhase::eEarlyAndLatePrefsSet;
+  return gContentProcessPrefsAreInited;

index 0d976483daae..901425b5b663 100644
--- modules/libpref/Preferences.h
+++ modules/libpref/Preferences.h
@@ -277,15 +277,10 @@ class Preferences final : public nsIPrefService,
   static nsresult AddFloatVarCache(float* aVariable, const char* aPref,
                                    float aDefault = 0.0f);
 
-  // When a content process is created these methods are used to pass prefs in

 
   // When a single pref is changed in the parent process, these methods are
   // used to pass the update to content processes.
@@ -293,7 +288,7 @@ class Preferences final : public nsIPrefService,
   static void SetPreference(const dom::Pref& aPref);
 
 #ifdef DEBUG

Return to bug 235161

Lines 1-117 Link Here

(-)b/mail/thunderbird-i18n/distinfo (-117 / +117 lines)
1	TIMESTAMP = 1545056672	1	TIMESTAMP = 1548238106
2	SHA256 (xpi/thunderbird-i18n-60.4.0/ar.xpi) = 142ca421e384f1015446fe16073d21ce17f9306ee5c12fa050991943e1eb2198	2	SHA256 (xpi/thunderbird-i18n-60.5.0/ar.xpi) = 396a13fc6535a68fb1c0f754243b220f6bcfec2a186a5567b9369147ff3975d0
3	SIZE (xpi/thunderbird-i18n-60.4.0/ar.xpi) = 627179	3	SIZE (xpi/thunderbird-i18n-60.5.0/ar.xpi) = 627179
4	SHA256 (xpi/thunderbird-i18n-60.4.0/ast.xpi) = 555a5a195dddb34423f2f8516c5d2cc01e65364363b7611961af4ae018fc8f8a	4	SHA256 (xpi/thunderbird-i18n-60.5.0/ast.xpi) = 7563dbb731f7ea8f9a13dbec1f3a295fc89839fe484b6a2fda57be6eec5e2ce2
5	SIZE (xpi/thunderbird-i18n-60.4.0/ast.xpi) = 560866	5	SIZE (xpi/thunderbird-i18n-60.5.0/ast.xpi) = 559643
6	SHA256 (xpi/thunderbird-i18n-60.4.0/be.xpi) = 4388d058e653c4ffde2c83602a989fb57f4ce08276e7ea15fc5fb2e4703c525b	6	SHA256 (xpi/thunderbird-i18n-60.5.0/be.xpi) = a098bc35e3703e422ed548883216d534b8aef0ef47a446aa2acd6955b0fdac29
7	SIZE (xpi/thunderbird-i18n-60.4.0/be.xpi) = 659078	7	SIZE (xpi/thunderbird-i18n-60.5.0/be.xpi) = 659079
8	SHA256 (xpi/thunderbird-i18n-60.4.0/bg.xpi) = b014bfad34c97890852438e727b9cfe03cd28334c2c04b7e8244d15952a1ed18	8	SHA256 (xpi/thunderbird-i18n-60.5.0/bg.xpi) = 647d26bf395c3f885617f1a970ea67e1436ae266d0d9c8b089490e1e12afb1ac
9	SIZE (xpi/thunderbird-i18n-60.4.0/bg.xpi) = 665511	9	SIZE (xpi/thunderbird-i18n-60.5.0/bg.xpi) = 669318
10	SHA256 (xpi/thunderbird-i18n-60.4.0/br.xpi) = e73c7458d16b365db3b1274fd450259e5e44e50bf7350d14d412b45a719594f2	10	SHA256 (xpi/thunderbird-i18n-60.5.0/br.xpi) = 75c2b8578e5cc30035b9f6faad4feab1c43d83a1ed95ec45c9f4d8ab0bfd0c4b
11	SIZE (xpi/thunderbird-i18n-60.4.0/br.xpi) = 581592	11	SIZE (xpi/thunderbird-i18n-60.5.0/br.xpi) = 580371
12	SHA256 (xpi/thunderbird-i18n-60.4.0/ca.xpi) = 2969084ad12be6b86959e62918c2605186c0320053a113e33aff795c14574eb2	12	SHA256 (xpi/thunderbird-i18n-60.5.0/ca.xpi) = d9e87182418d6c89ba332a4e78078f81e9aac14fe0abce255b673122c0735f71
13	SIZE (xpi/thunderbird-i18n-60.4.0/ca.xpi) = 591970	13	SIZE (xpi/thunderbird-i18n-60.5.0/ca.xpi) = 591971
14	SHA256 (xpi/thunderbird-i18n-60.4.0/cs.xpi) = 62865800afe20ae855e911f1f3b6cfcfdd3a59ac7c099ae73d00764b2b085d27	14	SHA256 (xpi/thunderbird-i18n-60.5.0/cs.xpi) = 1dc5fd93a43b997adb28fc7ac24ba1a25e040d02ebd7a7978f8d6bce318f22e0
15	SIZE (xpi/thunderbird-i18n-60.4.0/cs.xpi) = 611200	15	SIZE (xpi/thunderbird-i18n-60.5.0/cs.xpi) = 611203
16	SHA256 (xpi/thunderbird-i18n-60.4.0/cy.xpi) = 0831ea66281fe261ed6e9fc91b30ac5fc7eb3a6ad7ddaf50545cbeee27f3e3ea	16	SHA256 (xpi/thunderbird-i18n-60.5.0/cy.xpi) = 6039174a0c761416ef49f0face6f88b4d79a49fa56c4bb473bb5cee750a3e208
17	SIZE (xpi/thunderbird-i18n-60.4.0/cy.xpi) = 582232	17	SIZE (xpi/thunderbird-i18n-60.5.0/cy.xpi) = 586038
18	SHA256 (xpi/thunderbird-i18n-60.4.0/da.xpi) = 3fa9fd37a51c99250f6239145bf267a290971e8a2d1683b117dce051997c9db2	18	SHA256 (xpi/thunderbird-i18n-60.5.0/da.xpi) = 4d515134ef90ff95523ff687088bebcacec23ed8fbe4f6d616b68ae0710f249a
19	SIZE (xpi/thunderbird-i18n-60.4.0/da.xpi) = 570806	19	SIZE (xpi/thunderbird-i18n-60.5.0/da.xpi) = 570807
20	SHA256 (xpi/thunderbird-i18n-60.4.0/de.xpi) = 7ec556ef2eb0b7b894548d51def1900cfdcf901d7e965dd70867bbe744d82297	20	SHA256 (xpi/thunderbird-i18n-60.5.0/de.xpi) = 1664dd8842851d29647dbb1fcfa4ecafb9501b5ab358302bcbacb77cab634559
21	SIZE (xpi/thunderbird-i18n-60.4.0/de.xpi) = 582574	21	SIZE (xpi/thunderbird-i18n-60.5.0/de.xpi) = 582575
22	SHA256 (xpi/thunderbird-i18n-60.4.0/dsb.xpi) = 8014269f81c9fb155609c2ad62514537c9bf2003443aa12f46165e6a801191fb	22	SHA256 (xpi/thunderbird-i18n-60.5.0/dsb.xpi) = e0f34880b25f7d1e361dc8b502405918a51d402d0c14370f863259d5609bd6d5
23	SIZE (xpi/thunderbird-i18n-60.4.0/dsb.xpi) = 613758	23	SIZE (xpi/thunderbird-i18n-60.5.0/dsb.xpi) = 617569
24	SHA256 (xpi/thunderbird-i18n-60.4.0/el.xpi) = ff45f720f86509532dc5f20086bc8909b50f34c9e5c7b56e750171735e1ddf46	24	SHA256 (xpi/thunderbird-i18n-60.5.0/el.xpi) = 510d046f3bb350a7d5847834d37fa3895209df1d2bf609dd826af594404e2e53
25	SIZE (xpi/thunderbird-i18n-60.4.0/el.xpi) = 691054	25	SIZE (xpi/thunderbird-i18n-60.5.0/el.xpi) = 694860
26	SHA256 (xpi/thunderbird-i18n-60.4.0/en-GB.xpi) = fbe50c8af4e3c6e454d760a0561ae59bc4190a4be40e6042408c0f8178c05680	26	SHA256 (xpi/thunderbird-i18n-60.5.0/en-GB.xpi) = e8fa1a81c509b42e630a0d51eef58b0f027b6a9a6b648cfabb407cd4e1ef5d15
27	SIZE (xpi/thunderbird-i18n-60.4.0/en-GB.xpi) = 550355	27	SIZE (xpi/thunderbird-i18n-60.5.0/en-GB.xpi) = 553895
28	SHA256 (xpi/thunderbird-i18n-60.4.0/en-US.xpi) = 76a86cc8331ef41d51a7586ce55858eb785919253df1aa737daa222293d36a21	28	SHA256 (xpi/thunderbird-i18n-60.5.0/en-US.xpi) = 6bd4ee055fa3c7dc6b2756220b4cc192ff4c2b1509662fc02bbbbd77d83276d1
29	SIZE (xpi/thunderbird-i18n-60.4.0/en-US.xpi) = 546990	29	SIZE (xpi/thunderbird-i18n-60.5.0/en-US.xpi) = 550807
30	SHA256 (xpi/thunderbird-i18n-60.4.0/es-AR.xpi) = 353ed430557068607bb5484eb5b40986ba01e1b963f6943c08a2b73b4ef09753	30	SHA256 (xpi/thunderbird-i18n-60.5.0/es-AR.xpi) = f31f9ddd6f2bd7f14b7ba660dca44a44d1ce63f6b696fcf3402de508a44fdf84
31	SIZE (xpi/thunderbird-i18n-60.4.0/es-AR.xpi) = 595047	31	SIZE (xpi/thunderbird-i18n-60.5.0/es-AR.xpi) = 595048
32	SHA256 (xpi/thunderbird-i18n-60.4.0/es-ES.xpi) = c1ccb289d140cf1d3485839ef6f6a8c5e3ac5d26a6345190a6856ae1e96b4e7e	32	SHA256 (xpi/thunderbird-i18n-60.5.0/es-ES.xpi) = f328d5a6e0e3c155da02acb7f22264941f85991b587c8c73554eba4bc0ec6658
33	SIZE (xpi/thunderbird-i18n-60.4.0/es-ES.xpi) = 492211	33	SIZE (xpi/thunderbird-i18n-60.5.0/es-ES.xpi) = 492211
34	SHA256 (xpi/thunderbird-i18n-60.4.0/et.xpi) = 4e4e5ef4101834eeef4fa6d7512d4317481e34b5d46f7d7f3764a1da999ccbfd	34	SHA256 (xpi/thunderbird-i18n-60.5.0/et.xpi) = 68329563dc48cc899007d846d1d1c78bc4690d54955e2e377ac204284aa3a4fc
35	SIZE (xpi/thunderbird-i18n-60.4.0/et.xpi) = 570866	35	SIZE (xpi/thunderbird-i18n-60.5.0/et.xpi) = 570867
36	SHA256 (xpi/thunderbird-i18n-60.4.0/eu.xpi) = 58a4160e6f4523afb8fe3af1c60af4350d771db21c109f94d1967d005cd5cb4f	36	SHA256 (xpi/thunderbird-i18n-60.5.0/eu.xpi) = 96c124681a083f7d44a1a27fe8cabd287b73152a0aba324ecc89c099f07ebe2b
37	SIZE (xpi/thunderbird-i18n-60.4.0/eu.xpi) = 577579	37	SIZE (xpi/thunderbird-i18n-60.5.0/eu.xpi) = 581384
38	SHA256 (xpi/thunderbird-i18n-60.4.0/fi.xpi) = 465802cc33b6354d78bfb3a9b7dfe36c58cd25f39e457c2794219704df0cc9cd	38	SHA256 (xpi/thunderbird-i18n-60.5.0/fi.xpi) = 2fbc3ebbeda7770dad1031056dd8568decc68e92041043c2fa537580d68be3b6
39	SIZE (xpi/thunderbird-i18n-60.4.0/fi.xpi) = 575754	39	SIZE (xpi/thunderbird-i18n-60.5.0/fi.xpi) = 575755
40	SHA256 (xpi/thunderbird-i18n-60.4.0/fr.xpi) = e23b17cf928ea9c463431d55fc6fca44187d60c6e3fba9979afdc6ad9948f526	40	SHA256 (xpi/thunderbird-i18n-60.5.0/fr.xpi) = 8b7e334e832ca60dc5f5972df0e070a0bc64aa3d21f9f4fd4a0a4fb09eab68a7
41	SIZE (xpi/thunderbird-i18n-60.4.0/fr.xpi) = 608465	41	SIZE (xpi/thunderbird-i18n-60.5.0/fr.xpi) = 608467
42	SHA256 (xpi/thunderbird-i18n-60.4.0/fy-NL.xpi) = c345f58742f45dd064f7f3f16c28ad50c8412660b32e9be2544ea60915ce7201	42	SHA256 (xpi/thunderbird-i18n-60.5.0/fy-NL.xpi) = d4e058e7449baaa68a87f6147081ab849134e3c487c5a46ebe874ee769f380f5
43	SIZE (xpi/thunderbird-i18n-60.4.0/fy-NL.xpi) = 590033	43	SIZE (xpi/thunderbird-i18n-60.5.0/fy-NL.xpi) = 593851
44	SHA256 (xpi/thunderbird-i18n-60.4.0/ga-IE.xpi) = 54d43b63f461be233e52badeef707686fc628ffb1a0b80a00832f7a87d53dea9	44	SHA256 (xpi/thunderbird-i18n-60.5.0/ga-IE.xpi) = 565c05ad8e1841c06571e9877d7e1dbdd0d3b2dcb7caecdd525cb24684e1ee7c
45	SIZE (xpi/thunderbird-i18n-60.4.0/ga-IE.xpi) = 603505	45	SIZE (xpi/thunderbird-i18n-60.5.0/ga-IE.xpi) = 603506
46	SHA256 (xpi/thunderbird-i18n-60.4.0/gd.xpi) = 3981da8cefc8c9849e1b6e8a8ef1a9b6eca19d0a916f940d6d2ec849191c0876	46	SHA256 (xpi/thunderbird-i18n-60.5.0/gd.xpi) = 6526a9b5e70600234a5bce76548fc8aa30bfabb4bab081991a0ec28f375e11ef
47	SIZE (xpi/thunderbird-i18n-60.4.0/gd.xpi) = 599260	47	SIZE (xpi/thunderbird-i18n-60.5.0/gd.xpi) = 599262
48	SHA256 (xpi/thunderbird-i18n-60.4.0/gl.xpi) = 7b71884496d24cc458f6aa580cab747e278c0f539cd7b6801a9a00ac38685ac2	48	SHA256 (xpi/thunderbird-i18n-60.5.0/gl.xpi) = bc3ae2e961b058a37e5977ec23d1a3636c1547f424b913680b01b312e31c2eb8
49	SIZE (xpi/thunderbird-i18n-60.4.0/gl.xpi) = 576547	49	SIZE (xpi/thunderbird-i18n-60.5.0/gl.xpi) = 580353
50	SHA256 (xpi/thunderbird-i18n-60.4.0/he.xpi) = bb29e592ad55635b225ae012591e7a4899095821b08c94e746e1dd5fcc466644	50	SHA256 (xpi/thunderbird-i18n-60.5.0/he.xpi) = fb735a51a263d7c12624b106b4b11afe55b4192b6c3752cd5a3de10f0ea4589b
51	SIZE (xpi/thunderbird-i18n-60.4.0/he.xpi) = 618364	51	SIZE (xpi/thunderbird-i18n-60.5.0/he.xpi) = 617144
52	SHA256 (xpi/thunderbird-i18n-60.4.0/hr.xpi) = 463a1cdffa202f988ff6ccb625b2d3ac1189fedc7b45133a6325607ce6a9fdd3	52	SHA256 (xpi/thunderbird-i18n-60.5.0/hr.xpi) = 46ab5cd64c814a6f8f930539e7757ec6d859c652c121be09f7d0984e15feb945
53	SIZE (xpi/thunderbird-i18n-60.4.0/hr.xpi) = 583460	53	SIZE (xpi/thunderbird-i18n-60.5.0/hr.xpi) = 582238
54	SHA256 (xpi/thunderbird-i18n-60.4.0/hsb.xpi) = cc4a5af252c25cd01addfa830c2c5e94f0cbcff23df38971ec1f558074463d1b	54	SHA256 (xpi/thunderbird-i18n-60.5.0/hsb.xpi) = 58dfbff6977c8c0144c4bf9a40d60915b248620c391c9a814ad53825ced57daf
55	SIZE (xpi/thunderbird-i18n-60.4.0/hsb.xpi) = 611322	55	SIZE (xpi/thunderbird-i18n-60.5.0/hsb.xpi) = 615132
56	SHA256 (xpi/thunderbird-i18n-60.4.0/hu.xpi) = b7844fb21de6f0869cd73f6fbcb1776d75b868d4eef5280eda07b244300a0db5	56	SHA256 (xpi/thunderbird-i18n-60.5.0/hu.xpi) = bb5ded142be6f62c0aeac040d7720fd12558ae5b2cf1c62cfb4de10a507cd97a
57	SIZE (xpi/thunderbird-i18n-60.4.0/hu.xpi) = 615345	57	SIZE (xpi/thunderbird-i18n-60.5.0/hu.xpi) = 615346
58	SHA256 (xpi/thunderbird-i18n-60.4.0/hy-AM.xpi) = 9b3329ad59e683df79f9e40559ac2e027e529bc8087fe90ec2348ad7718aa98b	58	SHA256 (xpi/thunderbird-i18n-60.5.0/hy-AM.xpi) = 0cae5f9e6e9ba0317a508335bfe430ae1efc4ec259c8c535373a6b1004801ab6
59	SIZE (xpi/thunderbird-i18n-60.4.0/hy-AM.xpi) = 649712	59	SIZE (xpi/thunderbird-i18n-60.5.0/hy-AM.xpi) = 653530
60	SHA256 (xpi/thunderbird-i18n-60.4.0/id.xpi) = e26ea9111f48d48485660191b95eb065712ecb1ddcf113f53cbc36972351368d	60	SHA256 (xpi/thunderbird-i18n-60.5.0/id.xpi) = f0b0710ba277f373bdfff2c161ca97300fc773c400f0505430ba9a2163a511e5
61	SIZE (xpi/thunderbird-i18n-60.4.0/id.xpi) = 568858	61	SIZE (xpi/thunderbird-i18n-60.5.0/id.xpi) = 568861
62	SHA256 (xpi/thunderbird-i18n-60.4.0/is.xpi) = adc63dd5fa09654d263f73a2bfe651be8483a1f58ec781320a8b0c9cfd387f90	62	SHA256 (xpi/thunderbird-i18n-60.5.0/is.xpi) = 40781ed3bbf9af0bbff1c2a144c101505192480e49f599d69af19aadc9cbee38
63	SIZE (xpi/thunderbird-i18n-60.4.0/is.xpi) = 579046	63	SIZE (xpi/thunderbird-i18n-60.5.0/is.xpi) = 579047
64	SHA256 (xpi/thunderbird-i18n-60.4.0/it.xpi) = 1b91e4cc527100aab2dee8c15cf6dcb630d37f5d0e8dce1005bf2e830f67b475	64	SHA256 (xpi/thunderbird-i18n-60.5.0/it.xpi) = 22803ad551daed6a6101b2c856a79386240a4fceeb4160e83dcde0c0e2944d06
65	SIZE (xpi/thunderbird-i18n-60.4.0/it.xpi) = 477499	65	SIZE (xpi/thunderbird-i18n-60.5.0/it.xpi) = 477500
66	SHA256 (xpi/thunderbird-i18n-60.4.0/ja.xpi) = 4ddd943c4b21a89ef2ffdeddec7c4b5aed94cb0adcb687b8cbf50c04f1c79848	66	SHA256 (xpi/thunderbird-i18n-60.5.0/ja.xpi) = 3bb74a119f76062428ba889723e6e878dabed760757a90bb247ec19d1ce58e0e
67	SIZE (xpi/thunderbird-i18n-60.4.0/ja.xpi) = 653343	67	SIZE (xpi/thunderbird-i18n-60.5.0/ja.xpi) = 653342
68	SHA256 (xpi/thunderbird-i18n-60.4.0/kab.xpi) = bb95a60fe9c8a78fdd5de483bd61a030c2bbaecc53a7d45ac1703887b463650e	68	SHA256 (xpi/thunderbird-i18n-60.5.0/kab.xpi) = f04752503fa8884e6aa814977b7ddbf1651378fe9f971553a1d6f258da032a1b
69	SIZE (xpi/thunderbird-i18n-60.4.0/kab.xpi) = 595238	69	SIZE (xpi/thunderbird-i18n-60.5.0/kab.xpi) = 594016
70	SHA256 (xpi/thunderbird-i18n-60.4.0/kk.xpi) = 49f655e7b9cce450b2a201b44d37a4739cfcfc75488ddace684247354233a52d	70	SHA256 (xpi/thunderbird-i18n-60.5.0/kk.xpi) = c62955e2fc253b1f7a685089dc399317d8889680144cb804a20dd2e1b56a962a
71	SIZE (xpi/thunderbird-i18n-60.4.0/kk.xpi) = 670450	71	SIZE (xpi/thunderbird-i18n-60.5.0/kk.xpi) = 669231
72	SHA256 (xpi/thunderbird-i18n-60.4.0/ko.xpi) = c108fdb6457f9d5863b18de01bac6e4488653dd341d4c83ffaec0be2b3c8e7c2	72	SHA256 (xpi/thunderbird-i18n-60.5.0/ko.xpi) = bd8c8e5000ffd97577a74f3866489bc941e02d4a98b8543233821b334b215191
73	SIZE (xpi/thunderbird-i18n-60.4.0/ko.xpi) = 619729	73	SIZE (xpi/thunderbird-i18n-60.5.0/ko.xpi) = 619730
74	SHA256 (xpi/thunderbird-i18n-60.4.0/lt.xpi) = 292f23da6c0cce6b58305c51809282f84c0b011052542fdbb10646c6e5858e76	74	SHA256 (xpi/thunderbird-i18n-60.5.0/lt.xpi) = 5d51778174d5043fb79d2339afa3952934bddd1c29020a1256e6e14e0b8ad9af
75	SIZE (xpi/thunderbird-i18n-60.4.0/lt.xpi) = 605440	75	SIZE (xpi/thunderbird-i18n-60.5.0/lt.xpi) = 605441
76	SHA256 (xpi/thunderbird-i18n-60.4.0/ms.xpi) = 5ebb43dd174cd459d7742ec2c8f2aad2d4d10386717170f34a539574a83d3894	76	SHA256 (xpi/thunderbird-i18n-60.5.0/ms.xpi) = 715cb9b93e28839c5f939952a0c6929f5b11bbe294ffc7ef82c5f1f5146f75ab
77	SIZE (xpi/thunderbird-i18n-60.4.0/ms.xpi) = 574307	77	SIZE (xpi/thunderbird-i18n-60.5.0/ms.xpi) = 574307
78	SHA256 (xpi/thunderbird-i18n-60.4.0/nb-NO.xpi) = b445050869f3fa33909344cbb20c15be4a68d207c046577ff2e825db57de45be	78	SHA256 (xpi/thunderbird-i18n-60.5.0/nb-NO.xpi) = 1c8bb1cedbfd2a297f11947b1b99bef28690e26d33be826a55e04efa3c3f4611
79	SIZE (xpi/thunderbird-i18n-60.4.0/nb-NO.xpi) = 578233	79	SIZE (xpi/thunderbird-i18n-60.5.0/nb-NO.xpi) = 577003
80	SHA256 (xpi/thunderbird-i18n-60.4.0/nl.xpi) = 90b0e41ab9637804ff8cab1ff2974a625784a08e69d15cd5b81c88aafcf0d452	80	SHA256 (xpi/thunderbird-i18n-60.5.0/nl.xpi) = 830b93c1afad284e406f12df76f5fe5fb011fdafbd4ce9f10e44284a5a4a1fc5
81	SIZE (xpi/thunderbird-i18n-60.4.0/nl.xpi) = 583913	81	SIZE (xpi/thunderbird-i18n-60.5.0/nl.xpi) = 583914
82	SHA256 (xpi/thunderbird-i18n-60.4.0/nn-NO.xpi) = 89dea4f22c65ada7e81d014cd006ec14fca89dbbdf2fd94a55786b687e4c7bd5	82	SHA256 (xpi/thunderbird-i18n-60.5.0/nn-NO.xpi) = a33c9e8b7dcffeb1702b12c25c6a719096d65d69dc85877c066a35babb4b2824
83	SIZE (xpi/thunderbird-i18n-60.4.0/nn-NO.xpi) = 577653	83	SIZE (xpi/thunderbird-i18n-60.5.0/nn-NO.xpi) = 576422
84	SHA256 (xpi/thunderbird-i18n-60.4.0/pl.xpi) = 34e5cc92b559f57e808205b6029035c8a6817d25d554bf9a7179bd4ff30c39f4	84	SHA256 (xpi/thunderbird-i18n-60.5.0/pl.xpi) = 1a5b60e65adfb3f4024d25165e3e864ffb210166e61dff47bb9abdbea2b99dcb
85	SIZE (xpi/thunderbird-i18n-60.4.0/pl.xpi) = 480723	85	SIZE (xpi/thunderbird-i18n-60.5.0/pl.xpi) = 480725
86	SHA256 (xpi/thunderbird-i18n-60.4.0/pt-BR.xpi) = 495c5fbbf026aaafa42077515a2fbadb55d43cc4ee8f8787be9e05d7941eee7e	86	SHA256 (xpi/thunderbird-i18n-60.5.0/pt-BR.xpi) = 8fbbb1022f49ca9fce1aa1481afff4ed377d1281e9da3d3a3f51faf42b4ab0b0
87	SIZE (xpi/thunderbird-i18n-60.4.0/pt-BR.xpi) = 585017	87	SIZE (xpi/thunderbird-i18n-60.5.0/pt-BR.xpi) = 588834
88	SHA256 (xpi/thunderbird-i18n-60.4.0/pt-PT.xpi) = 92fd8404c5a8068e34fdac8a5b98cfe240c35d55cb39ee69a5dfcefc51ebdac2	88	SHA256 (xpi/thunderbird-i18n-60.5.0/pt-PT.xpi) = b7f8f9e440778e3a19929ce6f04c98af905767b888a87380a108b28f8455426f
89	SIZE (xpi/thunderbird-i18n-60.4.0/pt-PT.xpi) = 593185	89	SIZE (xpi/thunderbird-i18n-60.5.0/pt-PT.xpi) = 593186
90	SHA256 (xpi/thunderbird-i18n-60.4.0/rm.xpi) = bf7a352d7a657f09fe1cc58f5c244cd60175c5c7b7f8680c17a00392e0cecfa0	90	SHA256 (xpi/thunderbird-i18n-60.5.0/rm.xpi) = b8de1432cb2440d07ed0624367dca3629f0494dd6a5f3052c7f7e5b6df715c54
91	SIZE (xpi/thunderbird-i18n-60.4.0/rm.xpi) = 578383	91	SIZE (xpi/thunderbird-i18n-60.5.0/rm.xpi) = 578384
92	SHA256 (xpi/thunderbird-i18n-60.4.0/ro.xpi) = 41a19cac8bd9de6b88166135ae9589d67285ea036354be364ee1d67a00d4430d	92	SHA256 (xpi/thunderbird-i18n-60.5.0/ro.xpi) = 03e25d7e493d13f156e75885dd5adc4686202d01976750c433169f3ba2bbdf62
93	SIZE (xpi/thunderbird-i18n-60.4.0/ro.xpi) = 584307	93	SIZE (xpi/thunderbird-i18n-60.5.0/ro.xpi) = 584308
94	SHA256 (xpi/thunderbird-i18n-60.4.0/ru.xpi) = 2a344065f7c5c99e82a04e0e68bd048ed3973f65a6754086b47dcb30604e7759	94	SHA256 (xpi/thunderbird-i18n-60.5.0/ru.xpi) = 2b4398c00a09d7a1a306933d25fced39bbc73b1455ff816f7a288aae70b8bcc5
95	SIZE (xpi/thunderbird-i18n-60.4.0/ru.xpi) = 694705	95	SIZE (xpi/thunderbird-i18n-60.5.0/ru.xpi) = 694705
96	SHA256 (xpi/thunderbird-i18n-60.4.0/si.xpi) = a0c089fb064aeb91406b1d01db52dba3bac4acb6a476de5ffd22365aad4cca4a	96	SHA256 (xpi/thunderbird-i18n-60.5.0/si.xpi) = bd82a180d5f2081505a3ff8c09de9936511d1d616e9947c913c5d45ae0105ca4
97	SIZE (xpi/thunderbird-i18n-60.4.0/si.xpi) = 643791	97	SIZE (xpi/thunderbird-i18n-60.5.0/si.xpi) = 647596
98	SHA256 (xpi/thunderbird-i18n-60.4.0/sk.xpi) = b8bcc8ddc26071e0715e94ee2019887ce344e9aff7f3a4a935045425cdb2a854	98	SHA256 (xpi/thunderbird-i18n-60.5.0/sk.xpi) = 26901d561b82c040e733fe061829c9d688b4869cf4ff5dcda3d84b3e1178a0a5
99	SIZE (xpi/thunderbird-i18n-60.4.0/sk.xpi) = 612216	99	SIZE (xpi/thunderbird-i18n-60.5.0/sk.xpi) = 612216
100	SHA256 (xpi/thunderbird-i18n-60.4.0/sl.xpi) = 3069b15f8d89dbe2aa4bcbde4cfd565cf7c4bc6afcbc65dfcfe95145191a581d	100	SHA256 (xpi/thunderbird-i18n-60.5.0/sl.xpi) = 202dfacbe227291e69e81ff96540aac1e3444209d62b083c172fc23c72d54ee2
101	SIZE (xpi/thunderbird-i18n-60.4.0/sl.xpi) = 589946	101	SIZE (xpi/thunderbird-i18n-60.5.0/sl.xpi) = 589947
102	SHA256 (xpi/thunderbird-i18n-60.4.0/sq.xpi) = 3af0514bab03075e44857f8567a3bfdacc5c99549694b9af0d9d499ccb7bfcb8	102	SHA256 (xpi/thunderbird-i18n-60.5.0/sq.xpi) = 82fc6083998e6362b0bfc8e263edad82346463a226eddc6b04bcf7fb380b6788
103	SIZE (xpi/thunderbird-i18n-60.4.0/sq.xpi) = 593096	103	SIZE (xpi/thunderbird-i18n-60.5.0/sq.xpi) = 593096
104	SHA256 (xpi/thunderbird-i18n-60.4.0/sr.xpi) = 6da1aefdc798f589ce3c6f41cc37099f345cdaaaea9851aedbbd3cf6256c49d5	104	SHA256 (xpi/thunderbird-i18n-60.5.0/sr.xpi) = dc931da27dda3502cd22abf0837afaecda15160476758e5e2aa194d517bb463f
105	SIZE (xpi/thunderbird-i18n-60.4.0/sr.xpi) = 637720	105	SIZE (xpi/thunderbird-i18n-60.5.0/sr.xpi) = 641527
106	SHA256 (xpi/thunderbird-i18n-60.4.0/sv-SE.xpi) = e295ff95f42cb223c06385b1def1c95cbca0222f475763db410664a8d134ad8a	106	SHA256 (xpi/thunderbird-i18n-60.5.0/sv-SE.xpi) = f1be900c89ec7b88b7b3511360729b0b237d01f10d26aaad2857a8f9d295bc9b
107	SIZE (xpi/thunderbird-i18n-60.4.0/sv-SE.xpi) = 594077	107	SIZE (xpi/thunderbird-i18n-60.5.0/sv-SE.xpi) = 594079
108	SHA256 (xpi/thunderbird-i18n-60.4.0/tr.xpi) = 193170d3b22752635146fd825b7e350d29133aa4b2fdda6e82e5a6e7cc386d7e	108	SHA256 (xpi/thunderbird-i18n-60.5.0/tr.xpi) = c1a1b0135c22ab60c2a6542fb1571413e9d78d5a70a4efa57e798b6998381971
109	SIZE (xpi/thunderbird-i18n-60.4.0/tr.xpi) = 598009	109	SIZE (xpi/thunderbird-i18n-60.5.0/tr.xpi) = 598010
110	SHA256 (xpi/thunderbird-i18n-60.4.0/uk.xpi) = 6b5a6d4396fec63d35c86a4657e4d1f4a8adcc3ee1587f4e37d5c0809f45035c	110	SHA256 (xpi/thunderbird-i18n-60.5.0/uk.xpi) = a3e95424e17a6b370c510aba63ee49521beddb7b843971e540b2ae7e7785747f
111	SIZE (xpi/thunderbird-i18n-60.4.0/uk.xpi) = 684154	111	SIZE (xpi/thunderbird-i18n-60.5.0/uk.xpi) = 684154
112	SHA256 (xpi/thunderbird-i18n-60.4.0/vi.xpi) = df16c0f5e69eaa3a2c62e35774e3ced68a87930ed8124737aea9aeb7000d2d6f	112	SHA256 (xpi/thunderbird-i18n-60.5.0/vi.xpi) = 24367d6109f0e0a996e3623e15aaa75a84a8373b7a025edf7e84e8f56421b315
113	SIZE (xpi/thunderbird-i18n-60.4.0/vi.xpi) = 638420	113	SIZE (xpi/thunderbird-i18n-60.5.0/vi.xpi) = 637199
114	SHA256 (xpi/thunderbird-i18n-60.4.0/zh-CN.xpi) = 124b2d5e34fdc4d2336bc42170590c4185ab3eae593230f3d13b1c95df373320	114	SHA256 (xpi/thunderbird-i18n-60.5.0/zh-CN.xpi) = ccb35f028c1741133ba6449858fd543fc9fad93d17c1887df55dd5e751f2799f
115	SIZE (xpi/thunderbird-i18n-60.4.0/zh-CN.xpi) = 622465	115	SIZE (xpi/thunderbird-i18n-60.5.0/zh-CN.xpi) = 626283
116	SHA256 (xpi/thunderbird-i18n-60.4.0/zh-TW.xpi) = b2584a3419bb723a1f97a4cd1588528e4d62bdb03dcce3840b36a399e40c4b29	116	SHA256 (xpi/thunderbird-i18n-60.5.0/zh-TW.xpi) = 08ce589a9ee4e41ab1d23338dcc9758b6eb866cfdf27cee44e6cfa7fbc460c59
117	SIZE (xpi/thunderbird-i18n-60.4.0/zh-TW.xpi) = 626189	117	SIZE (xpi/thunderbird-i18n-60.5.0/zh-TW.xpi) = 626190

Lines 2-19 Link Here

(-)b/mail/thunderbird/Makefile (-4 / +3 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= thunderbird	4	PORTNAME= thunderbird
5	DISTVERSION= 60.4.0	5	DISTVERSION= 60.5.0
6	PORTREVISION= 3
7	CATEGORIES= mail news net-im ipv6	6	CATEGORIES= mail news net-im ipv6
8	MASTER_SITES= MOZILLA/${PORTNAME}/releases/${DISTVERSION}/source \	7	MASTER_SITES= MOZILLA/${PORTNAME}/releases/${DISTVERSION}/source \
9	MOZILLA/${PORTNAME}/candidates/${DISTVERSION}-candidates/build1/source	8	MOZILLA/${PORTNAME}/candidates/${DISTVERSION}-candidates/build2/source
10	DISTFILES= ${DISTNAME}.source${EXTRACT_SUFX}	9	DISTFILES= ${DISTNAME}.source${EXTRACT_SUFX}
11		10
12	MAINTAINER= gecko@FreeBSD.org	11	MAINTAINER= gecko@FreeBSD.org
13	COMMENT= Mozilla Thunderbird is standalone mail and news that stands above	12	COMMENT= Mozilla Thunderbird is standalone mail and news that stands above
14		13
15	BUILD_DEPENDS= nspr>=4.19:devel/nspr \	14	BUILD_DEPENDS= nspr>=4.19:devel/nspr \
16	nss>=3.36.1:security/nss \	15	nss>=3.36.7:security/nss \
17	icu>=59.1,1:devel/icu \	16	icu>=59.1,1:devel/icu \
18	libevent>=2.1.8:devel/libevent \	17	libevent>=2.1.8:devel/libevent \
19	harfbuzz>=1.7.6:print/harfbuzz \	18	harfbuzz>=1.7.6:print/harfbuzz \

Lines 40-82 diff --git js/src/vm/UnboxedObject.cpp js/src/vm/UnboxedObject.cpp Link Here

(-)b/mail/thunderbird/files/patch-bug1375074 (-25 / +26 lines)
40	index c8c178965c488..5badf328ede4f 100644	40	index c8c178965c488..5badf328ede4f 100644
41	--- js/src/vm/UnboxedObject.cpp	41	--- js/src/vm/UnboxedObject.cpp
42	+++ js/src/vm/UnboxedObject.cpp	42	+++ js/src/vm/UnboxedObject.cpp
43	@@ -95,7 +95,15 @@ UnboxedLayout::makeConstructorCode(JSContext* cx, HandleObjectGroup group)	43	@@ -86,8 +86,15 @@ static const uintptr_t CLEAR_CONSTRUCTOR_CODE_TOKEN =
44	#endif	44	#endif
45		45
46	#ifdef JS_CODEGEN_ARM64	46	#ifdef JS_CODEGEN_ARM64
47	- // ARM64 communicates stack address via sp, but uses a pseudo-sp for addressing.	47	- // ARM64 communicates stack address via sp, but uses a pseudo-sp for
48	+ // ARM64 communicates stack address via sp, but uses a pseudo-sp (PSP) for	48	- // addressing.
49	+ // addressing. The register we use for PSP may however also be used by	49	+ // ARM64 communicates stack address via sp, but uses a pseudo-sp (PSP) for
50	+ // calling code, and it is nonvolatile, so save it. Do this as a special	50	+ // addressing. The register we use for PSP may however also be used by
51	+ // case first because the generic save/restore code needs the PSP to be	51	+ // calling code, and it is nonvolatile, so save it. Do this as a special
52	+ // initialized already.	52	+ // case first because the generic save/restore code needs the PSP to be
53	+ MOZ_ASSERT(PseudoStackPointer64.Is(masm.GetStackPointer64()));	53	+ // initialized already.
54	+ masm.Str(PseudoStackPointer64, vixl::MemOperand(sp, -16, vixl::PreIndex));	54	+ MOZ_ASSERT(PseudoStackPointer64.Is(masm.GetStackPointer64()));
		55	+ masm.Str(PseudoStackPointer64, vixl::MemOperand(sp, -16, vixl::PreIndex));
55	+	56	+
56	+ // Initialize the PSP from the SP.	57	+ // Initialize the PSP from the SP.
57	masm.initStackPtr();	58	masm.initStackPtr();
58	#endif	59	#endif
59		60
60	@@ -233,7 +241,22 @@ UnboxedLayout::makeConstructorCode(JSContext* cx, HandleObjectGroup group)	61	@@ -239,7 +246,22 @@ static const uintptr_t CLEAR_CONSTRUCTOR_CODE_TOKEN =
61	masm.pop(ScratchDoubleReg);	62	if (ScratchDoubleReg.volatile_()) masm.pop(ScratchDoubleReg);
62	masm.PopRegsInMask(savedNonVolatileRegisters);	63	masm.PopRegsInMask(savedNonVolatileRegisters);
63		64
64	+#ifdef JS_CODEGEN_ARM64	65	+#ifdef JS_CODEGEN_ARM64
65	+ // Now restore the value that was in the PSP register on entry, and return.	66	+ // Now restore the value that was in the PSP register on entry, and return.
66	+	67	+
67	+ // Obtain the correct SP from the PSP.	68	+ // Obtain the correct SP from the PSP.
68	+ masm.Mov(sp, PseudoStackPointer64);	69	+ masm.Mov(sp, PseudoStackPointer64);
69	+	70	+
70	+ // Restore the saved value of the PSP register, this value is whatever the	71	+ // Restore the saved value of the PSP register, this value is whatever the
71	+ // caller had saved in it, not any actual SP value, and it must not be	72	+ // caller had saved in it, not any actual SP value, and it must not be
72	+ // overwritten subsequently.	73	+ // overwritten subsequently.
73	+ masm.Ldr(PseudoStackPointer64, vixl::MemOperand(sp, 16, vixl::PostIndex));	74	+ masm.Ldr(PseudoStackPointer64, vixl::MemOperand(sp, 16, vixl::PostIndex));
74	+	75	+
75	+ // Perform a plain Ret(), as abiret() will move SP <- PSP and that is wrong.	76	+ // Perform a plain Ret(), as abiret() will move SP <- PSP and that is wrong.
76	+ masm.Ret(vixl::lr);	77	+ masm.Ret(vixl::lr);
77	+#else	78	+#else
78	masm.abiret();	79	masm.abiret();
79	+#endif	80	+#endif
80		81
81	masm.bind(&failureStoreOther);	82	masm.bind(&failureStoreOther);
82		83

Lines 15-85 diff --git dom/canvas/CanvasRenderingContext2D.cpp dom/canvas/CanvasRenderingCon Link Here

(-)b/mail/thunderbird/files/patch-bug1411481 (-30 / +28 lines)
15	index ef3f868bdbf7..8666564b4d0c 100644	15	index ef3f868bdbf7..8666564b4d0c 100644
16	--- dom/canvas/CanvasRenderingContext2D.cpp	16	--- dom/canvas/CanvasRenderingContext2D.cpp
17	+++ dom/canvas/CanvasRenderingContext2D.cpp	17	+++ dom/canvas/CanvasRenderingContext2D.cpp
18	@@ -1438,7 +1438,8 @@ CanvasRenderingContext2D::AllowOpenGLCanvas() const	18	@@ -1358,7 +1358,8 @@ bool CanvasRenderingContext2D::AllowOpenGLCanvas() con
19	// HTMLCanvasElement::GetCompositorBackendType would return LAYERS_NONE	19	// HTMLCanvasElement::GetCompositorBackendType would return LAYERS_NONE
20	// as well, so it wouldn't help much.	20	// as well, so it wouldn't help much.
21		21
22	- return (mCompositorBackend == LayersBackend::LAYERS_OPENGL) &&	22	- return (mCompositorBackend == LayersBackend::LAYERS_OPENGL) &&
23	+ return (mCompositorBackend == LayersBackend::LAYERS_OPENGL \|\|	23	+ return (mCompositorBackend == LayersBackend::LAYERS_OPENGL \|\|
24	+ mCompositorBackend == LayersBackend::LAYERS_WR) &&	24	+ mCompositorBackend == LayersBackend::LAYERS_WR) &&
25	gfxPlatform::GetPlatform()->AllowOpenGLCanvas();	25	gfxPlatform::GetPlatform()->AllowOpenGLCanvas();
26	}	26	}
27		27
28	diff --git gfx/thebes/gfxPlatform.cpp gfx/thebes/gfxPlatform.cpp	28	diff --git gfx/thebes/gfxPlatform.cpp gfx/thebes/gfxPlatform.cpp
29	index b9beea68d8c5..82635f9ab3ce 100644	29	index b9beea68d8c5..82635f9ab3ce 100644
30	--- gfx/thebes/gfxPlatform.cpp	30	--- gfx/thebes/gfxPlatform.cpp
31	+++ gfx/thebes/gfxPlatform.cpp	31	+++ gfx/thebes/gfxPlatform.cpp
32	@@ -1386,7 +1386,8 @@ bool gfxPlatform::AllowOpenGLCanvas()	32	@@ -1341,7 +1341,8 @@ bool gfxPlatform::AllowOpenGLCanvas() {
33	// so we let content process always assume correct compositor backend.
34	// The callers have to do the right thing.	33	// The callers have to do the right thing.
35	bool correctBackend = !XRE_IsParentProcess() \|\|	34	bool correctBackend =
36	- ((mCompositorBackend == LayersBackend::LAYERS_OPENGL) &&	35	!XRE_IsParentProcess() \|\|
37	+ ((mCompositorBackend == LayersBackend::LAYERS_OPENGL \|\|	36	- ((mCompositorBackend == LayersBackend::LAYERS_OPENGL) &&
38	+ mCompositorBackend == LayersBackend::LAYERS_WR) &&	37	+ ((mCompositorBackend == LayersBackend::LAYERS_OPENGL \|\|
39	(GetContentBackendFor(mCompositorBackend) == BackendType::SKIA));	38	+ mCompositorBackend == LayersBackend::LAYERS_WR) &&
		39	(GetContentBackendFor(mCompositorBackend) == BackendType::SKIA));
40		40
41	if (gfxPrefs::CanvasAzureAccelerated() && correctBackend) {	41	if (gfxPrefs::CanvasAzureAccelerated() && correctBackend) {
42	diff --git gfx/thebes/gfxPlatform.h gfx/thebes/gfxPlatform.h	42	diff --git gfx/thebes/gfxPlatform.h gfx/thebes/gfxPlatform.h
43	index c988eb1168a8..3bbf2b763f26 100644	43	index c988eb1168a8..3bbf2b763f26 100644
44	--- gfx/thebes/gfxPlatform.h	44	--- gfx/thebes/gfxPlatform.h
45	+++ gfx/thebes/gfxPlatform.h	45	+++ gfx/thebes/gfxPlatform.h
46	@@ -286,7 +286,7 @@ public:	46	@@ -265,7 +265,7 @@ class gfxPlatform {
47	/// asking for it, we will examine the commands in the first few seconds	47	/// asking for it, we will examine the commands in the first few seconds
48	/// of the canvas usage, and potentially change to accelerated or	48	/// of the canvas usage, and potentially change to accelerated or
49	/// non-accelerated canvas.	49	/// non-accelerated canvas.
50	- bool AllowOpenGLCanvas();	50	- bool AllowOpenGLCanvas();
51	+ virtual bool AllowOpenGLCanvas();	51	+ virtual bool AllowOpenGLCanvas();
52	virtual void InitializeSkiaCacheLimits();	52	virtual void InitializeSkiaCacheLimits();
53		53
54	static bool AsyncPanZoomEnabled();	54	static bool AsyncPanZoomEnabled();
55	diff --git gfx/thebes/gfxWindowsPlatform.cpp gfx/thebes/gfxWindowsPlatform.cpp	55	diff --git gfx/thebes/gfxWindowsPlatform.cpp gfx/thebes/gfxWindowsPlatform.cpp
56	index 9ba6f40c6cc0..4d65791d075f 100644	56	index 9ba6f40c6cc0..4d65791d075f 100644
57	--- gfx/thebes/gfxWindowsPlatform.cpp	57	--- gfx/thebes/gfxWindowsPlatform.cpp
58	+++ gfx/thebes/gfxWindowsPlatform.cpp	58	+++ gfx/thebes/gfxWindowsPlatform.cpp
59	@@ -509,6 +509,13 @@ gfxWindowsPlatform::UpdateRenderMode()	59	@@ -466,6 +466,11 @@ void gfxWindowsPlatform::UpdateRenderMode() {
60	}	60	}
61	}	61	}
62		62
63	+bool	63	+bool gfxWindowsPlatform::AllowOpenGLCanvas() {
64	+gfxWindowsPlatform::AllowOpenGLCanvas()
65	+{
66	+ // OpenGL canvas is not supported on windows	64	+ // OpenGL canvas is not supported on windows
67	+ return false;	65	+ return false;
68	+}	66	+}
69	+	67	+
70	mozilla::gfx::BackendType	68	mozilla::gfx::BackendType gfxWindowsPlatform::GetContentBackendFor(
71	gfxWindowsPlatform::GetContentBackendFor(mozilla::layers::LayersBackend aLayers)	69	mozilla::layers::LayersBackend aLayers) {
72	{	70	mozilla::gfx::BackendType defaultBackend =
73	diff --git gfx/thebes/gfxWindowsPlatform.h gfx/thebes/gfxWindowsPlatform.h	71	diff --git gfx/thebes/gfxWindowsPlatform.h gfx/thebes/gfxWindowsPlatform.h
74	index 47048de8f5f5..47ec0e9e5547 100644	72	index 47048de8f5f5..47ec0e9e5547 100644
75	--- gfx/thebes/gfxWindowsPlatform.h	73	--- gfx/thebes/gfxWindowsPlatform.h
76	+++ gfx/thebes/gfxWindowsPlatform.h	74	+++ gfx/thebes/gfxWindowsPlatform.h
77	@@ -174,6 +174,8 @@ public:	75	@@ -171,6 +171,8 @@ class gfxWindowsPlatform : public gfxPlatform {
78	void SchedulePaintIfDeviceReset() override;	76	void SchedulePaintIfDeviceReset() override;
79	void CheckForContentOnlyDeviceReset();	77	void CheckForContentOnlyDeviceReset();
80		78
81	+ bool AllowOpenGLCanvas() override;	79	+ bool AllowOpenGLCanvas() override;
82	+	80	+
83	mozilla::gfx::BackendType GetContentBackendFor(mozilla::layers::LayersBackend aLayers) override;	81	mozilla::gfx::BackendType GetContentBackendFor(
		82	mozilla::layers::LayersBackend aLayers) override;
84		83
85	mozilla::gfx::BackendType GetPreferredCanvasBackend() override;

Lines 15-45 diff --git js/src/jit/arm64/MacroAssembler-arm64-inl.h js/src/jit/arm64/MacroAss Link Here

(-)b/mail/thunderbird/files/patch-bug1447359 (-24 / +24 lines)
15	index 7061cbfd93ebb..190442f7afa0a 100644	15	index 7061cbfd93ebb..190442f7afa0a 100644
16	--- js/src/jit/arm64/MacroAssembler-arm64-inl.h	16	--- js/src/jit/arm64/MacroAssembler-arm64-inl.h
17	+++ js/src/jit/arm64/MacroAssembler-arm64-inl.h	17	+++ js/src/jit/arm64/MacroAssembler-arm64-inl.h
18	@@ -359,6 +359,7 @@ MacroAssembler::sub32FromStackPtrWithPatch(Register dest)	18	@@ -268,6 +268,7 @@ void MacroAssembler::add64(Imm64 imm, Register64 dest)
19	{	19	CodeOffset MacroAssembler::sub32FromStackPtrWithPatch(Register dest) {
20	vixl::UseScratchRegisterScope temps(this);	20	vixl::UseScratchRegisterScope temps(this);
21	const ARMRegister scratch = temps.AcquireX();	21	const ARMRegister scratch = temps.AcquireX();
22	+ AutoForbidPools afp(this, /* max number of instructions in scope = */ 3);	22	+ AutoForbidPools afp(this, /* max number of instructions in scope = */ 3);
23	CodeOffset offs = CodeOffset(currentOffset());	23	CodeOffset offs = CodeOffset(currentOffset());
24	movz(scratch, 0, 0);	24	movz(scratch, 0, 0);
25	movk(scratch, 0, 16);	25	movk(scratch, 0, 16);
26	diff --git js/src/jit/arm64/MacroAssembler-arm64.cpp js/src/jit/arm64/MacroAssembler-arm64.cpp	26	diff --git js/src/jit/arm64/MacroAssembler-arm64.cpp js/src/jit/arm64/MacroAssembler-arm64.cpp
27	index 7b599b7e9d610..4e8fdb6a67019 100644	27	index 7b599b7e9d610..4e8fdb6a67019 100644
28	--- js/src/jit/arm64/MacroAssembler-arm64.cpp	28	--- js/src/jit/arm64/MacroAssembler-arm64.cpp
29	+++ js/src/jit/arm64/MacroAssembler-arm64.cpp	29	+++ js/src/jit/arm64/MacroAssembler-arm64.cpp
30	@@ -707,6 +707,7 @@ MacroAssembler::patchFarJump(CodeOffset farJump, uint32_t targetOffset)	30	@@ -666,6 +666,7 @@ void MacroAssembler::patchNearJumpToNop(uint8_t* jump)
31	CodeOffset	31	}
32	MacroAssembler::nopPatchableToCall(const wasm::CallSiteDesc& desc)	32
33	{	33	CodeOffset MacroAssembler::nopPatchableToCall(const wasm::CallSiteDesc& desc) {
34	+ AutoForbidPools afp(this, /* max number of instructions in scope = */ 1);	34	+ AutoForbidPools afp(this, /* max number of instructions in scope = */ 1);
35	CodeOffset offset(currentOffset());	35	CodeOffset offset(currentOffset());
36	Nop();	36	Nop();
37	append(desc, CodeOffset(currentOffset()));	37	append(desc, CodeOffset(currentOffset()));
38	@@ -1077,6 +1078,7 @@ MacroAssembler::comment(const char* msg)	38	@@ -1002,6 +1003,7 @@ void MacroAssembler::comment(const char* msg) { Assemb
39	CodeOffset	39	// wasm support
40	MacroAssembler::wasmTrapInstruction()	40
41	{	41	CodeOffset MacroAssembler::wasmTrapInstruction() {
42	+ AutoForbidPools afp(this, /* max number of instructions in scope = */ 1);	42	+ AutoForbidPools afp(this, /* max number of instructions in scope = */ 1);
43	CodeOffset offs(currentOffset());	43	CodeOffset offs(currentOffset());
44	Unreachable();	44	Unreachable();
45	return offs;	45	return offs;

Lines 19-33 diff --git js/src/jit/arm64/MacroAssembler-arm64.cpp js/src/jit/arm64/MacroAssem Link Here

(-)b/mail/thunderbird/files/patch-bug1451292 (-9 / +9 lines)
19	index 4ea64b1225d00..a212de0ec2f45 100644	19	index 4ea64b1225d00..a212de0ec2f45 100644
20	--- js/src/jit/arm64/MacroAssembler-arm64.cpp	20	--- js/src/jit/arm64/MacroAssembler-arm64.cpp
21	+++ js/src/jit/arm64/MacroAssembler-arm64.cpp	21	+++ js/src/jit/arm64/MacroAssembler-arm64.cpp
22	@@ -237,8 +237,9 @@ MacroAssemblerCompat::profilerEnterFrame(RegisterOrSP framePtr, Register scratch	22	@@ -249,8 +249,9 @@ void MacroAssemblerCompat::profilerEnterFrame(Register
23	void	23	}
24	MacroAssemblerCompat::breakpoint()	24
25	{	25	void MacroAssemblerCompat::breakpoint() {
26	- static int code = 0xA77;	26	- static int code = 0xA77;
27	- Brk((code++) & 0xffff);	27	- Brk((code++) & 0xffff);
28	+ // Note, other payloads are possible, but GDB is known to misinterpret them	28	+ // Note, other payloads are possible, but GDB is known to misinterpret them
29	+ // sometimes and iloop on the breakpoint instead of stopping properly.	29	+ // sometimes and iloop on the breakpoint instead of stopping properly.
30	+ Brk(0);	30	+ Brk(0);
31	}	31	}
32		32
33	// Either `any` is valid or `sixtyfour` is valid. Return a 32-bit ARMRegister	33	// Either `any` is valid or `sixtyfour` is valid. Return a 32-bit ARMRegister

Lines 11-22 diff --git dom/fetch/FetchConsumer.cpp dom/fetch/FetchConsumer.cpp Link Here

(-)b/mail/thunderbird/files/patch-bug1456556 (-6 / +6 lines)
11	index 134bf7f2e703a..3c3687fea1d5a 100644	11	index 134bf7f2e703a..3c3687fea1d5a 100644
12	--- dom/fetch/FetchConsumer.cpp	12	--- dom/fetch/FetchConsumer.cpp
13	+++ dom/fetch/FetchConsumer.cpp	13	+++ dom/fetch/FetchConsumer.cpp
14	@@ -582,7 +582,7 @@ FetchBodyConsumer<Derived>::ContinueConsumeBody(nsresult aStatus,	14	@@ -560,7 +560,7 @@ void FetchBodyConsumer<Derived>::ContinueConsumeBody(n
15	RefPtr<Promise> localPromise = mConsumePromise.forget();
16		15
17	RefPtr<FetchBodyConsumer<Derived>> self = this;	16	RefPtr<FetchBodyConsumer<Derived>> self = this;
18	- auto autoReleaseObject = mozilla::MakeScopeExit([&] {	17	auto autoReleaseObject =
19	+ auto autoReleaseObject = mozilla::MakeScopeExit([self] {	18	- mozilla::MakeScopeExit([&] { self->ReleaseObject(); });
20	self->ReleaseObject();	19	+ mozilla::MakeScopeExit([self] { self->ReleaseObject(); });
21	});
22		20
		21	if (aShuttingDown) {
		22	// If shutting down, we don't want to resolve any promise.

Removed Link Here

(-)a/mail/thunderbird/files/patch-bug1500850 (-26 lines)
1	commit 4425b9140c4c
2	Author: Martin Stransky <stransky@redhat.com>
3	Date: Mon Oct 22 09:14:07 2018 +0000
4
5	Bug 1500850 - [Wayland] Add missing dbus header dbus-glib-lowlevel.h. r=jhorak, a=RyanVM
6
7	Differential Revision: https://phabricator.services.mozilla.com/D9365
8
9	--HG--
10	extra : source : 5203edd6ea29e4b73681674d2a5268dd6a310102
11	---
12	widget/xremoteclient/DBusRemoteClient.cpp \| 1 +
13	1 file changed, 1 insertion(+)
14
15	diff --git widget/xremoteclient/DBusRemoteClient.cpp widget/xremoteclient/DBusRemoteClient.cpp
16	index ba5bda06201d..b2f03dccc133 100644
17	--- widget/xremoteclient/DBusRemoteClient.cpp
18	+++ widget/xremoteclient/DBusRemoteClient.cpp
19	@@ -13,6 +13,7 @@
20	#include "nsPrintfCString.h"
21
22	#include <dlfcn.h>
23	+#include <dbus/dbus-glib-lowlevel.h>
24
25	using mozilla::LogLevel;
26	static mozilla::LazyLogModule sRemoteLm("DBusRemoteClient");