Rename SubtleCrypto to WebKitSubtleCrypto
authorjiewen_tan@apple.com <jiewen_tan@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Mon, 25 Jul 2016 20:35:16 +0000 (20:35 +0000)
committerjiewen_tan@apple.com <jiewen_tan@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Mon, 25 Jul 2016 20:35:16 +0000 (20:35 +0000)
https://bugs.webkit.org/show_bug.cgi?id=160067
<rdar://problem/27483617>

Reviewed by Brent Fulgham.

Source/WebCore:

Tests: crypto/webkitSubtle/gc-2.html
       crypto/webkitSubtle/gc-3.html
       crypto/webkitSubtle/gc.html

Rename Class SubtleCrypto to WebKitSubtleCrypto, and Crypto.subtle to Crypto.webkitSubtle in order
to let the new implementation to reuse the name SubtleCrypto. This renaming should match what our
current JSBindings use, and therefore should not introduce any change of behavoir.

* CMakeLists.txt:
Revise project files for for new file names.
* DerivedSources.cpp:
* DerivedSources.make:
* PlatformEfl.cmake:
* PlatformGTK.cmake:
* PlatformMac.cmake:
* WebCore.xcodeproj/project.pbxproj:
Revise project files for for new file names.
* bindings/js/JSWebKitSubtleCryptoCustom.cpp: Renamed from Source/WebCore/bindings/js/JSSubtleCryptoCustom.cpp.
* crypto/WebKitSubtleCrypto.cpp: Renamed from Source/WebCore/crypto/SubtleCrypto.cpp.
* crypto/WebKitSubtleCrypto.h: Renamed from Source/WebCore/crypto/SubtleCrypto.h.
* crypto/WebKitSubtleCrypto.idl: Renamed from Source/WebCore/crypto/SubtleCrypto.idl.
* page/Crypto.cpp:
(WebCore::Crypto::webkitSubtle):
(WebCore::Crypto::subtle): Deleted.
* page/Crypto.h:
* page/Crypto.idl:

LayoutTests:

Move tests involving crypto.webkitSubtle from crypto/subtle to crypto/webkitSubtle.

* crypto/webkitSubtle/gc-2-expected.txt: Renamed from LayoutTests/crypto/subtle/gc-2-expected.txt.
* crypto/webkitSubtle/gc-2.html: Renamed from LayoutTests/crypto/subtle/gc-2.html.
* crypto/webkitSubtle/gc-3-expected.txt: Renamed from LayoutTests/crypto/subtle/gc-3-expected.txt.
* crypto/webkitSubtle/gc-3.html: Renamed from LayoutTests/crypto/subtle/gc-3.html.
* crypto/webkitSubtle/gc-expected.txt: Renamed from LayoutTests/crypto/subtle/gc-expected.txt.
* crypto/webkitSubtle/gc.html: Renamed from LayoutTests/crypto/subtle/gc.html.
* platform/efl/TestExpectations:
* platform/gtk/TestExpectations:
* platform/ios-simulator-wk1/TestExpectations:
* platform/win/TestExpectations:

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

26 files changed:
LayoutTests/ChangeLog
LayoutTests/crypto/webkitSubtle/gc-2-expected.txt [moved from LayoutTests/crypto/subtle/gc-2-expected.txt with 78% similarity]
LayoutTests/crypto/webkitSubtle/gc-2.html [moved from LayoutTests/crypto/subtle/gc-2.html with 90% similarity]
LayoutTests/crypto/webkitSubtle/gc-3-expected.txt [moved from LayoutTests/crypto/subtle/gc-3-expected.txt with 84% similarity]
LayoutTests/crypto/webkitSubtle/gc-3.html [moved from LayoutTests/crypto/subtle/gc-3.html with 92% similarity]
LayoutTests/crypto/webkitSubtle/gc-expected.txt [moved from LayoutTests/crypto/subtle/gc-expected.txt with 70% similarity]
LayoutTests/crypto/webkitSubtle/gc.html [moved from LayoutTests/crypto/subtle/gc.html with 86% similarity]
LayoutTests/platform/efl/TestExpectations
LayoutTests/platform/gtk/TestExpectations
LayoutTests/platform/ios-simulator-wk1/TestExpectations
LayoutTests/platform/win/TestExpectations
Source/WebCore/CMakeLists.txt
Source/WebCore/ChangeLog
Source/WebCore/DerivedSources.cpp
Source/WebCore/DerivedSources.make
Source/WebCore/PlatformEfl.cmake
Source/WebCore/PlatformGTK.cmake
Source/WebCore/PlatformMac.cmake
Source/WebCore/WebCore.xcodeproj/project.pbxproj
Source/WebCore/bindings/js/JSWebKitSubtleCryptoCustom.cpp [moved from Source/WebCore/bindings/js/JSSubtleCryptoCustom.cpp with 97% similarity]
Source/WebCore/crypto/WebKitSubtleCrypto.cpp [moved from Source/WebCore/crypto/SubtleCrypto.cpp with 91% similarity]
Source/WebCore/crypto/WebKitSubtleCrypto.h [moved from Source/WebCore/crypto/SubtleCrypto.h with 84% similarity]
Source/WebCore/crypto/WebKitSubtleCrypto.idl [moved from Source/WebCore/crypto/SubtleCrypto.idl with 97% similarity]
Source/WebCore/page/Crypto.cpp
Source/WebCore/page/Crypto.h
Source/WebCore/page/Crypto.idl

