Title: [136787] trunk/Source/WebKit2
- Revision
- 136787
- Author
- [email protected]
- Date
- 2012-12-05 18:38:22 -0800 (Wed, 05 Dec 2012)
Log Message
[EFL][WK2] Don't use the C API internally in ewk_cookie_manager
https://bugs.webkit.org/show_bug.cgi?id=103243
Patch by Jinwoo Song <[email protected]> on 2012-12-05
Reviewed by Gyuyoung Kim.
Used the C++ classes directly instead of the C API wrappers
to avoid a lot of toImpl/toAPI casts.
* UIProcess/API/efl/ewk_context.cpp:
(EwkContext::cookieManager):
* UIProcess/API/efl/ewk_cookie_manager.cpp:
(EwkCookieManager::EwkCookieManager):
(EwkCookieManager::~EwkCookieManager):
(EwkCookieManager::setPersistentStorage):
(EwkCookieManager::setHTTPAcceptPolicy):
(EwkCookieManager::clearHostnameCookies):
(EwkCookieManager::clearAllCookies):
(EwkCookieManager::watchChanges):
(EwkCookieManager::getHostNamesWithCookies):
(EwkCookieManager::getHTTPAcceptPolicy):
* UIProcess/API/efl/ewk_cookie_manager_private.h:
(EwkCookieManager::create):
(EwkCookieManager):
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (136786 => 136787)
--- trunk/Source/WebKit2/ChangeLog 2012-12-06 02:36:22 UTC (rev 136786)
+++ trunk/Source/WebKit2/ChangeLog 2012-12-06 02:38:22 UTC (rev 136787)
@@ -1,3 +1,29 @@
+2012-12-05 Jinwoo Song <[email protected]>
+
+ [EFL][WK2] Don't use the C API internally in ewk_cookie_manager
+ https://bugs.webkit.org/show_bug.cgi?id=103243
+
+ Reviewed by Gyuyoung Kim.
+
+ Used the C++ classes directly instead of the C API wrappers
+ to avoid a lot of toImpl/toAPI casts.
+
+ * UIProcess/API/efl/ewk_context.cpp:
+ (EwkContext::cookieManager):
+ * UIProcess/API/efl/ewk_cookie_manager.cpp:
+ (EwkCookieManager::EwkCookieManager):
+ (EwkCookieManager::~EwkCookieManager):
+ (EwkCookieManager::setPersistentStorage):
+ (EwkCookieManager::setHTTPAcceptPolicy):
+ (EwkCookieManager::clearHostnameCookies):
+ (EwkCookieManager::clearAllCookies):
+ (EwkCookieManager::watchChanges):
+ (EwkCookieManager::getHostNamesWithCookies):
+ (EwkCookieManager::getHTTPAcceptPolicy):
+ * UIProcess/API/efl/ewk_cookie_manager_private.h:
+ (EwkCookieManager::create):
+ (EwkCookieManager):
+
2012-12-05 No'am Rosenthal <[email protected]>
Coordinated Graphics: Enable support for setContentsToBackgroundColor
Modified: trunk/Source/WebKit2/UIProcess/API/efl/ewk_context.cpp (136786 => 136787)
--- trunk/Source/WebKit2/UIProcess/API/efl/ewk_context.cpp 2012-12-06 02:36:22 UTC (rev 136786)
+++ trunk/Source/WebKit2/UIProcess/API/efl/ewk_context.cpp 2012-12-06 02:38:22 UTC (rev 136787)
@@ -134,7 +134,7 @@
EwkCookieManager* EwkContext::cookieManager()
{
if (!m_cookieManager)
- m_cookieManager = EwkCookieManager::create(WKContextGetCookieManager(toAPI(m_context.get())));
+ m_cookieManager = EwkCookieManager::create(m_context->cookieManagerProxy());
return m_cookieManager.get();
}
Modified: trunk/Source/WebKit2/UIProcess/API/efl/ewk_cookie_manager.cpp (136786 => 136787)
--- trunk/Source/WebKit2/UIProcess/API/efl/ewk_cookie_manager.cpp 2012-12-06 02:36:22 UTC (rev 136786)
+++ trunk/Source/WebKit2/UIProcess/API/efl/ewk_cookie_manager.cpp 2012-12-06 02:38:22 UTC (rev 136787)
@@ -39,48 +39,50 @@
using namespace WebKit;
-EwkCookieManager::EwkCookieManager(WKCookieManagerRef cookieManagerRef)
- : m_wkCookieManager(cookieManagerRef)
+EwkCookieManager::EwkCookieManager(PassRefPtr<WebCookieManagerProxy> cookieManager)
+ : m_cookieManager(cookieManager)
{
+ ASSERT(m_cookieManager);
+
WKCookieManagerClient wkCookieManagerClient = {
kWKCookieManagerClientCurrentVersion,
this, // clientInfo
cookiesDidChange
};
- WKCookieManagerSetClient(m_wkCookieManager.get(), &wkCookieManagerClient);
+ WKCookieManagerSetClient(toAPI(m_cookieManager.get()), &wkCookieManagerClient);
}
EwkCookieManager::~EwkCookieManager()
{
if (isWatchingForChanges())
- WKCookieManagerStopObservingCookieChanges(m_wkCookieManager.get());
+ m_cookieManager->stopObservingCookieChanges();
}
void EwkCookieManager::setPersistentStorage(const String& filename, SoupCookiePersistentStorageType storage)
{
bool isWatchingChanges = isWatchingForChanges();
if (isWatchingChanges)
- WKCookieManagerStopObservingCookieChanges(m_wkCookieManager.get());
+ m_cookieManager->stopObservingCookieChanges();
- toImpl(m_wkCookieManager.get())->setCookiePersistentStorage(filename, storage);
+ m_cookieManager->setCookiePersistentStorage(filename, storage);
if (isWatchingChanges)
- WKCookieManagerStartObservingCookieChanges(m_wkCookieManager.get());
+ m_cookieManager->startObservingCookieChanges();
}
void EwkCookieManager::setHTTPAcceptPolicy(WKHTTPCookieAcceptPolicy policy)
{
- WKCookieManagerSetHTTPCookieAcceptPolicy(m_wkCookieManager.get(), policy);
+ m_cookieManager->setHTTPCookieAcceptPolicy(toHTTPCookieAcceptPolicy(policy));
}
void EwkCookieManager::clearHostnameCookies(const String& hostname)
{
- toImpl(m_wkCookieManager.get())->deleteCookiesForHostname(hostname);
+ m_cookieManager->deleteCookiesForHostname(hostname);
}
void EwkCookieManager::clearAllCookies()
{
- WKCookieManagerDeleteAllCookies(m_wkCookieManager.get());
+ m_cookieManager->deleteAllCookies();
}
void EwkCookieManager::watchChanges(const Cookie_Change_Handler& changeHandler)
@@ -88,9 +90,9 @@
m_changeHandler = changeHandler;
if (changeHandler.callback)
- WKCookieManagerStartObservingCookieChanges(m_wkCookieManager.get());
+ m_cookieManager->startObservingCookieChanges();
else
- WKCookieManagerStopObservingCookieChanges(m_wkCookieManager.get());
+ m_cookieManager->stopObservingCookieChanges();
}
bool EwkCookieManager::isWatchingForChanges() const
@@ -100,12 +102,12 @@
void EwkCookieManager::getHostNamesWithCookies(WKCookieManagerGetCookieHostnamesFunction callback, void* userData) const
{
- WKCookieManagerGetHostnamesWithCookies(m_wkCookieManager.get(), userData, callback);
+ m_cookieManager->getHostnamesWithCookies(ArrayCallback::create(userData, callback));
}
void EwkCookieManager::getHTTPAcceptPolicy(WKCookieManagerGetHTTPCookieAcceptPolicyFunction callback, void* userData) const
{
- WKCookieManagerGetHTTPCookieAcceptPolicy(m_wkCookieManager.get(), userData, callback);
+ m_cookieManager->getHTTPCookieAcceptPolicy(HTTPCookieAcceptPolicyCallback::create(userData, callback));
}
void EwkCookieManager::cookiesDidChange(WKCookieManagerRef, const void* clientInfo)
Modified: trunk/Source/WebKit2/UIProcess/API/efl/ewk_cookie_manager_private.h (136786 => 136787)
--- trunk/Source/WebKit2/UIProcess/API/efl/ewk_cookie_manager_private.h 2012-12-06 02:36:22 UTC (rev 136786)
+++ trunk/Source/WebKit2/UIProcess/API/efl/ewk_cookie_manager_private.h 2012-12-06 02:38:22 UTC (rev 136787)
@@ -28,7 +28,7 @@
#include "SoupCookiePersistentStorageType.h"
#include "WKCookieManager.h"
-#include "WKRetainPtr.h"
+#include "WebCookieManagerProxy.h"
#include "ewk_cookie_manager.h"
#include <WebKit2/WKBase.h>
#include <wtf/PassOwnPtr.h>
@@ -50,9 +50,9 @@
class EwkCookieManager {
public:
- static PassOwnPtr<EwkCookieManager> create(WKCookieManagerRef cookieManagerRef)
+ static PassOwnPtr<EwkCookieManager> create(PassRefPtr<WebKit::WebCookieManagerProxy> cookieManager)
{
- return adoptPtr(new EwkCookieManager(cookieManagerRef));
+ return adoptPtr(new EwkCookieManager(cookieManager));
}
~EwkCookieManager();
@@ -69,13 +69,13 @@
void watchChanges(const Cookie_Change_Handler& changeHandler);
private:
- explicit EwkCookieManager(WKCookieManagerRef cookieManagerRef);
+ explicit EwkCookieManager(PassRefPtr<WebKit::WebCookieManagerProxy> cookieManager);
bool isWatchingForChanges() const;
static void cookiesDidChange(WKCookieManagerRef, const void* clientInfo);
- WKRetainPtr<WKCookieManagerRef> m_wkCookieManager;
+ RefPtr<WebKit::WebCookieManagerProxy> m_cookieManager;
Cookie_Change_Handler m_changeHandler;
};
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo/webkit-changes