Imported WebKit commit 75bb2fc5882d2e1b3d5572c2961507996cbca5e3 (http://svn.webkit.org/repository/webkit/trunk@104681)

1 files changed, 12 insertions, 4 deletions

diff --git a/Source/WebKit2/Shared/mac/SecItemRequestData.cpp b/Source/WebKit2/Shared/mac/SecItemRequestData.cpp
index 4aa4066a7..aa1c45932 100644
--- a/Source/WebKit2/Shared/mac/SecItemRequestData.cpp
+++ b/Source/WebKit2/Shared/mac/SecItemRequestData.cpp
@@ -32,22 +32,27 @@
 namespace WebKit {
 
 SecItemRequestData::SecItemRequestData()
+    : m_type(Invalid)
 {
 }
 
-SecItemRequestData::SecItemRequestData(CFDictionaryRef query)
-    : m_queryDictionary(query)
+SecItemRequestData::SecItemRequestData(Type type, CFDictionaryRef query)
+    : m_type(type)
+    , m_queryDictionary(query)
 {
 }
 
-SecItemRequestData::SecItemRequestData(CFDictionaryRef query, CFDictionaryRef attributesToMatch)
-    : m_queryDictionary(query)
+SecItemRequestData::SecItemRequestData(Type type, CFDictionaryRef query, CFDictionaryRef attributesToMatch)
+    : m_type(type)
+    , m_queryDictionary(query)
     , m_attributesToMatch(attributesToMatch)
 {
 }
 
 void SecItemRequestData::encode(CoreIPC::ArgumentEncoder* encoder) const
 {
+    encoder->encodeEnum(m_type);
+
     CoreIPC::encode(encoder, m_queryDictionary.get());
 
     encoder->encodeBool(m_attributesToMatch.get());
@@ -57,6 +62,9 @@ void SecItemRequestData::encode(CoreIPC::ArgumentEncoder* encoder) const
 
 bool SecItemRequestData::decode(CoreIPC::ArgumentDecoder* decoder, SecItemRequestData& secItemRequestData)
 {    
+    if (!decoder->decodeEnum(secItemRequestData.m_type))
+        return false;
+
     if (!CoreIPC::decode(decoder, secItemRequestData.m_queryDictionary))
         return false;