webkitgtk-2.16.5HEADwebkitgtk-2.16.5master

1 files changed, 5 insertions, 18 deletions

diff --git a/Source/WebCore/crypto/CryptoKey.idl b/Source/WebCore/crypto/CryptoKey.idl
index bc14da866..708a8d11d 100644
--- a/Source/WebCore/crypto/CryptoKey.idl
+++ b/Source/WebCore/crypto/CryptoKey.idl
@@ -24,32 +24,19 @@
  */
 
 enum KeyType {
-    "secret",
     "public",
-    "private"
-};
-
-enum KeyUsage {
-    "encrypt",
-    "decrypt",
-    "sign",
-    "verify",
-    "deriveKey",
-    "deriveBits",
-    "wrapKey",
-    "unwrapKey"
+    "private",
+    "secret"
 };
 
 [
     Conditional=SUBTLE_CRYPTO,
+    Exposed=(Window,Worker),
     GenerateIsReachable=Impl,
-    InterfaceName=Key,
-    JSNoStaticTables,
-    NoInterfaceObject,
     SkipVTableValidation
 ] interface CryptoKey {
     readonly attribute KeyType type;
     readonly attribute boolean extractable;
-    [Custom] readonly attribute Algorithm algorithm;
-    readonly attribute KeyUsage[] usages;
+    [CachedAttribute, CustomGetter] readonly attribute object algorithm;
+    [CachedAttribute] readonly attribute sequence<CryptoKeyUsage> usages;
 };