index 05879fa..fbbde49 100644 (file)
@@ -1,3 +1,24 @@
+2016-07-25  Jiewen Tan  <jiewen_tan@apple.com>
+
+        Rename SubtleCrypto to WebKitSubtleCrypto
+        https://bugs.webkit.org/show_bug.cgi?id=160067
+        <rdar://problem/27483617>
+
+        Reviewed by Brent Fulgham.
+
+        Move tests involving crypto.webkitSubtle from crypto/subtle to crypto/webkitSubtle.
+
+        * crypto/webkitSubtle/gc-2-expected.txt: Renamed from LayoutTests/crypto/subtle/gc-2-expected.txt.
+        * crypto/webkitSubtle/gc-2.html: Renamed from LayoutTests/crypto/subtle/gc-2.html.
+        * crypto/webkitSubtle/gc-3-expected.txt: Renamed from LayoutTests/crypto/subtle/gc-3-expected.txt.
+        * crypto/webkitSubtle/gc-3.html: Renamed from LayoutTests/crypto/subtle/gc-3.html.
+        * crypto/webkitSubtle/gc-expected.txt: Renamed from LayoutTests/crypto/subtle/gc-expected.txt.
+        * crypto/webkitSubtle/gc.html: Renamed from LayoutTests/crypto/subtle/gc.html.
+        * platform/efl/TestExpectations:
+        * platform/gtk/TestExpectations:
+        * platform/ios-simulator-wk1/TestExpectations:
+        * platform/win/TestExpectations:
+
 2016-07-25  Brady Eidson  <beidson@apple.com>
 
         Allow LocalStorage by default for file URLs.
@@ -1,4 +1,4 @@
-Test that window.crypto.subtle wrapper preserves custom properties.
+Test that window.crypto.webkitSubtle wrapper preserves custom properties.
 
 On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
 
similarity index 90%
rename from LayoutTests/crypto/subtle/gc-2.html
rename to LayoutTests/crypto/webkitSubtle/gc-2.html
index 9129920..ceb0dda 100644 (file)
@@ -7,7 +7,7 @@
 <body>
 <script>
 
-description("Test that window.crypto.subtle wrapper preserves custom properties.");
+description("Test that window.crypto.webkitSubtle wrapper preserves custom properties.");
 jsTestIsAsync = true;
 
 var anotherWindowCrypto;
@@ -1,4 +1,4 @@
-Test that window.crypto wrapper protects all dependencies, so it can always be used to create crypto.subtle.
+Test that window.crypto wrapper protects all dependencies, so it can always be used to create crypto.webkitSubtle.
 
 On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
 
similarity index 92%
rename from LayoutTests/crypto/subtle/gc-3.html
rename to LayoutTests/crypto/webkitSubtle/gc-3.html
index b6e0740..a1051cd 100644 (file)
@@ -7,7 +7,7 @@
 <body>
 <script>
 
-description("Test that window.crypto wrapper protects all dependencies, so it can always be used to create crypto.subtle.");
+description("Test that window.crypto wrapper protects all dependencies, so it can always be used to create crypto.webkitSubtle.");
 jsTestIsAsync = true;
 
 var anotherWindowCrypto;
similarity index 70%
rename from LayoutTests/crypto/subtle/gc-expected.txt
rename to LayoutTests/crypto/webkitSubtle/gc-expected.txt
index c59d0a1..7d9b3c6 100644 (file)
@@ -1,4 +1,4 @@
-Test that window.crypto.subtle wrapper preserves custom properties.
+Test that window.crypto.webkitSubtle wrapper preserves custom properties.
 
 On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
 
similarity index 86%
rename from LayoutTests/crypto/subtle/gc.html
rename to LayoutTests/crypto/webkitSubtle/gc.html
index a235b0b..1803eb5 100644 (file)
@@ -7,7 +7,7 @@
 <body>
 <script>
 
-description("Test that window.crypto.subtle wrapper preserves custom properties.");
+description("Test that window.crypto.webkitSubtle wrapper preserves custom properties.");
 jsTestIsAsync = true;
 
 function startTest()
index d00f3dd..281f1bc 100644 (file)
@@ -1823,6 +1823,7 @@ webkit.org/b/119782 fast/forms/search-styled.html [ Failure ]
 # crypto.subtle is not yet enabled, but digest algorithms are already implemented
 # and their tests are whitelisted
 webkit.org/b/133122 crypto/subtle [ Skip ]
+webkit.org/b/133122 crypto/webkitSubtle [ Skip ]
 webkit.org/b/133319 crypto/subtle/sha-1.html [ Pass ]
 webkit.org/b/133319 crypto/subtle/sha-224.html [ Pass ]
 webkit.org/b/133319 crypto/subtle/sha-256.html [ Pass ]
index f2be64b..edd6d42 100644 (file)
@@ -409,6 +409,7 @@ Bug(GTK) editing/secure-input [ Failure ]
 # crypto.subtle is not yet enabled, but digest algorithms are already implemented
 # and their tests are whitelisted
 webkit.org/b/133122 crypto/subtle [ Skip ]
+webkit.org/b/133122 crypto/webkitSubtle [ Skip ]
 webkit.org/b/133319 crypto/subtle/sha-1.html [ Pass ]
 webkit.org/b/133319 crypto/subtle/sha-224.html [ Pass ]
 webkit.org/b/133319 crypto/subtle/sha-256.html [ Pass ]
index a46fafb..77d114a 100644 (file)
@@ -1005,7 +1005,9 @@ animations/suspend-resume-animation-events.html [ Pass Failure ]
 storage/indexeddb
 imported/w3c/IndexedDB-private-browsing
 imported/w3c/web-platform-tests/IndexedDB
+crypto/subtle/rsa-indexeddb-non-exportable-private.html
 crypto/subtle/rsa-indexeddb-non-exportable.html
+crypto/subtle/rsa-indexeddb-private.html
 crypto/subtle/rsa-indexeddb.html
 fast/history/page-cache-indexed-closed-db.html
 fast/history/page-cache-indexed-opened-db.html
index a995443..140674e 100644 (file)
@@ -259,6 +259,9 @@ http/tests/security/cross-origin-indexeddb.html [ Skip ]
 http/tests/security/cross-origin-worker-indexeddb-allowed.html [ Skip ]
 http/tests/security/cross-origin-worker-indexeddb.html [ Skip ]
 http/tests/security/no-indexeddb-from-sandbox.html [ Skip ]
