Merge remote-tracking branch 'origin/tracking' into custom

dom/webidl/DOMMatrix.webidl

@@ -82,6 +82,7 @@ interface DOMMatrixReadOnly {
     [Throws] Float32Array      toFloat32Array();
     [Throws] Float64Array      toFloat64Array();
     [Exposed=Window]           stringifier;
+                               jsonifier;
 };
 
 [Constructor,

dom/webidl/DOMPoint.webidl

@@ -19,7 +19,9 @@ interface DOMPointReadOnly {
     readonly attribute unrestricted double x;
     readonly attribute unrestricted double y;
     readonly attribute unrestricted double z;
-    readonly attribute unrestricted double w; 
+    readonly attribute unrestricted double w;
+    
+    jsonifier;
 };
 
 [Constructor(optional unrestricted double x = 0, optional unrestricted double y = 0,

dom/webidl/DOMRect.webidl

@@ -36,6 +36,8 @@ interface DOMRectReadOnly {
     readonly attribute unrestricted double right;
     readonly attribute unrestricted double bottom;
     readonly attribute unrestricted double left;
+    
+    jsonifier;
 };
 
 dictionary DOMRectInit {

js/src/threading/ExclusiveData.h

@@ -117,7 +117,7 @@ class ExclusiveData
     }
 
     ExclusiveData(ExclusiveData&& rhs) :
-      lock_(mozilla::Move(rhs.lock))
+      lock_(mozilla::Move(rhs.lock()))
     {
         MOZ_ASSERT(&rhs != this, "self-move disallowed!");
         new (value_.addr()) T(mozilla::Move(*rhs.value_.addr()));

modules/libpref/init/all.js

@@ -3650,7 +3650,7 @@ pref("ui.osk.debug.keyboardDisplayReason", "");
 //  * 0: never
 //  * 1: always
 //  * 2: auto
-pref("widget.windows.follow_shortcuts_on_file_open", 2);
+pref("widget.windows.follow_shortcuts_on_file_open", 1);
 
 # XP_WIN
 #endif
@@ -4809,41 +4809,6 @@ pref("dom.browserElement.maxScreenshotDelayMS", 2000);
 // Whether we should show the placeholder when the element is focused but empty.
 pref("dom.placeholder.show_on_focus", true);
 
-// MMS UA Profile settings
-pref("wap.UAProf.url", "");
-pref("wap.UAProf.tagname", "x-wap-profile");
-
-// MMS version 1.1 = 0x11 (or decimal 17)
-// MMS version 1.3 = 0x13 (or decimal 19)
-// @see OMA-TS-MMS_ENC-V1_3-20110913-A clause 7.3.34
-pref("dom.mms.version", 19);
-
-pref("dom.mms.requestStatusReport", true);
-
-// Retrieval mode for MMS
-// manual: Manual retrieval mode.
-// automatic: Automatic retrieval mode even in roaming.
-// automatic-home: Automatic retrieval mode in home network.
-// never: Never retrieval mode.
-pref("dom.mms.retrieval_mode", "manual");
-
-pref("dom.mms.sendRetryCount", 3);
-pref("dom.mms.sendRetryInterval", "10000,60000,180000");
-
-pref("dom.mms.retrievalRetryCount", 4);
-pref("dom.mms.retrievalRetryIntervals", "60000,300000,600000,1800000");
-// Numeric default service id for MMS API calls with |serviceId| parameter
-// omitted.
-pref("dom.mms.defaultServiceId", 0);
-// Debug enabler for MMS.
-pref("mms.debugging.enabled", false);
-
-// Request read report while sending MMS.
-pref("dom.mms.requestReadReport", true);
-
-// Number of RadioInterface instances to create.
-pref("ril.numRadioInterfaces", 0);
-
 // If the user puts a finger down on an element and we think the user
 // might be executing a pan gesture, how long do we wait before
 // tentatively deciding the gesture is actually a tap and activating

toolkit/fonts/README.txt

@@ -3,9 +3,9 @@ Twemoji Mozilla
 
 This is a COLR compiled version of the Twemoji font in TTF format.
 
-The upstream repository of Twemoji Mozilla can be found at
+The upstream repository of our Twemoji font can be found at
 
-  https://github.com/mozilla/twemoji-colr
+  https://repo.palemoon.org/MoonchildProductions/twemoji-colr
 
 Please refer to the commit history for the current version of the font.
 This file purposely omits the version, so there is no need to update it here.