Bug 1350254 part 8. Switch CryptoKey to [Serializable]. r=baku

The spec doesn't say to do this, but I think we should.  See
w3c/webcrypto#222

Differential Revision: https://phabricator.services.mozilla.com/D35722

UltraBlame original commit: e02c73e7bd4bed108e60527f81fb8af00e361bb6

dom/base/StructuredCloneHolder.cpp

@@ -50,17 +50,6 @@ mozilla
 /
 dom
 /
-CryptoKey
-.
-h
-"
-#
-include
-"
-mozilla
-/
-dom
-/
 StructuredCloneBlob
 .
 h
@@ -248,17 +237,6 @@ mozilla
 /
 dom
 /
-SubtleCryptoBinding
-.
-h
-"
-#
-include
-"
-mozilla
-/
-dom
-/
 ToJSValue
 .
 h
@@ -292,17 +270,6 @@ mozilla
 /
 dom
 /
-WebCryptoCommon
-.
-h
-"
-#
-include
-"
-mozilla
-/
-dom
-/
 WebIDLSerializable
 .
 h
@@ -785,7 +752,7 @@ SCTAG_DOM_DOMPOINTREADONLY
 0xffff8009
 &
 &
-SCTAG_DOM_WEBCRYPTO_KEY
+SCTAG_DOM_CRYPTOKEY
 =
 =
 0xffff800a
@@ -1896,12 +1863,6 @@ if
 aTag
 =
 =
-SCTAG_DOM_WEBCRYPTO_KEY
-|
-|
-aTag
-=
-=
 SCTAG_DOM_URLSEARCHPARAMS
 )
 {
@@ -1924,59 +1885,6 @@ if
 aTag
 =
 =
-SCTAG_DOM_WEBCRYPTO_KEY
-)
-{
-RefPtr
-<
-CryptoKey
->
-key
-=
-new
-CryptoKey
-(
-global
-)
-;
-if
-(
-!
-key
--
->
-ReadStructuredClone
-(
-aReader
-)
-)
-{
-result
-=
-nullptr
-;
-}
-else
-{
-result
-=
-key
--
->
-WrapObject
-(
-aCx
-nullptr
-)
-;
-}
-}
-else
-if
-(
-aTag
-=
-=
 SCTAG_DOM_URLSEARCHPARAMS
 )
 {
@@ -2434,46 +2342,6 @@ aWriter
 ;
 }
 }
-{
-CryptoKey
-*
-key
-=
-nullptr
-;
-if
-(
-NS_SUCCEEDED
-(
-UNWRAP_OBJECT
-(
-CryptoKey
-&
-obj
-key
-)
-)
-)
-{
-return
-JS_WriteUint32Pair
-(
-aWriter
-SCTAG_DOM_WEBCRYPTO_KEY
-0
-)
-&
-&
-key
--
->
-WriteStructuredClone
-(
-aWriter
-)
-;
-}
-}
 #
 ifdef
 MOZ_WEBRTC

dom/base/StructuredCloneTags.h

@@ -34,7 +34,7 @@ SCTAG_DOM_WASM
 SCTAG_DOM_IMAGEDATA
 SCTAG_DOM_DOMPOINT
 SCTAG_DOM_DOMPOINTREADONLY
-SCTAG_DOM_WEBCRYPTO_KEY
+SCTAG_DOM_CRYPTOKEY
 SCTAG_DOM_NULL_PRINCIPAL
 SCTAG_DOM_SYSTEM_PRINCIPAL
 SCTAG_DOM_CONTENT_PRINCIPAL

dom/crypto/CryptoKey.cpp

@@ -5950,6 +5950,9 @@ CryptoKey
 :
 WriteStructuredClone
 (
+JSContext
+*
+aCX
 JSStructuredCloneWriter
 *
 aWriter
@@ -6056,12 +6059,21 @@ aWriter
 )
 ;
 }
-bool
+already_AddRefed
+<
+CryptoKey
+>
 CryptoKey
 :
 :
 ReadStructuredClone
 (
+JSContext
+*
+aCx
+nsIGlobalObject
+*
+aGlobal
 JSStructuredCloneReader
 *
 aReader
@@ -6076,9 +6088,21 @@ EnsureNSSInitializedChromeOrContent
 )
 {
 return
-false
+nullptr
 ;
 }
+RefPtr
+<
+CryptoKey
+>
+key
+=
+new
+CryptoKey
+(
+aGlobal
+)
+;
 uint32_t
 version
 ;
@@ -6094,6 +6118,9 @@ JS_ReadUint32Pair
 (
 aReader
 &
+key
+-
+>
 mAttributes
 &
 version
@@ -6129,6 +6156,9 @@ pub
 )
 &
 &
+key
+-
+>
 mAlgorithm
 .
 ReadStructuredClone
@@ -6143,7 +6173,7 @@ read
 )
 {
 return
-false
+nullptr
 ;
 }
 if
@@ -6158,6 +6188,9 @@ Length
 &
 &
 !
+key
+-
+>
 mSymKey
 .
 Assign
@@ -6167,7 +6200,7 @@ sym
 )
 {
 return
-false
+nullptr
 ;
 }
 if
@@ -6181,6 +6214,9 @@ Length
 0
 )
 {
+key
+-
+>
 mPrivateKey
 =
 CryptoKey
@@ -6203,6 +6239,9 @@ Length
 0
 )
 {
+key
+-
+>
 mPublicKey
 =
 CryptoKey
@@ -6219,6 +6258,9 @@ if
 !
 (
 (
+key
+-
+>
 GetKeyType
 (
 )
@@ -6227,6 +6269,9 @@ GetKeyType
 SECRET
 &
 &
+key
+-
+>
 mSymKey
 .
 Length
@@ -6238,6 +6283,9 @@ Length
 |
 |
 (
+key
+-
+>
 GetKeyType
 (
 )
@@ -6246,11 +6294,17 @@ GetKeyType
 PRIVATE
 &
 &
+key
+-
+>
 mPrivateKey
 )
 |
 |
 (
+key
+-
+>
 GetKeyType
 (
 )
@@ -6259,17 +6313,24 @@ GetKeyType
 PUBLIC
 &
 &
+key
+-
+>
 mPublicKey
 )
 )
 )
 {
 return
-false
+nullptr
 ;
 }
 return
-true
+key
+.
+forget
+(
+)
 ;
 }
 }