+crypto/subtle/rsa-indexeddb-non-exportable-private.html [ Skip ]
+crypto/subtle/rsa-indexeddb-non-exportable.html [ Skip ]
+crypto/subtle/rsa-indexeddb-private.html [ Skip ]
 crypto/subtle/rsa-indexeddb.html [ Skip ]
 fast/history/page-cache-indexed-closed-db.html [ Skip ]
 fast/history/page-cache-indexed-opened-db.html [ Skip ]
@@ -593,6 +596,7 @@ webkit.org/b/98696 plugins/snapshotting [ Skip ]
 webkit.org/b/116559 storage/websql/ [ Skip ]
 
 # TODO crypto.subtle is not yet enabled
+crypto/webkitSubtle/ [ Skip ]
 crypto/subtle/ [ Skip ]
 
 # TODO Missing WebSpeech implementation
index a25f27c..3386187 100644 (file)
@@ -315,7 +315,7 @@ set(WebCore_NON_SVG_IDL_FILES
 
     crypto/CryptoKey.idl
     crypto/CryptoKeyPair.idl
-    crypto/SubtleCrypto.idl
+    crypto/WebKitSubtleCrypto.idl
 
     css/CSSCharsetRule.idl
     css/CSSFontFaceLoadEvent.idl
@@ -1210,7 +1210,6 @@ set(WebCore_SOURCES
     bindings/js/JSStorageCustom.cpp
     bindings/js/JSStyleSheetCustom.cpp
     bindings/js/JSStyleSheetListCustom.cpp
-    bindings/js/JSSubtleCryptoCustom.cpp
     bindings/js/JSTextCustom.cpp
     bindings/js/JSTextTrackCueCustom.cpp
     bindings/js/JSTextTrackCustom.cpp
@@ -1224,6 +1223,7 @@ set(WebCore_SOURCES
     bindings/js/JSWebGLRenderingContextBaseCustom.cpp
     bindings/js/JSWebGLRenderingContextCustom.cpp
     bindings/js/JSWebKitPointCustom.cpp
+    bindings/js/JSWebKitSubtleCryptoCustom.cpp
     bindings/js/JSWorkerCustom.cpp
     bindings/js/JSWorkerGlobalScopeBase.cpp
     bindings/js/JSWorkerGlobalScopeCustom.cpp
index 07183b8..e2bc833 100644 (file)
@@ -1,3 +1,38 @@
+2016-07-25  Jiewen Tan  <jiewen_tan@apple.com>
+
+        Rename SubtleCrypto to WebKitSubtleCrypto
+        https://bugs.webkit.org/show_bug.cgi?id=160067
+        <rdar://problem/27483617>
+
+        Reviewed by Brent Fulgham.
+
+        Tests: crypto/webkitSubtle/gc-2.html
+               crypto/webkitSubtle/gc-3.html
+               crypto/webkitSubtle/gc.html
+
+        Rename Class SubtleCrypto to WebKitSubtleCrypto, and Crypto.subtle to Crypto.webkitSubtle in order
+        to let the new implementation to reuse the name SubtleCrypto. This renaming should match what our
+        current JSBindings use, and therefore should not introduce any change of behavoir.
+
+        * CMakeLists.txt:
+        Revise project files for for new file names.
+        * DerivedSources.cpp:
+        * DerivedSources.make:
+        * PlatformEfl.cmake:
+        * PlatformGTK.cmake:
+        * PlatformMac.cmake:
+        * WebCore.xcodeproj/project.pbxproj:
+        Revise project files for for new file names.
+        * bindings/js/JSWebKitSubtleCryptoCustom.cpp: Renamed from Source/WebCore/bindings/js/JSSubtleCryptoCustom.cpp.
+        * crypto/WebKitSubtleCrypto.cpp: Renamed from Source/WebCore/crypto/SubtleCrypto.cpp.
+        * crypto/WebKitSubtleCrypto.h: Renamed from Source/WebCore/crypto/SubtleCrypto.h.
+        * crypto/WebKitSubtleCrypto.idl: Renamed from Source/WebCore/crypto/SubtleCrypto.idl.
+        * page/Crypto.cpp:
+        (WebCore::Crypto::webkitSubtle):
+        (WebCore::Crypto::subtle): Deleted.
+        * page/Crypto.h:
+        * page/Crypto.idl:
+
 2016-07-25  Brady Eidson  <beidson@apple.com>
 
         Allow LocalStorage by default for file URLs.
index df2fd99..90609dc 100644 (file)
 #include "JSSpeechSynthesisEvent.cpp"
 #include "JSSpeechSynthesisUtterance.cpp"
 #include "JSSpeechSynthesisVoice.cpp"
-#include "JSSubtleCrypto.cpp"
 #include "JSSQLError.cpp"
 #include "JSSQLException.cpp"
 #include "JSSQLResultSet.cpp"
 #include "JSWebKitNamespace.cpp"
 #include "JSWebKitPlaybackTargetAvailabilityEvent.cpp"
 #include "JSWebKitPoint.cpp"
+#include "JSWebKitSubtleCrypto.cpp"
 #include "JSWebKitTransitionEvent.cpp"
 #include "JSWebSocket.cpp"
 #include "JSWheelEvent.cpp"
index b2fee5f..5685dc2 100644 (file)
@@ -235,7 +235,7 @@ NON_SVG_BINDING_IDLS = \
     $(WebCore)/animation/DocumentTimeline.idl \
     $(WebCore)/crypto/CryptoKey.idl \
     $(WebCore)/crypto/CryptoKeyPair.idl \
-    $(WebCore)/crypto/SubtleCrypto.idl \
+    $(WebCore)/crypto/WebKitSubtleCrypto.idl \
     $(WebCore)/css/CSSCharsetRule.idl \
     $(WebCore)/css/CSSFontFaceLoadEvent.idl \
     $(WebCore)/css/CSSFontFaceRule.idl \
index 514504e..2d36986 100644 (file)
@@ -403,7 +403,7 @@ if (ENABLE_SUBTLE_CRYPTO)
         crypto/CryptoAlgorithmRegistry.cpp
         crypto/CryptoKey.cpp
         crypto/CryptoKeyPair.cpp
-        crypto/SubtleCrypto.cpp
+        crypto/WebKitSubtleCrypto.cpp
 
         crypto/algorithms/CryptoAlgorithmAES_CBC.cpp
         crypto/algorithms/CryptoAlgorithmAES_KW.cpp
index 645add1..aabd305 100644 (file)
@@ -797,7 +797,7 @@ if (ENABLE_SUBTLE_CRYPTO)
         crypto/CryptoAlgorithmRegistry.cpp
         crypto/CryptoKey.cpp
         crypto/CryptoKeyPair.cpp
-        crypto/SubtleCrypto.cpp
+        crypto/WebKitSubtleCrypto.cpp
 
         crypto/algorithms/CryptoAlgorithmAES_CBC.cpp
         crypto/algorithms/CryptoAlgorithmAES_KW.cpp
index 9f6f496..3310258 100644 (file)
@@ -196,7 +196,7 @@ list(APPEND WebCore_SOURCES
     crypto/CryptoAlgorithmRegistry.cpp
     crypto/CryptoKey.cpp
     crypto/CryptoKeyPair.cpp
-    crypto/SubtleCrypto.cpp
+    crypto/WebKitSubtleCrypto.cpp
 
     crypto/algorithms/CryptoAlgorithmAES_CBC.cpp
     crypto/algorithms/CryptoAlgorithmAES_KW.cpp
index fa93595..b488acb 100644 (file)
                550A0BCA085F6039007353D6 /* QualifiedName.h in Headers */ = {isa = PBXBuildFile; fileRef = 550A0BC8085F6039007353D6 /* QualifiedName.h */; settings = {ATTRIBUTES = (Private, ); }; };
                555B87EC1CAAF0AB00349425 /* ImageDecoderCG.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 555B87EA1CAAF0AB00349425 /* ImageDecoderCG.cpp */; };
                555B87ED1CAAF0AB00349425 /* ImageDecoderCG.h in Headers */ = {isa = PBXBuildFile; fileRef = 555B87EB1CAAF0AB00349425 /* ImageDecoderCG.h */; };
+               5709E8CD1D413D47003244AC /* WebKitSubtleCrypto.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5709E8CA1D413CE3003244AC /* WebKitSubtleCrypto.cpp */; };
+               5709E8CE1D413D5B003244AC /* JSWebKitSubtleCryptoCustom.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E1FF8F661807460800132674 /* JSWebKitSubtleCryptoCustom.cpp */; };
+               5709E8CF1D413D9A003244AC /* WebKitSubtleCrypto.h in Headers */ = {isa = PBXBuildFile; fileRef = 5709E8CB1D413CE3003244AC /* WebKitSubtleCrypto.h */; };
+               570A99DA1D417408004EC630 /* JSWebKitSubtleCrypto.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E1FF8F62180745D800132674 /* JSWebKitSubtleCrypto.cpp */; };
+               570A99DB1D41A2F3004EC630 /* JSWebKitSubtleCrypto.h in Headers */ = {isa = PBXBuildFile; fileRef = E1FF8F63180745D800132674 /* JSWebKitSubtleCrypto.h */; };
                572A7F211C6E5719009C6149 /* SimulatedClick.h in Headers */ = {isa = PBXBuildFile; fileRef = 572A7F201C6E5719009C6149 /* SimulatedClick.h */; };
                572A7F231C6E5A66009C6149 /* SimulatedClick.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 572A7F221C6E5A66009C6149 /* SimulatedClick.cpp */; };
                57EF5E601D20C83900171E60 /* TextCodecReplacement.h in Headers */ = {isa = PBXBuildFile; fileRef = 57EF5E5F1D20C83900171E60 /* TextCodecReplacement.h */; };
                E1FE137E184D270200892F13 /* CryptoAlgorithmAES_KWMac.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E1FE137C184D270200892F13 /* CryptoAlgorithmAES_KWMac.cpp */; };
                E1FF57A30F01255B00891EBB /* ThreadGlobalData.h in Headers */ = {isa = PBXBuildFile; fileRef = E1FF57A20F01255B00891EBB /* ThreadGlobalData.h */; settings = {ATTRIBUTES = (Private, ); }; };
                E1FF57A60F01256B00891EBB /* ThreadGlobalData.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E1FF57A50F01256B00891EBB /* ThreadGlobalData.cpp */; };
