diff options
author | Simon Hausmann <simon.hausmann@nokia.com> | 2012-08-21 10:57:44 +0200 |
---|---|---|
committer | Simon Hausmann <simon.hausmann@nokia.com> | 2012-08-21 10:57:44 +0200 |
commit | 5ef7c8a6a70875d4430752d146bdcb069605d71d (patch) | |
tree | f6256640b6c46d7da221435803cae65326817ba2 /Source/WebKit2/UIProcess/API/C/WKIntentData.cpp | |
parent | decad929f578d8db641febc8740649ca6c574638 (diff) | |
download | qtwebkit-5ef7c8a6a70875d4430752d146bdcb069605d71d.tar.gz |
Imported WebKit commit 356d83016b090995d08ad568f2d2c243aa55e831 (http://svn.webkit.org/repository/webkit/trunk@126147)
New snapshot including various build fixes for newer Qt 5
Diffstat (limited to 'Source/WebKit2/UIProcess/API/C/WKIntentData.cpp')
-rw-r--r-- | Source/WebKit2/UIProcess/API/C/WKIntentData.cpp | 24 |
1 files changed, 2 insertions, 22 deletions
diff --git a/Source/WebKit2/UIProcess/API/C/WKIntentData.cpp b/Source/WebKit2/UIProcess/API/C/WKIntentData.cpp index 7a92db54c..92e61871c 100644 --- a/Source/WebKit2/UIProcess/API/C/WKIntentData.cpp +++ b/Source/WebKit2/UIProcess/API/C/WKIntentData.cpp @@ -31,6 +31,7 @@ #include "WKAPICast.h" #include "WKDictionary.h" #include "WKString.h" +#include "WebSerializedScriptValue.h" #if ENABLE(WEB_INTENTS) #include "WebIntentData.h" @@ -47,27 +48,6 @@ WKTypeID WKIntentDataGetTypeID() #endif } -WKIntentDataRef WKIntentDataCreate(WKDictionaryRef initDictionaryRef) -{ -#if ENABLE(WEB_INTENTS) - IntentData intentData; - WKStringRef action = static_cast<WKStringRef>(WKDictionaryGetItemForKey(initDictionaryRef, WKStringCreateWithUTF8CString("action"))); - ASSERT(action); - intentData.action = toImpl(action)->string(); - WKStringRef type = static_cast<WKStringRef>(WKDictionaryGetItemForKey(initDictionaryRef, WKStringCreateWithUTF8CString("type"))); - ASSERT(type); - intentData.type = toImpl(type)->string(); - WKSerializedScriptValueRef data = static_cast<WKSerializedScriptValueRef>(WKDictionaryGetItemForKey(initDictionaryRef, WKStringCreateWithUTF8CString("data"))); - if (data) - intentData.data = toImpl(data)->dataReference().vector(); - - RefPtr<WebIntentData> webIntentData = WebIntentData::create(intentData); - return toAPI(webIntentData.release().leakRef()); -#else - return 0; -#endif -} - WKStringRef WKIntentDataCopyAction(WKIntentDataRef intentRef) { #if ENABLE(WEB_INTENTS) @@ -104,7 +84,7 @@ WKArrayRef WKIntentDataCopySuggestions(WKIntentDataRef intentRef) #endif } -WKStringRef WKIntentDataCopyExtra(WKIntentDataRef intentRef, WKStringRef key) +WKStringRef WKIntentDataCopyExtraValue(WKIntentDataRef intentRef, WKStringRef key) { #if ENABLE(WEB_INTENTS) return toCopiedAPI(toImpl(intentRef)->extra(toWTFString(key))); |