Rename Key to CryptoKey

https://bugs.webkit.org/show_bug.cgi?id=161665
<rdar://problem/28083391>

Reviewed by Brent Fulgham.

LayoutTests/imported/w3c:

* WebCryptoAPI/idlharness-expected.txt:

Source/WebCore:

A link to the spec: https://www.w3.org/TR/WebCryptoAPI/#cryptokey-interface

* crypto/CryptoKey.idl:
Remove some unnecessary IDL attributes and reorder KeyType enum to match the spec.
* crypto/CryptoKeyType.h:

LayoutTests:

* crypto/subtle/aes-cbc-unwrap-rsa-expected.txt:
* crypto/subtle/aes-cbc-unwrap-rsa.html:
* crypto/subtle/aes-kw-key-manipulation-expected.txt:
* crypto/subtle/aes-kw-key-manipulation.html:
* crypto/subtle/aes-kw-wrap-unwrap-aes-expected.txt:
* crypto/subtle/aes-kw-wrap-unwrap-aes.html:
* crypto/subtle/rsa-oaep-wrap-unwrap-aes-expected.txt:
* crypto/subtle/rsa-oaep-wrap-unwrap-aes.html:
* crypto/subtle/rsaes-pkcs1-v1_5-wrap-unwrap-aes-expected.txt:
* crypto/subtle/rsaes-pkcs1-v1_5-wrap-unwrap-aes.html:
* crypto/subtle/rsassa-pkcs1-v1_5-import-jwk-expected.txt:
* crypto/subtle/rsassa-pkcs1-v1_5-import-jwk.html:
* platform/mac/js/dom/global-constructors-attributes-expected.txt:
* platform/mac-yosemite/js/dom/global-constructors-attributes-expected.txt:

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@205755 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 268c0e7..97312a2 100644 (file)
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,26 @@
+2016-09-09  Jiewen Tan  <jiewen_tan@apple.com>
+
+        Rename Key to CryptoKey
+        https://bugs.webkit.org/show_bug.cgi?id=161665
+        <rdar://problem/28083391>
+
+        Reviewed by Brent Fulgham.
+
+        * crypto/subtle/aes-cbc-unwrap-rsa-expected.txt:
+        * crypto/subtle/aes-cbc-unwrap-rsa.html:
+        * crypto/subtle/aes-kw-key-manipulation-expected.txt:
+        * crypto/subtle/aes-kw-key-manipulation.html:
+        * crypto/subtle/aes-kw-wrap-unwrap-aes-expected.txt:
+        * crypto/subtle/aes-kw-wrap-unwrap-aes.html:
+        * crypto/subtle/rsa-oaep-wrap-unwrap-aes-expected.txt:
+        * crypto/subtle/rsa-oaep-wrap-unwrap-aes.html:
+        * crypto/subtle/rsaes-pkcs1-v1_5-wrap-unwrap-aes-expected.txt:
+        * crypto/subtle/rsaes-pkcs1-v1_5-wrap-unwrap-aes.html:
+        * crypto/subtle/rsassa-pkcs1-v1_5-import-jwk-expected.txt:
+        * crypto/subtle/rsassa-pkcs1-v1_5-import-jwk.html:
+        * platform/mac/js/dom/global-constructors-attributes-expected.txt:
+        * platform/mac-yosemite/js/dom/global-constructors-attributes-expected.txt:
+
 2016-09-09  Youenn Fablet  <youenn@apple.com>
 
         TextTrackLoader should use FetchOptions::mode according its crossOrigin attribute

diff --git a/LayoutTests/crypto/subtle/aes-cbc-unwrap-rsa-expected.txt b/LayoutTests/crypto/subtle/aes-cbc-unwrap-rsa-expected.txt
index 3e01c11..97510a4 100644 (file)
--- a/LayoutTests/crypto/subtle/aes-cbc-unwrap-rsa-expected.txt
+++ b/LayoutTests/crypto/subtle/aes-cbc-unwrap-rsa-expected.txt
@@ -6,7 +6,7 @@ On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE
 Importing an unwrapping key...
 PASS unwrappingKey.algorithm.name is 'AES-CBC'
 Unwrapping a key...
-PASS unwrappedKey.toString() is '[object Key]'
+PASS unwrappedKey.toString() is '[object CryptoKey]'
 PASS unwrappedKey.type is 'public'
 PASS unwrappedKey.usages is ['sign','verify']
 PASS unwrappedKey.algorithm.name is 'RSASSA-PKCS1-v1_5'