-               E1FF8F5F1807442100132674 /* SubtleCrypto.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E1FF8F5D1807442100132674 /* SubtleCrypto.cpp */; };
-               E1FF8F601807442100132674 /* SubtleCrypto.h in Headers */ = {isa = PBXBuildFile; fileRef = E1FF8F5E1807442100132674 /* SubtleCrypto.h */; };
-               E1FF8F64180745D800132674 /* JSSubtleCrypto.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E1FF8F62180745D800132674 /* JSSubtleCrypto.cpp */; };
-               E1FF8F65180745D800132674 /* JSSubtleCrypto.h in Headers */ = {isa = PBXBuildFile; fileRef = E1FF8F63180745D800132674 /* JSSubtleCrypto.h */; };
-               E1FF8F681807460800132674 /* JSSubtleCryptoCustom.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E1FF8F661807460800132674 /* JSSubtleCryptoCustom.cpp */; };
                E1FF8F6C180DB5BE00132674 /* CryptoAlgorithmRegistry.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E1FF8F6A180DB5BE00132674 /* CryptoAlgorithmRegistry.cpp */; };
                E1FF8F6D180DB5BE00132674 /* CryptoAlgorithmRegistry.h in Headers */ = {isa = PBXBuildFile; fileRef = E1FF8F6B180DB5BE00132674 /* CryptoAlgorithmRegistry.h */; };
                E38838981BAD145F00D62EE3 /* JSModuleLoader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38838941BAD145F00D62EE3 /* JSModuleLoader.cpp */; };
                555B87EA1CAAF0AB00349425 /* ImageDecoderCG.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ImageDecoderCG.cpp; sourceTree = "<group>"; };
                555B87EB1CAAF0AB00349425 /* ImageDecoderCG.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ImageDecoderCG.h; sourceTree = "<group>"; };
                55D408F71A7C631800C78450 /* SVGImageClients.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SVGImageClients.h; sourceTree = "<group>"; };
+               5709E8CA1D413CE3003244AC /* WebKitSubtleCrypto.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WebKitSubtleCrypto.cpp; sourceTree = "<group>"; };
+               5709E8CB1D413CE3003244AC /* WebKitSubtleCrypto.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebKitSubtleCrypto.h; sourceTree = "<group>"; };
+               5709E8CC1D413CE3003244AC /* WebKitSubtleCrypto.idl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = WebKitSubtleCrypto.idl; sourceTree = "<group>"; };
                572A7F201C6E5719009C6149 /* SimulatedClick.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SimulatedClick.h; sourceTree = "<group>"; };
                572A7F221C6E5A66009C6149 /* SimulatedClick.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SimulatedClick.cpp; sourceTree = "<group>"; };
                57EF5E5F1D20C83900171E60 /* TextCodecReplacement.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TextCodecReplacement.h; sourceTree = "<group>"; };
                B57CB52C182A3EED0079A647 /* InlineElementBox.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = InlineElementBox.cpp; sourceTree = "<group>"; };
                B595FF461824CEE300FF51CD /* RenderIterator.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RenderIterator.h; sourceTree = "<group>"; };
                B59CA59AF170D8FAA5B8C9AD /* MathMLScriptsElement.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = MathMLScriptsElement.cpp; sourceTree = "<group>"; };
-               B59CA849D41E6F65D81197AB /* MathMLScriptsElement.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MathMLScriptsElement.h; sourceTree = "<group>"; };
                B59CA59AF170D8FAA5B8CABE /* MathMLPaddedElement.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = MathMLPaddedElement.cpp; sourceTree = "<group>"; };
+               B59CA849D41E6F65D81197AB /* MathMLScriptsElement.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MathMLScriptsElement.h; sourceTree = "<group>"; };
                B59CA849D41E6F65D81198BC /* MathMLPaddedElement.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MathMLPaddedElement.h; sourceTree = "<group>"; };
                B59DD697119029E5007E9684 /* JSDatabaseCallback.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSDatabaseCallback.h; sourceTree = "<group>"; };
                B59DD698119029E5007E9684 /* JSDatabaseCallback.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSDatabaseCallback.cpp; sourceTree = "<group>"; };
                E1FE137C184D270200892F13 /* CryptoAlgorithmAES_KWMac.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CryptoAlgorithmAES_KWMac.cpp; sourceTree = "<group>"; };
                E1FF57A20F01255B00891EBB /* ThreadGlobalData.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ThreadGlobalData.h; sourceTree = "<group>"; };
                E1FF57A50F01256B00891EBB /* ThreadGlobalData.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ThreadGlobalData.cpp; sourceTree = "<group>"; };
-               E1FF8F5C1807364B00132674 /* SubtleCrypto.idl */ = {isa = PBXFileReference; lastKnownFileType = text; path = SubtleCrypto.idl; sourceTree = "<group>"; };
-               E1FF8F5D1807442100132674 /* SubtleCrypto.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SubtleCrypto.cpp; sourceTree = "<group>"; };
-               E1FF8F5E1807442100132674 /* SubtleCrypto.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SubtleCrypto.h; sourceTree = "<group>"; };
-               E1FF8F62180745D800132674 /* JSSubtleCrypto.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSSubtleCrypto.cpp; sourceTree = "<group>"; };
-               E1FF8F63180745D800132674 /* JSSubtleCrypto.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSSubtleCrypto.h; sourceTree = "<group>"; };
-               E1FF8F661807460800132674 /* JSSubtleCryptoCustom.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSSubtleCryptoCustom.cpp; sourceTree = "<group>"; };
+               E1FF8F62180745D800132674 /* JSWebKitSubtleCrypto.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSWebKitSubtleCrypto.cpp; sourceTree = "<group>"; };
+               E1FF8F63180745D800132674 /* JSWebKitSubtleCrypto.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSWebKitSubtleCrypto.h; sourceTree = "<group>"; };
+               E1FF8F661807460800132674 /* JSWebKitSubtleCryptoCustom.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSWebKitSubtleCryptoCustom.cpp; sourceTree = "<group>"; };
                E1FF8F6A180DB5BE00132674 /* CryptoAlgorithmRegistry.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CryptoAlgorithmRegistry.cpp; sourceTree = "<group>"; };
                E1FF8F6B180DB5BE00132674 /* CryptoAlgorithmRegistry.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CryptoAlgorithmRegistry.h; sourceTree = "<group>"; };
                E38838941BAD145F00D62EE3 /* JSModuleLoader.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSModuleLoader.cpp; sourceTree = "<group>"; };
                                BC98A27C0C0C9950004BEBF7 /* JSStyleSheetCustom.cpp */,
                                AD726FEC16D9F4B9003A4E6D /* JSStyleSheetCustom.h */,
                                A84EBD770CB8C89200079609 /* JSStyleSheetListCustom.cpp */,
