Title: [158239] trunk/Source/WebCore
- Revision
- 158239
- Author
- [email protected]
- Date
- 2013-10-29 16:33:02 -0700 (Tue, 29 Oct 2013)
Log Message
Beef up CryptoKey
https://bugs.webkit.org/show_bug.cgi?id=123462
Fix a mismerge, remove duplicate CryptoKeyType declaration.
* crypto/CryptoKey.h:
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (158238 => 158239)
--- trunk/Source/WebCore/ChangeLog 2013-10-29 23:19:46 UTC (rev 158238)
+++ trunk/Source/WebCore/ChangeLog 2013-10-29 23:33:02 UTC (rev 158239)
@@ -3,6 +3,15 @@
Beef up CryptoKey
https://bugs.webkit.org/show_bug.cgi?id=123462
+ Fix a mismerge, remove duplicate CryptoKeyType declaration.
+
+ * crypto/CryptoKey.h:
+
+2013-10-29 Alexey Proskuryakov <[email protected]>
+
+ Beef up CryptoKey
+ https://bugs.webkit.org/show_bug.cgi?id=123462
+
Reviewed by Sam Weinig.
* WebCore.xcodeproj/project.pbxproj: Added new files.
Modified: trunk/Source/WebCore/crypto/CryptoKey.h (158238 => 158239)
--- trunk/Source/WebCore/crypto/CryptoKey.h 2013-10-29 23:19:46 UTC (rev 158238)
+++ trunk/Source/WebCore/crypto/CryptoKey.h 2013-10-29 23:33:02 UTC (rev 158239)
@@ -39,12 +39,6 @@
class CryptoAlgorithmDescriptionBuilder;
-ENUM_CLASS(CryptoKeyType) {
- Secret,
- Public,
- Private
-};
-
class CryptoKey : public RefCounted<CryptoKey> {
public:
CryptoKey(CryptoAlgorithmIdentifier, CryptoKeyType, bool extractable, CryptoKeyUsage);
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
