From 1bf1084f2b10c3b47fd1a588d85d21ed0eb41d0c Mon Sep 17 00:00:00 2001
From: Lorry Tar Creator <lorry-tar-importer@lorry>
Date: Tue, 27 Jun 2017 06:07:23 +0000
Subject: webkitgtk-2.16.5

---
 .../WebCore/crypto/keys/CryptoKeyDataOctetSequence.h | 20 ++++----------------
 1 file changed, 4 insertions(+), 16 deletions(-)

(limited to 'Source/WebCore/crypto/keys/CryptoKeyDataOctetSequence.h')

diff --git a/Source/WebCore/crypto/keys/CryptoKeyDataOctetSequence.h b/Source/WebCore/crypto/keys/CryptoKeyDataOctetSequence.h
index 4f88b7e45..645f8eef3 100644
--- a/Source/WebCore/crypto/keys/CryptoKeyDataOctetSequence.h
+++ b/Source/WebCore/crypto/keys/CryptoKeyDataOctetSequence.h
@@ -23,8 +23,7 @@
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef CryptoKeyDataOctetSequence_h
-#define CryptoKeyDataOctetSequence_h
+#pragma once
 
 #include "CryptoKeyData.h"
 #include <wtf/Vector.h>
@@ -35,28 +34,17 @@ namespace WebCore {
 
 class CryptoKeyDataOctetSequence final : public CryptoKeyData {
 public:
-    static std::unique_ptr<CryptoKeyDataOctetSequence> create(const Vector<uint8_t>& keyData)
-    {
-        return std::unique_ptr<CryptoKeyDataOctetSequence>(new CryptoKeyDataOctetSequence(keyData));
-    }
+    explicit CryptoKeyDataOctetSequence(const Vector<uint8_t>&);
     virtual ~CryptoKeyDataOctetSequence();
 
     const Vector<uint8_t>& octetSequence() const { return m_keyData; }
 
 private:
-    CryptoKeyDataOctetSequence(const Vector<uint8_t>&);
-
     Vector<uint8_t> m_keyData;
 };
 
-inline bool isCryptoKeyDataOctetSequence(const CryptoKeyData& data)
-{
-    return data.format() == CryptoKeyData::Format::OctetSequence;
-}
-
-CRYPTO_KEY_DATA_CASTS(CryptoKeyDataOctetSequence)
-
 } // namespace WebCore
 
+SPECIALIZE_TYPE_TRAITS_CRYPTO_KEY_DATA(CryptoKeyDataOctetSequence, CryptoKeyData::Format::OctetSequence)
+
 #endif // ENABLE(SUBTLE_CRYPTO)
-#endif // CryptoKeyDataOctetSequence_h
-- 
cgit v1.2.1