-                               E1FF8F661807460800132674 /* JSSubtleCryptoCustom.cpp */,
                                08E4FE450E2BD41400F4CAE0 /* JSSVGLengthCustom.cpp */,
                                B2C96D8C0B3AF2B7005E80EC /* JSSVGPathSegCustom.cpp */,
                                07E117061489EBEB00EC5ACE /* JSTextTrackCueCustom.cpp */,
                                D3F3D3591A69A3B00059FC2B /* JSWebGL2RenderingContextCustom.cpp */,
                                D3F3D35A1A69A3B00059FC2B /* JSWebGLRenderingContextBaseCustom.cpp */,
                                49EED14C1051971A00099FAB /* JSWebGLRenderingContextCustom.cpp */,
+                               E1FF8F661807460800132674 /* JSWebKitSubtleCryptoCustom.cpp */,
                                BC275B7811C5D1C300C9206C /* JSWebKitPointCustom.cpp */,
                                E1CA5CBB0E8CDCAF00E8EF90 /* JSWorkerCustom.cpp */,
                                E18258AB0EF3CD7000933242 /* JSWorkerGlobalScopeCustom.cpp */,
                                E19727151820549E00592D51 /* CryptoKeyType.h */,
                                E172AF6F180F289500FBADB9 /* CryptoKeyUsage.h */,
                                E18DF33418AAF12C00773E59 /* SerializedCryptoKeyWrap.h */,
