import change from rmottola/Arctic-Fox:

- Bug 1142761 - Move CallSetter into ScriptedIndirectProxyHandler so it will eventually be deleted along with its only remaining caller. (a5a0b3f6b)
- Bug 1143810 - Remove some XPConnect JSClass::setProperty hooks that are not needed anymore. (4eda6a60b)
- Bug 1142195 - Remove some unused class declarations in the DOM Cache code (afd802623)
- Bug 1145345 - Account for a greater variety of rounding errors when comparing coordinates (6a41f34f3)
- Bug 1145787 - Put a misplaced assertion into its proper place. (7f760a66d)
- Bug 1146059 - Remove Response.finalURL. (230d9fa50)
- Bug 1134324 - Set CORS mode and credentials on Fetch event Request. r=michal (772fcac8f)
- Bug 1136200 - Verify request type is not no-cors if response is opaque (396c9bfb4)
- Bug 1144249 - fix fetch no-cors mode. r=bkelly (af9656291)
- Bug 1144876 - Stop spamming stderr with a warning every time that we encounter a document that is not controlled by a service worker; (0a5c5fbfd)
- Bug 1117172 part 1. Allow passing an optional aGivenProto to binding Wrap methods. (8aea85046)
- Bug 1117172 part 2. Change the non-wrappercached WrapObject methods to allow passing in aGivenProto. r=peterv (13146be83)
- Bug 1117172 part 3. Change the wrappercached WrapObject methods to al low passing in aGivenProto. r=peterv (1621ef48d)
- Bug 1146293 - Fix coding style break (intent and line length) caused by Bug 1117172 and Bug 1145631. (0822709f1)
- Bug 1121298 - Part 1: refactor MozNDEFRecord cstor. (6e57a37ec)
- Bug 1121298 - Part 2: Add Constructor(uri) for MozNDEFRecord. (46f921bcf)
- Bug 1121298 - Part 3. add getAsURI. (e67cad94b)
- Bug 1138886 - Structured Clone for MozNDEFRecord. (With adaptations of Bug 1117172 part 3) (b83b7f684)
- Bug 1143504 - Disconnect the Cache object from its actor when it gets cycle collected. (dae58dcdd)

dom/base/nsJSEnvironment.cpp

@@ -59,6 +59,9 @@
 #include "mozilla/dom/ErrorEvent.h"
 #include "mozilla/dom/ImageDataBinding.h"
 #include "mozilla/dom/ImageData.h"
+#ifdef MOZ_NFC
+#include "mozilla/dom/MozNDEFRecord.h"
+#endif // MOZ_NFC
 #include "mozilla/dom/StructuredClone.h"
 #include "mozilla/dom/SubtleCryptoBinding.h"
 #include "mozilla/ipc/BackgroundUtils.h"
@@ -2472,7 +2475,7 @@ NS_DOMReadStructuredClone(JSContext* cx,
       if (!key->ReadStructuredClone(reader)) {
         result = nullptr;
       } else {
-        result = key->WrapObject(cx);
+        result = key->WrapObject(cx, JS::NullPtr());
       }
     }
     return result;
@@ -2516,6 +2519,24 @@ NS_DOMReadStructuredClone(JSContext* cx,
     }
 
     return result.toObjectOrNull();
+  } else if (tag == SCTAG_DOM_NFC_NDEF) {
+#ifdef MOZ_NFC
+    nsIGlobalObject *global = xpc::NativeGlobal(JS::CurrentGlobalOrNull(cx));
+    if (!global) {
+      return nullptr;
+    }
+
+    // Prevent the return value from being trashed by a GC during ~nsRefPtr.
+    JS::Rooted<JSObject*> result(cx);
+    {
+      nsRefPtr<MozNDEFRecord> ndefRecord = new MozNDEFRecord(global);
+      result = ndefRecord->ReadStructuredClone(cx, reader) ?
+               ndefRecord->WrapObject(cx, JS::NullPtr()) : nullptr;
+    }
+    return result;
+#else
+    return nullptr;
+#endif
   }
 
   // Don't know what this is. Bail.
@@ -2567,6 +2588,14 @@ NS_DOMWriteStructuredClone(JSContext* cx,
     }
   }
 
+#ifdef MOZ_NFC
+  MozNDEFRecord* ndefRecord;
+  if (NS_SUCCEEDED(UNWRAP_OBJECT(MozNDEFRecord, obj, ndefRecord))) {
+    return JS_WriteUint32Pair(writer, SCTAG_DOM_NFC_NDEF, 0) &&
+           ndefRecord->WriteStructuredClone(cx, writer);
+  }
+#endif // MOZ_NFC
+
   // Don't know what this is
   xpc::Throw(cx, NS_ERROR_DOM_DATA_CLONE_ERR);
   return false;