webkitgtk-2.16.5HEADwebkitgtk-2.16.5master

3 files changed, 32 insertions, 89 deletions

diff --git a/Source/WebKit2/UIProcess/API/C/soup/WKSoupCustomProtocolRequestManager.cpp b/Source/WebKit2/UIProcess/API/C/soup/WKCookieManagerSoup.cpp
index 95b1f8124..86b31aa47 100644
--- a/Source/WebKit2/UIProcess/API/C/soup/WKSoupCustomProtocolRequestManager.cpp
+++ b/Source/WebKit2/UIProcess/API/C/soup/WKCookieManagerSoup.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2013 Igalia S.L.
+ * Copyright (C) 2012 Intel Corporation. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -24,28 +24,28 @@
  */
 
 #include "config.h"
-#include "WKSoupCustomProtocolRequestManager.h"
+#include "WKCookieManagerSoup.h"
 
+#include "SoupCookiePersistentStorageType.h"
 #include "WKAPICast.h"
-#include "WebSoupCustomProtocolRequestManager.h"
+#include "WebCookieManagerProxy.h"
 
 using namespace WebKit;
 
-WKTypeID WKSoupCustomProtocolRequestManagerGetTypeID()
+inline SoupCookiePersistentStorageType toSoupCookiePersistentStorageType(WKCookieStorageType wkCookieStorageType)
 {
-#if ENABLE(CUSTOM_PROTOCOLS)
-    return toAPI(WebSoupCustomProtocolRequestManager::APIType);
-#else
-    return 0;
-#endif
+    switch (wkCookieStorageType) {
+    case kWKCookieStorageTypeText:
+        return SoupCookiePersistentStorageText;
+    case kWKCookieStorageTypeSQLite:
+        return SoupCookiePersistentStorageSQLite;
+    }
+
+    ASSERT_NOT_REACHED();
+    return SoupCookiePersistentStorageText;
 }
 
-void WKSoupCustomProtocolRequestManagerSetClient(WKSoupCustomProtocolRequestManagerRef soupRequestManagerRef, const WKSoupCustomProtocolRequestManagerClientBase* wkClient)
+void WKCookieManagerSetCookiePersistentStorage(WKCookieManagerRef cookieManager, WKStringRef storagePath, WKCookieStorageType storageType)
 {
-#if ENABLE(CUSTOM_PROTOCOLS)
-    toImpl(soupRequestManagerRef)->initializeClient(wkClient);
-#else
-    UNUSED_PARAM(soupRequestManagerRef);
-    UNUSED_PARAM(wkClient);
-#endif
+    toImpl(cookieManager)->setCookiePersistentStorage(toWTFString(storagePath), storageType);
 }
diff --git a/Source/WebKit2/UIProcess/API/C/soup/WKAPICastSoup.h b/Source/WebKit2/UIProcess/API/C/soup/WKCookieManagerSoup.h
index 0333335ba..90cafca21 100644
--- a/Source/WebKit2/UIProcess/API/C/soup/WKAPICastSoup.h
+++ b/Source/WebKit2/UIProcess/API/C/soup/WKCookieManagerSoup.h
@@ -1,5 +1,5 @@
 /*
- * Portions Copyright (c) 2012 Igalia S.L.
+ * Copyright (C) 2012 Intel Corporation. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -23,24 +23,25 @@
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef WKAPICastSoup_h
-#define WKAPICastSoup_h
+#ifndef WKCookieManagerSoup_h
+#define WKCookieManagerSoup_h
 
-#ifndef WKAPICast_h
-#error "Please #include \"WKAPICast.h\" instead of this file directly."
-#endif
+#include <WebKit/WKBase.h>
 
-namespace WebKit {
+#ifdef __cplusplus
+extern "C" {
+#endif
 
-class WebSoupCustomProtocolRequestManager;
-class WebSoupRequestManagerProxy;
+enum {
+    kWKCookieStorageTypeText = 0,
+    kWKCookieStorageTypeSQLite = 1
+};
+typedef uint32_t WKCookieStorageType;
 
-#if ENABLE(CUSTOM_PROTOCOLS)
-WK_ADD_API_MAPPING(WKSoupCustomProtocolRequestManagerRef, WebSoupCustomProtocolRequestManager)
-#else
-WK_ADD_API_MAPPING(WKSoupRequestManagerRef, WebSoupRequestManagerProxy)
-#endif
+WK_EXPORT void WKCookieManagerSetCookiePersistentStorage(WKCookieManagerRef cookieManager, WKStringRef storagePath, WKCookieStorageType storageType);
 
+#ifdef __cplusplus
 }
+#endif
 
-#endif // WKAPICastSoup_h
+#endif // WKCookieManagerSoup_h
diff --git a/Source/WebKit2/UIProcess/API/C/soup/WKSoupCustomProtocolRequestManager.h b/Source/WebKit2/UIProcess/API/C/soup/WKSoupCustomProtocolRequestManager.h
deleted file mode 100644
index cb0edc72f..000000000
--- a/Source/WebKit2/UIProcess/API/C/soup/WKSoupCustomProtocolRequestManager.h
+++ /dev/null
@@ -1,58 +0,0 @@
-/*
- * Copyright (C) 2013 Igalia S.L.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
- * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
- * THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#ifndef WKSoupCustomProtocolRequestManager_h
-#define WKSoupCustomProtocolRequestManager_h
-
-#include <WebKit2/WKBase.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-typedef void (*WKSoupCustomProtocolRequestManagerStartLoadingCallback)(WKSoupCustomProtocolRequestManagerRef soupManagerRef, uint64_t customProtocolID, WKURLRequestRef requestRef, const void* clientInfo);
-typedef void (*WKSoupCustomProtocolRequestManagerStopLoadingCallback)(WKSoupCustomProtocolRequestManagerRef soupManagerRef, uint64_t customProtocolID, const void* clientInfo);
-
-typedef struct WKSoupCustomProtocolRequestManagerClientBase {
-    int                                                    version;
-    const void*                                            clientInfo;
-} WKSoupCustomProtocolRequestManagerClientBase;
-
-typedef struct WKSoupCustomProtocolRequestManagerClientV0 {
-    WKSoupCustomProtocolRequestManagerClientBase           base;
-
-    WKSoupCustomProtocolRequestManagerStartLoadingCallback startLoading;
-    WKSoupCustomProtocolRequestManagerStopLoadingCallback  stopLoading;
-} WKSoupCustomProtocolRequestManagerClientV0;
-
-WK_EXPORT WKTypeID WKSoupCustomProtocolRequestManagerGetTypeID();
-
-WK_EXPORT void WKSoupCustomProtocolRequestManagerSetClient(WKSoupCustomProtocolRequestManagerRef, const WKSoupCustomProtocolRequestManagerClientBase*);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* WKSoupCustomProtocolRequestManager_h */