-                               E1FF8F5D1807442100132674 /* SubtleCrypto.cpp */,
-                               E1FF8F5E1807442100132674 /* SubtleCrypto.h */,
-                               E1FF8F5C1807364B00132674 /* SubtleCrypto.idl */,
+                               5709E8CA1D413CE3003244AC /* WebKitSubtleCrypto.cpp */,
+                               5709E8CB1D413CE3003244AC /* WebKitSubtleCrypto.h */,
+                               5709E8CC1D413CE3003244AC /* WebKitSubtleCrypto.idl */,
                        );
                        path = crypto;
                        sourceTree = "<group>";
                                E157A8DF1817331C009F821D /* JSCryptoKey.h */,
                                E1F80B8B183172B5007885C3 /* JSCryptoKeyPair.cpp */,
                                E1F80B8C183172B5007885C3 /* JSCryptoKeyPair.h */,
-                               E1FF8F62180745D800132674 /* JSSubtleCrypto.cpp */,
-                               E1FF8F63180745D800132674 /* JSSubtleCrypto.h */,
+                               E1FF8F62180745D800132674 /* JSWebKitSubtleCrypto.cpp */,
+                               E1FF8F63180745D800132674 /* JSWebKitSubtleCrypto.h */,
                        );
                        name = Crypto;
                        sourceTree = "<group>";
                                A871D4560A127CBC00B12A68 /* HTMLPlugInElement.h in Headers */,
                                4415292E0E1AE8A000C4A2D0 /* HTMLPlugInImageElement.h in Headers */,
                                A8EA7CB00A192B9C00A8EF5F /* HTMLPreElement.h in Headers */,
+                               570A99DB1D41A2F3004EC630 /* JSWebKitSubtleCrypto.h in Headers */,
+                               5709E8CF1D413D9A003244AC /* WebKitSubtleCrypto.h in Headers */,
                                977B3873122883E900B81FF8 /* HTMLPreloadScanner.h in Headers */,
                                A43BF5991149290A00C643CA /* HTMLProgressElement.h in Headers */,
                                A8CFF7A30A156978000A4234 /* HTMLQuoteElement.h in Headers */,
                                BCE0139B0C0BEF180043860A /* JSStyleSheet.h in Headers */,
                                AD726FEE16DA11BC003A4E6D /* JSStyleSheetCustom.h in Headers */,
                                A84EBD830CB8C97700079609 /* JSStyleSheetList.h in Headers */,
-                               E1FF8F65180745D800132674 /* JSSubtleCrypto.h in Headers */,
                                B20111080AB7740500DB0E68 /* JSSVGAElement.h in Headers */,
                                24D9129213CA951E00D21915 /* JSSVGAltGlyphDefElement.h in Headers */,
                                6515EC920D9723FF0063D49A /* JSSVGAltGlyphElement.h in Headers */,
                                1AE96A931D1A0DDD00B86768 /* JSApplePayShippingMethodSelectedEvent.h in Headers */,
                                1A8F6B020DB53006001DB794 /* SubstituteResource.h in Headers */,
                                1AE96A8B1D1A0DDD00B86768 /* JSApplePayPaymentAuthorizedEvent.h in Headers */,
