import changes from `dev' branch of rmottola/Arctic-Fox:

- Bug 1198230 - Respect FetchEvent.preventDefault(). r=jdm (acc8e103cf)
- Bug 1183813 - PushEvent.data should be same instance every time. r=smaug (4e74889cb6)
- Bug 1190478 - Hide PushEvent.data until we ship message encryption. r=mt,jst (16c158d76e)
- Bug 1144660 - Make KeepAliveHandler threadsafe refcounted. r=ehsan (77dde56da9)
- Bug 1191647 - Listen to clear-origin-data in ServiceWorkerManager.cpp. r=bkelly (eda9f683db)
- Bug 1189675 - Make all ServiceWorker events non cancelable. r=catalinb (10c9b30da1)
- Bug 1181056 - waitUntil() should throw if called when event is not dispatching. r=smaug (b0355e7571)
- Bug 1189644 - Update waitUntil() and activation to spec. r=catalinb (feef7f7963)
- Bug 1189668 - Expose GetUnfilteredUrl on InternalResponse. r=ehsan (ece8356282)
- Bug 942515 - Show Untrusted Connection Error for SHA-1-based SSL certificates with notBefore >= 2016-01-01 r=keeler (4ad8c1c58e)
- code style (279edb609a)
- style (3b6873d924)
- Bug 1203790 - Trigger a pre barrier when shrinking the initialized length of unboxed arrays, r=jandem. (d5bb7a710b)
- Bug 1205870 - Make sure all possible unboxed array inline capacities are accounted for, r=jandem. (694b1cbf8d)
- Bug 1193459 review follow-up: Copy the comment from TraceKind.h. DONTBUILD CLOSED TREE (d8b7d2a8c4)
- missing extern qualifier and some style (fd9f8899df)
- Bug 1200444 - Make JS::dbg::{IsDebugger,GetDebuggeeGlobals} handle CCWs; r=sfink (0e486daa82)
- Bug 1204790 - Prefer deleted function with public access specifiers instead of private in UniquePtr. r=nfroyd (d6796b1f4d)
- clean old comment (22b342cbe7)
- Bug 1165466 - Fix up docshell and loadcontext inheriting code in nsIScriptSecurityManager. r=bholley (478eb72ff4)
- Bug 1189235 - Use originAttribute for ServiceWorkerRegistrar. r=baku (b0c3f5e0a8)
- Bug 1203916 - Get rid of NS_DOMReadStructuredClone and NS_DOMWriteStructuredClone, r=smaug (0f56e93bbc)
- Bug 1163254 - Add signedPkg to OriginAttributes. r=bholley (c661f106e7)
- Bug 1168226 - ServiceWorkerRegistrar only use the scope when registering a service worker. r=baku (ddc3e393ac)
- Bug 1183894 - Remove warning if MessagePort::CloseInternal is called before start. r=khuey (3553d2091f)
- Bug 1204775 - SharedWorker.port should be a 'real' MessagePort, r=khuey (3ff36c45f5)
- Bug 1188776 - Remove appId/isInBrowserElement from BroadcastChannel. r=bholley (ee1f91cf09)
- Bug 1199265 - Correct actor for Blob in StructuredCloneHelper, r=khuey (c05b33d6d2)
- Bug 1196371 - Add a runtime assertion against illegal string characters in OriginAttributes suffix creation. r=janv,r=mystor (5ee44eec67)
- namespace style (d3c3738b42)
- Bug 871846 - Database changes for locale aware indexes. r=janv (185ecd2bcc)
- Bug 871846 - ICU usage and infrastructure bits. r=janv (5eabbaac22)
- remove strange hack (1169852a68)
- Bug 871846 - Handle locale aware indexes. r=janv (36f37c5e6f)
- Bug 871846 - Implement IDBLocaleAwareKeyRange. r=janv r=sicking (270ed240cc)
- Bug 871846 - Tests for locale aware indexes. r=janv (4eb2a168c8)
- Bug 1180978: Don't proceed with opening an invalidated database. r=janv,baku (54836535c6)
- Bug 1192023 - Use enum class instead of State_ prefix. r=khuey (8df8ed6b1a)
- Bug 871846 - API changes for locale aware indexes. r=janv r=sicking (75ce5c7bb6)

caps/nsScriptSecurityManager.cpp

@@ -1103,10 +1103,10 @@ nsScriptSecurityManager::
                                   nsILoadContext* aLoadContext,
                                   nsIPrincipal** aPrincipal)
 {
-  // XXXbholley - Make this more general in bug 1165466.
   OriginAttributes attrs;
-  aLoadContext->GetAppId(&attrs.mAppId);
-  aLoadContext->GetIsInBrowserElement(&attrs.mInBrowser);
+  bool result = attrs.CopyFromLoadContext(aLoadContext);
+  NS_ENSURE_TRUE(result, NS_ERROR_FAILURE);
+
   nsresult rv = MaybeSetAddonIdFromURI(attrs, aURI);
   NS_ENSURE_SUCCESS(rv, rv);
   nsCOMPtr<nsIPrincipal> prin = BasePrincipal::CreateCodebasePrincipal(aURI, attrs);
@@ -1119,8 +1119,11 @@ nsScriptSecurityManager::GetDocShellCodebasePrincipal(nsIURI* aURI,
                                                       nsIDocShell* aDocShell,
                                                       nsIPrincipal** aPrincipal)
 {
-  // XXXbholley - Make this more general in bug 1165466.
-  OriginAttributes attrs(aDocShell->GetAppId(), aDocShell->GetIsInBrowserElement());
+  OriginAttributes attrs;
+  nsDocShell* docShell= nsDocShell::Cast(aDocShell);
+  bool result = attrs.CopyFromLoadContext(docShell);
+  NS_ENSURE_TRUE(result, NS_ERROR_FAILURE);
+
   nsresult rv = MaybeSetAddonIdFromURI(attrs, aURI);
   NS_ENSURE_SUCCESS(rv, rv);
   nsCOMPtr<nsIPrincipal> prin = BasePrincipal::CreateCodebasePrincipal(aURI, attrs);