diff --git a/LayoutTests/crypto/subtle/aes-cbc-unwrap-rsa.html b/LayoutTests/crypto/subtle/aes-cbc-unwrap-rsa.html
index 0dd73af..f2f8563 100644 (file)
--- a/LayoutTests/crypto/subtle/aes-cbc-unwrap-rsa.html
+++ b/LayoutTests/crypto/subtle/aes-cbc-unwrap-rsa.html
@@ -38,7 +38,7 @@ crypto.subtle.importKey("raw", unwrappingKeyOctets, "AES-CBC", nonExtractable, [
 }).then(function(result) {
     unwrappedKey = result;
 
-    shouldBe("unwrappedKey.toString()", "'[object Key]'");
+    shouldBe("unwrappedKey.toString()", "'[object CryptoKey]'");
     shouldBe("unwrappedKey.type", "'public'");
     shouldBe("unwrappedKey.usages", "['sign','verify']");
     shouldBe("unwrappedKey.algorithm.name", "'RSASSA-PKCS1-v1_5'");

diff --git a/LayoutTests/crypto/subtle/aes-kw-key-manipulation-expected.txt b/LayoutTests/crypto/subtle/aes-kw-key-manipulation-expected.txt
index 4cebf30..fc4b534 100644 (file)
--- a/LayoutTests/crypto/subtle/aes-kw-key-manipulation-expected.txt
+++ b/LayoutTests/crypto/subtle/aes-kw-key-manipulation-expected.txt
@@ -4,7 +4,7 @@ On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE
 
 
 Generating a key...
-PASS key.toString() is '[object Key]'
+PASS key.toString() is '[object CryptoKey]'
 PASS key.type is 'secret'
 PASS key.algorithm.name is 'AES-KW'
 PASS key.algorithm.length is 256
@@ -15,7 +15,7 @@ PASS crypto.subtle.encrypt({name: "aes-cbc", iv: iv}, key, hexStringToUint8Array
 Exporting the key to raw...
 PASS exportedKey.toString() is '[object ArrayBuffer]'
 Importing it back...
-PASS importedKey.toString() is '[object Key]'
+PASS importedKey.toString() is '[object CryptoKey]'
 PASS importedKey.type is 'secret'
 PASS importedKey.algorithm.name is 'AES-KW'
 PASS importedKey.algorithm.length is 256

diff --git a/LayoutTests/crypto/subtle/aes-kw-key-manipulation.html b/LayoutTests/crypto/subtle/aes-kw-key-manipulation.html
index 11c0ecb..ee3f29d 100644 (file)
--- a/LayoutTests/crypto/subtle/aes-kw-key-manipulation.html
+++ b/LayoutTests/crypto/subtle/aes-kw-key-manipulation.html
@@ -18,7 +18,7 @@ var extractable = true;
 debug("Generating a key...");
 crypto.subtle.generateKey({name: "aes-kw", length: 256}, extractable, ["encrypt", "decrypt", "wrapKey", "unwrapKey"]).then(function(result) {
     key = result;
-    shouldBe("key.toString()", "'[object Key]'");
+    shouldBe("key.toString()", "'[object CryptoKey]'");
     shouldBe("key.type", "'secret'");
     shouldBe("key.algorithm.name", "'AES-KW'");
     shouldBe("key.algorithm.length", "256");
@@ -37,7 +37,7 @@ crypto.subtle.generateKey({name: "aes-kw", length: 256}, extractable, ["encrypt"
 }).then(function(result) {
     importedKey = result;
 
-    shouldBe("importedKey.toString()", "'[object Key]'");
+    shouldBe("importedKey.toString()", "'[object CryptoKey]'");
     shouldBe("importedKey.type", "'secret'");
     shouldBe("importedKey.algorithm.name", "'AES-KW'");
     shouldBe("importedKey.algorithm.length", "256");

diff --git a/LayoutTests/crypto/subtle/aes-kw-wrap-unwrap-aes-expected.txt b/LayoutTests/crypto/subtle/aes-kw-wrap-unwrap-aes-expected.txt
index 44ee205..322f714 100644 (file)
--- a/LayoutTests/crypto/subtle/aes-kw-wrap-unwrap-aes-expected.txt
+++ b/LayoutTests/crypto/subtle/aes-kw-wrap-unwrap-aes-expected.txt
@@ -8,7 +8,7 @@ Importing a key to be wrapped...
 Wrapping it...
 PASS bytesToHexString(wrappedKey) is '1fa68b0a8112b447aef34bd8fb5a7b829d3e862371d2cfe5'
 Unwrapping it...
-PASS unwrappedKey.toString() is '[object Key]'
+PASS unwrappedKey.toString() is '[object CryptoKey]'
 PASS unwrappedKey.type is 'secret'
 PASS unwrappedKey.extractable is true
 PASS unwrappedKey.algorithm.name is 'AES-CBC'

diff --git a/LayoutTests/crypto/subtle/aes-kw-wrap-unwrap-aes.html b/LayoutTests/crypto/subtle/aes-kw-wrap-unwrap-aes.html
index ec7ee2f..e924f9d 100644 (file)
--- a/LayoutTests/crypto/subtle/aes-kw-wrap-unwrap-aes.html
+++ b/LayoutTests/crypto/subtle/aes-kw-wrap-unwrap-aes.html
@@ -36,7 +36,7 @@ crypto.subtle.importKey("raw", kekData, "aes-kw", extractable, ["wrapKey", "unwr
     return crypto.subtle.unwrapKey("raw", wrappedKey, kek, "aes-kw", "aes-cbc", extractable, ["encrypt", "decrypt", "wrapKey", "unwrapKey"]);
 }).then(function(result) {
     unwrappedKey = result;
-    shouldBe("unwrappedKey.toString()", "'[object Key]'");
+    shouldBe("unwrappedKey.toString()", "'[object CryptoKey]'");
     shouldBe("unwrappedKey.type", "'secret'");
     shouldBe("unwrappedKey.extractable", "true");
     shouldBe("unwrappedKey.algorithm.name", "'AES-CBC'");

diff --git a/LayoutTests/crypto/subtle/rsa-oaep-wrap-unwrap-aes-expected.txt b/LayoutTests/crypto/subtle/rsa-oaep-wrap-unwrap-aes-expected.txt
index 3f958d6..99150d1 100644 (file)
--- a/LayoutTests/crypto/subtle/rsa-oaep-wrap-unwrap-aes-expected.txt
+++ b/LayoutTests/crypto/subtle/rsa-oaep-wrap-unwrap-aes-expected.txt
@@ -8,7 +8,7 @@ Importing an AES key...
 Wrapping it...
 PASS wrappedKey.toString() is '[object ArrayBuffer]'
 Unwrapping it...
-PASS unwrappedKey.toString() is '[object Key]'
+PASS unwrappedKey.toString() is '[object CryptoKey]'
 PASS unwrappedKey.type is 'secret'
 PASS unwrappedKey.extractable is true
 PASS unwrappedKey.algorithm.name is 'AES-CBC'
@@ -20,7 +20,7 @@ PASS bytesToHexString(unwrappedKeyData) is bytesToHexString(aesKeyData)
 Wrapping the same key as JWK...
 PASS wrappedKey.toString() is '[object ArrayBuffer]'
 Unwrapping it...
-PASS unwrappedKey.toString() is '[object Key]'
+PASS unwrappedKey.toString() is '[object CryptoKey]'
 PASS unwrappedKey.type is 'secret'
 PASS unwrappedKey.extractable is true
 PASS unwrappedKey.algorithm.name is 'AES-CBC'

diff --git a/LayoutTests/crypto/subtle/rsa-oaep-wrap-unwrap-aes.html b/LayoutTests/crypto/subtle/rsa-oaep-wrap-unwrap-aes.html
index 13e65c5..5899a66 100644 (file)
--- a/LayoutTests/crypto/subtle/rsa-oaep-wrap-unwrap-aes.html
+++ b/LayoutTests/crypto/subtle/rsa-oaep-wrap-unwrap-aes.html
@@ -59,7 +59,7 @@ crypto.subtle.importKey("jwk", asciiToUint8Array(JSON.stringify(publicKeyJSON)),
     return crypto.subtle.unwrapKey("raw", wrappedKey, privateKey, wrapAlgorithm, "aes-cbc", extractable, ["encrypt", "decrypt"]);
 }).then(function(result) {
     unwrappedKey = result;
-    shouldBe("unwrappedKey.toString()", "'[object Key]'");
+    shouldBe("unwrappedKey.toString()", "'[object CryptoKey]'");
     shouldBe("unwrappedKey.type", "'secret'");
     shouldBe("unwrappedKey.extractable", "true");
     shouldBe("unwrappedKey.algorithm.name", "'AES-CBC'");
@@ -82,7 +82,7 @@ crypto.subtle.importKey("jwk", asciiToUint8Array(JSON.stringify(publicKeyJSON)),
     return crypto.subtle.unwrapKey("jwk", wrappedKey, privateKey, wrapAlgorithm, "aes-cbc", extractable, ["encrypt", "decrypt"]);
 }).then(function(result) {
     unwrappedKey = result;
-    shouldBe("unwrappedKey.toString()", "'[object Key]'");
+    shouldBe("unwrappedKey.toString()", "'[object CryptoKey]'");
     shouldBe("unwrappedKey.type", "'secret'");
     shouldBe("unwrappedKey.extractable", "true");
     shouldBe("unwrappedKey.algorithm.name", "'AES-CBC'");

diff --git a/LayoutTests/crypto/subtle/rsaes-pkcs1-v1_5-wrap-unwrap-aes-expected.txt b/LayoutTests/crypto/subtle/rsaes-pkcs1-v1_5-wrap-unwrap-aes-expected.txt
index 26b4416..278904d 100644 (file)
--- a/LayoutTests/crypto/subtle/rsaes-pkcs1-v1_5-wrap-unwrap-aes-expected.txt
+++ b/LayoutTests/crypto/subtle/rsaes-pkcs1-v1_5-wrap-unwrap-aes-expected.txt
@@ -8,7 +8,7 @@ Importing an AES key...
 Wrapping it...
 PASS wrappedKey.toString() is '[object ArrayBuffer]'
 Unwrapping it...
-PASS unwrappedKey.toString() is '[object Key]'
+PASS unwrappedKey.toString() is '[object CryptoKey]'
 PASS unwrappedKey.type is 'secret'
 PASS unwrappedKey.extractable is true
 PASS unwrappedKey.algorithm.name is 'AES-CBC'
@@ -20,7 +20,7 @@ PASS bytesToHexString(unwrappedKeyData) is bytesToHexString(aesKeyData)
 Wrapping the same key as JWK...
 PASS wrappedKey.toString() is '[object ArrayBuffer]'
 Unwrapping it...
-PASS unwrappedKey.toString() is '[object Key]'
+PASS unwrappedKey.toString() is '[object CryptoKey]'
 PASS unwrappedKey.type is 'secret'
 PASS unwrappedKey.extractable is true
 PASS unwrappedKey.algorithm.name is 'AES-CBC'

diff --git a/LayoutTests/crypto/subtle/rsaes-pkcs1-v1_5-wrap-unwrap-aes.html b/LayoutTests/crypto/subtle/rsaes-pkcs1-v1_5-wrap-unwrap-aes.html
index 8ffa81c..6a0c3b9 100644 (file)
--- a/LayoutTests/crypto/subtle/rsaes-pkcs1-v1_5-wrap-unwrap-aes.html
+++ b/LayoutTests/crypto/subtle/rsaes-pkcs1-v1_5-wrap-unwrap-aes.html
@@ -59,7 +59,7 @@ crypto.subtle.importKey("jwk", asciiToUint8Array(JSON.stringify(publicKeyJSON)),
     return crypto.subtle.unwrapKey("raw", wrappedKey, privateKey, wrapAlgorithm, "aes-cbc", extractable, ["encrypt", "decrypt"]);
 }).then(function(result) {
     unwrappedKey = result;
-    shouldBe("unwrappedKey.toString()", "'[object Key]'");
+    shouldBe("unwrappedKey.toString()", "'[object CryptoKey]'");
     shouldBe("unwrappedKey.type", "'secret'");
     shouldBe("unwrappedKey.extractable", "true");
     shouldBe("unwrappedKey.algorithm.name", "'AES-CBC'");
@@ -82,7 +82,7 @@ crypto.subtle.importKey("jwk", asciiToUint8Array(JSON.stringify(publicKeyJSON)),
     return crypto.subtle.unwrapKey("jwk", wrappedKey, privateKey, wrapAlgorithm, "aes-cbc", extractable, ["encrypt", "decrypt"]);
 }).then(function(result) {
     unwrappedKey = result;
-    shouldBe("unwrappedKey.toString()", "'[object Key]'");
+    shouldBe("unwrappedKey.toString()", "'[object CryptoKey]'");
     shouldBe("unwrappedKey.type", "'secret'");
     shouldBe("unwrappedKey.extractable", "true");
     shouldBe("unwrappedKey.algorithm.name", "'AES-CBC'");

diff --git a/LayoutTests/crypto/subtle/rsassa-pkcs1-v1_5-import-jwk-expected.txt b/LayoutTests/crypto/subtle/rsassa-pkcs1-v1_5-import-jwk-expected.txt
index b2ccb47..4d46fd5 100644 (file)
--- a/LayoutTests/crypto/subtle/rsassa-pkcs1-v1_5-import-jwk-expected.txt
+++ b/LayoutTests/crypto/subtle/rsassa-pkcs1-v1_5-import-jwk-expected.txt
@@ -4,7 +4,7 @@ On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE
 
 
 Importing a public key...
-PASS publicKey.toString() is '[object Key]'
+PASS publicKey.toString() is '[object CryptoKey]'
 PASS publicKey.type is 'public'
 PASS publicKey.usages is ['sign','verify']
 PASS publicKey.algorithm.name is 'RSASSA-PKCS1-v1_5'
@@ -13,7 +13,7 @@ PASS bytesToHexString(publicKey.algorithm.publicExponent) is '010001'
 PASS publicKey.algorithm.hash.name is 'SHA-256'
 
 Importing a private key...
-PASS privateKey.toString() is '[object Key]'
+PASS privateKey.toString() is '[object CryptoKey]'
 PASS privateKey.type is 'private'
 PASS privateKey.usages is ['sign','verify']
 PASS privateKey.algorithm.name is 'RSASSA-PKCS1-v1_5'

diff --git a/LayoutTests/crypto/subtle/rsassa-pkcs1-v1_5-import-jwk.html b/LayoutTests/crypto/subtle/rsassa-pkcs1-v1_5-import-jwk.html
index b7be87f..577f831 100644 (file)
--- a/LayoutTests/crypto/subtle/rsassa-pkcs1-v1_5-import-jwk.html
+++ b/LayoutTests/crypto/subtle/rsassa-pkcs1-v1_5-import-jwk.html
@@ -38,7 +38,7 @@ var privateKeyJSON = {
 debug("Importing a public key...");
 crypto.subtle.importKey("jwk", asciiToUint8Array(JSON.stringify(publicKeyJSON)), null, extractable, ["sign", "verify"]).then(function(result) {
     publicKey = result;
-    shouldBe("publicKey.toString()", "'[object Key]'");
+    shouldBe("publicKey.toString()", "'[object CryptoKey]'");
     shouldBe("publicKey.type", "'public'");
     shouldBe("publicKey.usages", "['sign','verify']");
     shouldBe("publicKey.algorithm.name", "'RSASSA-PKCS1-v1_5'");
@@ -49,7 +49,7 @@ crypto.subtle.importKey("jwk", asciiToUint8Array(JSON.stringify(publicKeyJSON)),
     return crypto.subtle.importKey("jwk", asciiToUint8Array(JSON.stringify(privateKeyJSON)), null, extractable, ["sign", "verify"]);
 }).then(function(result) {
     privateKey = result;
-    shouldBe("privateKey.toString()", "'[object Key]'");
+    shouldBe("privateKey.toString()", "'[object CryptoKey]'");
     shouldBe("privateKey.type", "'private'");
     shouldBe("privateKey.usages", "['sign','verify']");
     shouldBe("privateKey.algorithm.name", "'RSASSA-PKCS1-v1_5'");

diff --git a/LayoutTests/imported/w3c/ChangeLog b/LayoutTests/imported/w3c/ChangeLog
index a5967c4..ac4132e 100644 (file)
--- a/LayoutTests/imported/w3c/ChangeLog
+++ b/LayoutTests/imported/w3c/ChangeLog
@@ -1,3 +1,13 @@
+2016-09-09  Jiewen Tan  <jiewen_tan@apple.com>
+
+        Rename Key to CryptoKey
+        https://bugs.webkit.org/show_bug.cgi?id=161665
+        <rdar://problem/28083391>
+
+        Reviewed by Brent Fulgham.
+
+        * WebCryptoAPI/idlharness-expected.txt:
+
 2016-09-09  Youenn Fablet  <youenn@apple.com>
 
         TextTrackLoader should use FetchOptions::mode according its crossOrigin attribute

diff --git a/LayoutTests/imported/w3c/WebCryptoAPI/idlharness-expected.txt b/LayoutTests/imported/w3c/WebCryptoAPI/idlharness-expected.txt
index aac86ae..d1479ab 100644 (file)
--- a/LayoutTests/imported/w3c/WebCryptoAPI/idlharness-expected.txt
+++ b/LayoutTests/imported/w3c/WebCryptoAPI/idlharness-expected.txt
@@ -15,15 +15,15 @@ PASS Stringification of crypto
 FAIL Crypto interface: crypto must inherit property "subtle" with the proper type (0) assert_inherits: property "subtle" not found in prototype chain
 PASS Crypto interface: crypto must inherit property "getRandomValues" with the proper type (1) 
 PASS Crypto interface: calling getRandomValues(ArrayBufferView) on crypto with too few arguments must throw TypeError 
-FAIL CryptoKey interface: existence and properties of interface object assert_own_property: self does not have own property "CryptoKey" expected property "CryptoKey" missing
-FAIL CryptoKey interface object length assert_own_property: self does not have own property "CryptoKey" expected property "CryptoKey" missing
-FAIL CryptoKey interface object name assert_own_property: self does not have own property "CryptoKey" expected property "CryptoKey" missing
-FAIL CryptoKey interface: existence and properties of interface prototype object assert_own_property: self does not have own property "CryptoKey" expected property "CryptoKey" missing
-FAIL CryptoKey interface: existence and properties of interface prototype object's "constructor" property assert_own_property: self does not have own property "CryptoKey" expected property "CryptoKey" missing
-FAIL CryptoKey interface: attribute type assert_own_property: self does not have own property "CryptoKey" expected property "CryptoKey" missing
-FAIL CryptoKey interface: attribute extractable assert_own_property: self does not have own property "CryptoKey" expected property "CryptoKey" missing
-FAIL CryptoKey interface: attribute algorithm assert_own_property: self does not have own property "CryptoKey" expected property "CryptoKey" missing
-FAIL CryptoKey interface: attribute usages assert_own_property: self does not have own property "CryptoKey" expected property "CryptoKey" missing
+PASS CryptoKey interface: existence and properties of interface object 
+PASS CryptoKey interface object length 
+PASS CryptoKey interface object name 
+PASS CryptoKey interface: existence and properties of interface prototype object 
+PASS CryptoKey interface: existence and properties of interface prototype object's "constructor" property 
+PASS CryptoKey interface: attribute type 
+PASS CryptoKey interface: attribute extractable 
+PASS CryptoKey interface: attribute algorithm 
+PASS CryptoKey interface: attribute usages 
 FAIL SubtleCrypto interface: existence and properties of interface object assert_own_property: self does not have own property "SubtleCrypto" expected property "SubtleCrypto" missing
 FAIL SubtleCrypto interface object length assert_own_property: self does not have own property "SubtleCrypto" expected property "SubtleCrypto" missing
 FAIL SubtleCrypto interface object name assert_own_property: self does not have own property "SubtleCrypto" expected property "SubtleCrypto" missing

diff --git a/LayoutTests/platform/mac-yosemite/js/dom/global-constructors-attributes-expected.txt b/LayoutTests/platform/mac-yosemite/js/dom/global-constructors-attributes-expected.txt
index e7051a1..0e55812 100644 (file)
--- a/LayoutTests/platform/mac-yosemite/js/dom/global-constructors-attributes-expected.txt
+++ b/LayoutTests/platform/mac-yosemite/js/dom/global-constructors-attributes-expected.txt
@@ -298,6 +298,11 @@ PASS Object.getOwnPropertyDescriptor(global, 'Crypto').hasOwnProperty('get') is
 PASS Object.getOwnPropertyDescriptor(global, 'Crypto').hasOwnProperty('set') is false
 PASS Object.getOwnPropertyDescriptor(global, 'Crypto').enumerable is false
 PASS Object.getOwnPropertyDescriptor(global, 'Crypto').configurable is true
+PASS Object.getOwnPropertyDescriptor(global, 'CryptoKey').value is CryptoKey
+PASS Object.getOwnPropertyDescriptor(global, 'CryptoKey').hasOwnProperty('get') is false
+PASS Object.getOwnPropertyDescriptor(global, 'CryptoKey').hasOwnProperty('set') is false
+PASS Object.getOwnPropertyDescriptor(global, 'CryptoKey').enumerable is false
+PASS Object.getOwnPropertyDescriptor(global, 'CryptoKey').configurable is true
 PASS Object.getOwnPropertyDescriptor(global, 'CustomElementRegistry').value is CustomElementRegistry
 PASS Object.getOwnPropertyDescriptor(global, 'CustomElementRegistry').hasOwnProperty('get') is false
 PASS Object.getOwnPropertyDescriptor(global, 'CustomElementRegistry').hasOwnProperty('set') is false

diff --git a/LayoutTests/platform/mac/js/dom/global-constructors-attributes-expected.txt b/LayoutTests/platform/mac/js/dom/global-constructors-attributes-expected.txt
index d63b65f..c5894d5 100644 (file)
--- a/LayoutTests/platform/mac/js/dom/global-constructors-attributes-expected.txt
+++ b/LayoutTests/platform/mac/js/dom/global-constructors-attributes-expected.txt
@@ -298,6 +298,11 @@ PASS Object.getOwnPropertyDescriptor(global, 'Crypto').hasOwnProperty('get') is
 PASS Object.getOwnPropertyDescriptor(global, 'Crypto').hasOwnProperty('set') is false
 PASS Object.getOwnPropertyDescriptor(global, 'Crypto').enumerable is false
 PASS Object.getOwnPropertyDescriptor(global, 'Crypto').configurable is true
+PASS Object.getOwnPropertyDescriptor(global, 'CryptoKey').value is CryptoKey
+PASS Object.getOwnPropertyDescriptor(global, 'CryptoKey').hasOwnProperty('get') is false
+PASS Object.getOwnPropertyDescriptor(global, 'CryptoKey').hasOwnProperty('set') is false
+PASS Object.getOwnPropertyDescriptor(global, 'CryptoKey').enumerable is false
+PASS Object.getOwnPropertyDescriptor(global, 'CryptoKey').configurable is true
 PASS Object.getOwnPropertyDescriptor(global, 'CustomElementRegistry').value is CustomElementRegistry
 PASS Object.getOwnPropertyDescriptor(global, 'CustomElementRegistry').hasOwnProperty('get') is false
 PASS Object.getOwnPropertyDescriptor(global, 'CustomElementRegistry').hasOwnProperty('set') is false

diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
index 8ffcdb1..21c616c 100644 (file)
--- a/Source/WebCore/ChangeLog
+++ b/Source/WebCore/ChangeLog
@@ -1,3 +1,17 @@
+2016-09-09  Jiewen Tan  <jiewen_tan@apple.com>
+
+        Rename Key to CryptoKey
+        https://bugs.webkit.org/show_bug.cgi?id=161665
+        <rdar://problem/28083391>
+
+        Reviewed by Brent Fulgham.
+
+        A link to the spec: https://www.w3.org/TR/WebCryptoAPI/#cryptokey-interface
+
+        * crypto/CryptoKey.idl:
+        Remove some unnecessary IDL attributes and reorder KeyType enum to match the spec.
+        * crypto/CryptoKeyType.h:
+
 2016-09-09  Alex Christensen  <achristensen@webkit.org>
 
         URLParser: Handle \ in path according to spec

diff --git a/Source/WebCore/crypto/CryptoKey.idl b/Source/WebCore/crypto/CryptoKey.idl
index 1289240..c4f1c3c 100644 (file)
--- a/Source/WebCore/crypto/CryptoKey.idl
+++ b/Source/WebCore/crypto/CryptoKey.idl
@@ -24,9 +24,9 @@
  */
 
 enum KeyType {
-    "secret",
     "public",
-    "private"
+    "private",
+    "secret"
 };
 
 enum KeyUsage {
@@ -43,8 +43,6 @@ enum KeyUsage {
 [
     Conditional=SUBTLE_CRYPTO,
     GenerateIsReachable=Impl,
-    InterfaceName=Key,
-    NoInterfaceObject,
     SkipVTableValidation
 ] interface CryptoKey {
     readonly attribute KeyType type;

diff --git a/Source/WebCore/crypto/CryptoKeyType.h b/Source/WebCore/crypto/CryptoKeyType.h
index f76ad39..06c7620 100644 (file)
--- a/Source/WebCore/crypto/CryptoKeyType.h
+++ b/Source/WebCore/crypto/CryptoKeyType.h
@@ -31,9 +31,9 @@
 namespace WebCore {
 
 enum class CryptoKeyType {
-    Secret,
     Public,
-    Private
+    Private,
+    Secret
 };
 
 } // namespace WebCore