Changeset 158239 in webkit


Ignore:
Timestamp:
Oct 29, 2013, 4:33:02 PM (12 years ago)
Author:
ap@apple.com
Message:

Beef up CryptoKey
​https://bugs.webkit.org/show_bug.cgi?id=123462

Fix a mismerge, remove duplicate CryptoKeyType declaration.

  • crypto/CryptoKey.h:
Location:
trunk/Source/WebCore
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebCore/ChangeLog

    r158236 r158239  
     12013-10-29  Alexey Proskuryakov  <ap@apple.com>
     2
     3        Beef up CryptoKey
     4        https://bugs.webkit.org/show_bug.cgi?id=123462
     5
     6        Fix a mismerge, remove duplicate CryptoKeyType declaration.
     7
     8        * crypto/CryptoKey.h:
     9
    1102013-10-29  Alexey Proskuryakov  <ap@apple.com>
    211

  • trunk/Source/WebCore/crypto/CryptoKey.h

    r158236 r158239  
    4040class CryptoAlgorithmDescriptionBuilder;
    4141
    42 ENUM_CLASS(CryptoKeyType) {
    43     Secret,
    44     Public,
    45     Private
    46 };
    47 
    4842class CryptoKey : public RefCounted<CryptoKey> {
    4943public:
Note: See TracChangeset for help on using the changeset viewer.