import change from rmottola/Arctic-Fox:

- Bug 1141392 - Disallow a line break between ArrowParameters and the arrow. (386dac894)
- Bug 1138651 - Enable CSS Scroll Snapping by Default on B2G. (2e416be93)
- Bug 1140623 - Correct mochitest failures that occur when the layout.css.scroll-snap.enabled preference is enabled (V3 Patch). (cfb1ccd33)
- Bug 1136467 - ServiceWorker: client.postMessage should land in navigator.serviceWorker.onmessage. (547bc9d03)
- Bug 1137419 - Use correct principal for update. (9b409bd5c)
- Bug 1137408 - Use inner window to create ServiceWorker for Fetch Event (11958cf2b)
-  Bug 1137250 - Fix incorrect initialization of Request object. (ec637ee57)
-  Bug 1139990 - Remove No activatingWorker warning. (49154e967)
- Bug 1058311 - Update client interface. Implement matchAll WindowClient. (cde7ba62a)
- Bug 1131353 - Make ServiceWorkerGlobalScope.close() throw InvalidAccessError; (0ec3f45d9)
- Bug 1137816 - Add a test for interfaces exposed to service workers; (19b5f9504)
- Bug 1137816 follow-up: Add WindowClient, added by bug 1058311 (ce6f0ba73)
- Bug 1141274 - Allocate shared workers and service workers from separate namespaces; (776221d45)
- Bug 1133763 - Part 1: Remember the security info associated with HTTP fetches and record it inside InternalResponse; (fec70ad02)
- Bug 1133763 - Part 2: Transfer the security info associated with an InternalResponse across the IPC layer (e7192f129)
-  Bug 1133763 - Part 3: Wipe out the cache directory when detecting a change in the DB schema; (82d81819a)
- Bug 1133763 - Part 4: Store the response's security info in the cache database; (426e94e4b)
- Bug 1133763 - Part 5: Allow the security info on intercepted HTTP channels to be overridden (4d079bf92)
- Bug 1133763 - Part 6: Set the correct security info on intercepted channels when using the respondWith API (83e2b2a7d)
- Bug 1133763 - Part 7: Add automated tests for using FetchEvent.respondWith on an HTTPS request (e0ee10e17)
- Bug 1133763 - Part 8: Ensure that FetchEvent.respondWith works correctly on HTTPS requests with a cloned response (0db13351e)
- Bug 1139425 - Service Worker Client uuid tests. (480b262ed)
- Bug 1139425 - Service Worker Client id should return a DOMString uuid. (8b9ea176d)
- Bug 1142853 - Add caret resources to package-manifest.in. (7e1a59681)

dom/cache/TypeUtils.cpp

@@ -233,6 +233,7 @@ TypeUtils::ToPCacheResponseWithoutBody(PCacheResponse& aOut,
   MOZ_ASSERT(headers);
   headers->GetPHeaders(aOut.headers());
   aOut.headersGuard() = headers->Guard();
+  aOut.securityInfo() = aIn.GetSecurityInfo();
 }
 
 void
@@ -319,6 +320,8 @@ TypeUtils::ToResponse(const PCacheResponse& aIn)
   ir->Headers()->Fill(*internalHeaders, result);
   MOZ_ASSERT(!result.Failed());
 
+  ir->SetSecurityInfo(aIn.securityInfo());
+
   nsCOMPtr<nsIInputStream> stream = ReadStream::Create(aIn.body());
   ir->SetBody(stream);