-                               E1FF8F601807442100132674 /* SubtleCrypto.h in Headers */,
                                93B2D8160F9920D2006AE6B2 /* SuddenTermination.h in Headers */,
                                97C078501165D5BE003A32EF /* SuffixTree.h in Headers */,
                                97627B9814FB5424002CDCA1 /* Supplementable.h in Headers */,
                        isa = PBXSourcesBuildPhase;
                        buildActionMask = 2147483647;
                        files = (
+                               5709E8CE1D413D5B003244AC /* JSWebKitSubtleCryptoCustom.cpp in Sources */,
+                               5709E8CD1D413D47003244AC /* WebKitSubtleCrypto.cpp in Sources */,
                                41E1B1D00FF5986900576B3B /* AbstractWorker.cpp in Sources */,
                                37F57AB91A50726900876F98 /* AccessibilityARIAGrid.cpp in Sources */,
                                37F57ABA1A50726F00876F98 /* AccessibilityARIAGridCell.cpp in Sources */,
                                0707568B142262D600414161 /* HTMLTrackElement.cpp in Sources */,
                                977B37251228721700B81FF8 /* HTMLTreeBuilder.cpp in Sources */,
                                A8EA79F30A1916DF00A8EF5F /* HTMLUListElement.cpp in Sources */,
+                               570A99DA1D417408004EC630 /* JSWebKitSubtleCrypto.cpp in Sources */,
                                E44613AA0CD6331000FADA75 /* HTMLVideoElement.cpp in Sources */,
                                839AAFEC1A0C0C8D00605F99 /* HTMLWBRElement.cpp in Sources */,
                                0B8C56D40F28627F000502E1 /* HTTPHeaderMap.cpp in Sources */,
                                BC98A27D0C0C9950004BEBF7 /* JSStyleSheetCustom.cpp in Sources */,
                                A84EBD840CB8C97700079609 /* JSStyleSheetList.cpp in Sources */,
                                A84EBD780CB8C89200079609 /* JSStyleSheetListCustom.cpp in Sources */,
-                               E1FF8F64180745D800132674 /* JSSubtleCrypto.cpp in Sources */,
-                               E1FF8F681807460800132674 /* JSSubtleCryptoCustom.cpp in Sources */,
                                B20111070AB7740500DB0E68 /* JSSVGAElement.cpp in Sources */,
                                24D9129113CA951E00D21915 /* JSSVGAltGlyphDefElement.cpp in Sources */,
                                6515EC910D9723FF0063D49A /* JSSVGAltGlyphElement.cpp in Sources */,
                                93E227E40AF589AD00D48324 /* SubresourceLoader.cpp in Sources */,
                                7E37EF2E1339208800B29250 /* SubresourceLoaderCF.cpp in Sources */,
                                7E8FADC4199A95B100714968 /* SubresourceLoaderCocoa.mm in Sources */,
-                               E1FF8F5F1807442100132674 /* SubtleCrypto.cpp in Sources */,
                                93B2D8180F9920EE006AE6B2 /* SuddenTermination.mm in Sources */,
                                087558C513B4A57D00F49307 /* SurrogatePairAwareTextIterator.cpp in Sources */,
                                62C1217C11AB9E77003C462C /* SuspendableTimer.cpp in Sources */,
@@ -24,7 +24,7 @@
  */
 
 #include "config.h"
-#include "JSSubtleCrypto.h"
+#include "JSWebKitSubtleCrypto.h"
 
 #if ENABLE(SUBTLE_CRYPTO)
 
@@ -130,7 +130,7 @@ static bool cryptoKeyUsagesFromJSValue(ExecState& state, JSValue value, CryptoKe
     return true;
 }
 
-JSValue JSSubtleCrypto::encrypt(ExecState& state)
+JSValue JSWebKitSubtleCrypto::encrypt(ExecState& state)
 {
     if (state.argumentCount() < 3)
         return state.vm().throwException(&state, createNotEnoughArgumentsError(&state));
@@ -183,7 +183,7 @@ JSValue JSSubtleCrypto::encrypt(ExecState& state)
     return promiseDeferred->promise();
 }
 
-JSValue JSSubtleCrypto::decrypt(ExecState& state)
+JSValue JSWebKitSubtleCrypto::decrypt(ExecState& state)
 {
     if (state.argumentCount() < 3)
         return state.vm().throwException(&state, createNotEnoughArgumentsError(&state));
@@ -235,7 +235,7 @@ JSValue JSSubtleCrypto::decrypt(ExecState& state)
     return promiseDeferred->promise();
 }
 
-JSValue JSSubtleCrypto::sign(ExecState& state)
+JSValue JSWebKitSubtleCrypto::sign(ExecState& state)
 {
     if (state.argumentCount() < 3)
         return state.vm().throwException(&state, createNotEnoughArgumentsError(&state));
@@ -287,7 +287,7 @@ JSValue JSSubtleCrypto::sign(ExecState& state)
     return promiseDeferred->promise();
 }
 
-JSValue JSSubtleCrypto::verify(ExecState& state)
+JSValue JSWebKitSubtleCrypto::verify(ExecState& state)
 {
     if (state.argumentCount() < 4)
         return state.vm().throwException(&state, createNotEnoughArgumentsError(&state));
@@ -345,7 +345,7 @@ JSValue JSSubtleCrypto::verify(ExecState& state)
     return promiseDeferred->promise();
 }
 
-JSValue JSSubtleCrypto::digest(ExecState& state)
+JSValue JSWebKitSubtleCrypto::digest(ExecState& state)
 {
     if (state.argumentCount() < 2)
         return state.vm().throwException(&state, createNotEnoughArgumentsError(&state));
@@ -387,7 +387,7 @@ JSValue JSSubtleCrypto::digest(ExecState& state)
     return promiseDeferred->promise();
 }
 
-JSValue JSSubtleCrypto::generateKey(ExecState& state)
+JSValue JSWebKitSubtleCrypto::generateKey(ExecState& state)
 {
     if (state.argumentCount() < 1)
         return state.vm().throwException(&state, createNotEnoughArgumentsError(&state));
@@ -503,7 +503,7 @@ static void importKey(ExecState& state, CryptoKeyFormat keyFormat, CryptoOperati
         setDOMException(&state, ec);
 }
 
-JSValue JSSubtleCrypto::importKey(ExecState& state)
+JSValue JSWebKitSubtleCrypto::importKey(ExecState& state)
 {
     if (state.argumentCount() < 3)
         return state.vm().throwException(&state, createNotEnoughArgumentsError(&state));
@@ -598,7 +598,7 @@ static void exportKey(ExecState& state, CryptoKeyFormat keyFormat, const CryptoK
     }
 }
 
-JSValue JSSubtleCrypto::exportKey(ExecState& state)
+JSValue JSWebKitSubtleCrypto::exportKey(ExecState& state)
 {
     if (state.argumentCount() < 2)
         return state.vm().throwException(&state, createNotEnoughArgumentsError(&state));
@@ -629,7 +629,7 @@ JSValue JSSubtleCrypto::exportKey(ExecState& state)
     return promiseDeferred->promise();
 }
 
-JSValue JSSubtleCrypto::wrapKey(ExecState& state)
+JSValue JSWebKitSubtleCrypto::wrapKey(ExecState& state)
 {
     if (state.argumentCount() < 4)
         return state.vm().throwException(&state, createNotEnoughArgumentsError(&state));
@@ -698,7 +698,7 @@ JSValue JSSubtleCrypto::wrapKey(ExecState& state)
     return promiseDeferred->promise();
 }
 
-JSValue JSSubtleCrypto::unwrapKey(ExecState& state)
+JSValue JSWebKitSubtleCrypto::unwrapKey(ExecState& state)
 {
     if (state.argumentCount() < 5)
         return state.vm().throwException(&state, createNotEnoughArgumentsError(&state));
similarity index 91%
rename from Source/WebCore/crypto/SubtleCrypto.cpp
rename to Source/WebCore/crypto/WebKitSubtleCrypto.cpp
index 68d820c..3b68af9 100644 (file)
@@ -24,7 +24,7 @@
  */
 
 #include "config.h"
-#include "SubtleCrypto.h"
+#include "WebKitSubtleCrypto.h"
 
 #if ENABLE(SUBTLE_CRYPTO)
 
 
 namespace WebCore {
 
-SubtleCrypto::SubtleCrypto(Document& document)
+WebKitSubtleCrypto::WebKitSubtleCrypto(Document& document)
     : ContextDestructionObserver(&document)
 {
 }
 
-Document* SubtleCrypto::document() const
+Document* WebKitSubtleCrypto::document() const
 {
     return downcast<Document>(scriptExecutionContext());
 }
similarity index 84%
rename from Source/WebCore/crypto/SubtleCrypto.h
rename to Source/WebCore/crypto/WebKitSubtleCrypto.h
index ed6ccb7..099b850 100644 (file)
@@ -23,8 +23,7 @@
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef SubtleCrypto_h
-#define SubtleCrypto_h
+#pragma once
 
 #include "ContextDestructionObserver.h" 
 #include <wtf/RefCounted.h>
@@ -36,18 +35,16 @@ namespace WebCore {
 
 class Document;
 
-class SubtleCrypto : public ContextDestructionObserver, public RefCounted<SubtleCrypto> {
+class WebKitSubtleCrypto : public ContextDestructionObserver, public RefCounted<WebKitSubtleCrypto> {
 public:
-    static Ref<SubtleCrypto> create(Document& document) { return adoptRef(*new SubtleCrypto(document)); }
+    static Ref<WebKitSubtleCrypto> create(Document& document) { return adoptRef(*new WebKitSubtleCrypto(document)); }
 
     Document* document() const;
 
 private:
-    SubtleCrypto(Document&);
+    WebKitSubtleCrypto(Document&);
 };
 
 }
 
 #endif
-
-#endif // SubtleCrypto_h
similarity index 97%
rename from Source/WebCore/crypto/SubtleCrypto.idl
rename to Source/WebCore/crypto/WebKitSubtleCrypto.idl
index cf8ff8b..1557383 100644 (file)
 
 [
     Conditional=SUBTLE_CRYPTO,
-    InterfaceName=WebKitSubtleCrypto,
     GenerateIsReachable=ImplDocument,
     NoInterfaceObject,
-] interface SubtleCrypto {
+] interface WebKitSubtleCrypto {
     [Custom] Promise encrypt(AlgorithmIdentifier algorithm, Key key, sequence<CryptoOperationData> data);
     [Custom] Promise decrypt(AlgorithmIdentifier algorithm, Key key, sequence<CryptoOperationData> data);
     [Custom] Promise sign(AlgorithmIdentifier algorithm, Key key, sequence<CryptoOperationData> data);
index 5aaa709..0a94fd9 100644 (file)
@@ -33,7 +33,7 @@
 
 #include "Document.h"
 #include "ExceptionCode.h"
-#include "SubtleCrypto.h"
+#include "WebKitSubtleCrypto.h"
 #include <runtime/ArrayBufferView.h>
 #include <wtf/CryptographicallyRandomNumber.h>
 
@@ -67,13 +67,13 @@ void Crypto::getRandomValues(ArrayBufferView* array, ExceptionCode& ec)
 }
 
 #if ENABLE(SUBTLE_CRYPTO)
-SubtleCrypto* Crypto::subtle()
+WebKitSubtleCrypto* Crypto::webkitSubtle()
 {
     ASSERT(isMainThread());
-    if (!m_subtle)
-        m_subtle = SubtleCrypto::create(*document());
+    if (!m_webkitSubtle)
+        m_webkitSubtle = WebKitSubtleCrypto::create(*document());
 
-    return m_subtle.get();
+    return m_webkitSubtle.get();
 }
 #endif
 
index af0fc04..96d92d3 100644 (file)
@@ -45,7 +45,7 @@ namespace WebCore {
 typedef int ExceptionCode;
 
 class Document;
-class SubtleCrypto;
+class WebKitSubtleCrypto;
 
 class Crypto : public ContextDestructionObserver, public RefCounted<Crypto> {
 public:
@@ -57,14 +57,14 @@ public:
     void getRandomValues(JSC::ArrayBufferView*, ExceptionCode&);
 
 #if ENABLE(SUBTLE_CRYPTO)
-    SubtleCrypto* subtle();
+    WebKitSubtleCrypto* webkitSubtle();
 #endif
 
 private:
     Crypto(Document&);
 
 #if ENABLE(SUBTLE_CRYPTO)
-    RefPtr<SubtleCrypto> m_subtle;
+    RefPtr<WebKitSubtleCrypto> m_webkitSubtle;
 #endif
 };
 
index cfe60fc..63a1e30 100644 (file)
@@ -32,5 +32,5 @@
 ] interface Crypto {
     [Custom, RaisesException] ArrayBufferView getRandomValues(ArrayBufferView array);
 
-    [Conditional=SUBTLE_CRYPTO, ImplementedAs=subtle] readonly attribute SubtleCrypto webkitSubtle;
+    [Conditional=SUBTLE_CRYPTO] readonly attribute WebKitSubtleCrypto webkitSubtle;
 };