Diff
Modified: trunk/Source/WebKit2/ChangeLog (134042 => 134043)
--- trunk/Source/WebKit2/ChangeLog 2012-11-09 11:12:14 UTC (rev 134042)
+++ trunk/Source/WebKit2/ChangeLog 2012-11-09 11:25:24 UTC (rev 134043)
@@ -1,5 +1,36 @@
2012-11-09 Jinwoo Song <jinwoo7.s...@samsung.com>
+ [EFL][WK2] Make classes for client use WebContext instead of WKContext
+ https://bugs.webkit.org/show_bug.cgi?id=101564
+
+ Reviewed by Kenneth Rohde Christiansen.
+
+ EwkContext class has been refactored to use WebContext instead of WKContext in r133844,
+ so this patch makes client classes use WebContext
+
+ * UIProcess/API/efl/ewk_context.cpp:
+ (EwkContext::EwkContext):
+ * UIProcess/efl/BatteryProvider.cpp:
+ (BatteryProvider::~BatteryProvider):
+ (BatteryProvider::create):
+ (BatteryProvider::BatteryProvider):
+ (BatteryProvider::didChangeBatteryStatus):
+ * UIProcess/efl/BatteryProvider.h:
+ (BatteryProvider):
+ * UIProcess/efl/ContextHistoryClientEfl.cpp:
+ (WebKit::ContextHistoryClientEfl::ContextHistoryClientEfl):
+ * UIProcess/efl/ContextHistoryClientEfl.h:
+ (WebKit::ContextHistoryClientEfl::create):
+ (ContextHistoryClientEfl):
+ * UIProcess/efl/NetworkInfoProvider.cpp:
+ (NetworkInfoProvider::create):
+ (NetworkInfoProvider::NetworkInfoProvider):
+ (NetworkInfoProvider::~NetworkInfoProvider):
+ * UIProcess/efl/NetworkInfoProvider.h:
+ (NetworkInfoProvider):
+
+2012-11-09 Jinwoo Song <jinwoo7.s...@samsung.com>
+
[EFL][WK2] Fix build warning in test_ewk2_context.cpp: [-Wwrite-strings]
https://bugs.webkit.org/show_bug.cgi?id=101666
Modified: trunk/Source/WebKit2/UIProcess/API/efl/ewk_context.cpp (134042 => 134043)
--- trunk/Source/WebKit2/UIProcess/API/efl/ewk_context.cpp 2012-11-09 11:12:14 UTC (rev 134042)
+++ trunk/Source/WebKit2/UIProcess/API/efl/ewk_context.cpp 2012-11-09 11:25:24 UTC (rev 134043)
@@ -66,14 +66,14 @@
, m_databaseManager(Ewk_Database_Manager::create(m_context))
, m_storageManager(Ewk_Storage_Manager::create(m_context))
#if ENABLE(BATTERY_STATUS)
- , m_batteryProvider(BatteryProvider::create(toAPI(m_context.get()))) // FIXME: All below should be initialized consistently.
+ , m_batteryProvider(BatteryProvider::create(m_context))
#endif
#if ENABLE(NETWORK_INFO)
- , m_networkInfoProvider(NetworkInfoProvider::create(toAPI(m_context.get())))
+ , m_networkInfoProvider(NetworkInfoProvider::create(m_context))
#endif
, m_downloadManager(DownloadManagerEfl::create(this))
, m_requestManagerClient(RequestManagerClientEfl::create(this))
- , m_historyClient(ContextHistoryClientEfl::create(toAPI(m_context.get())))
+ , m_historyClient(ContextHistoryClientEfl::create(m_context))
{
ContextMap::AddResult result = contextMap().add(m_context.get(), this);
ASSERT_UNUSED(result, result.isNewEntry);
Modified: trunk/Source/WebKit2/UIProcess/efl/BatteryProvider.cpp (134042 => 134043)
--- trunk/Source/WebKit2/UIProcess/efl/BatteryProvider.cpp 2012-11-09 11:12:14 UTC (rev 134042)
+++ trunk/Source/WebKit2/UIProcess/efl/BatteryProvider.cpp 2012-11-09 11:25:24 UTC (rev 134043)
@@ -30,8 +30,9 @@
#include "WKAPICast.h"
#include "WKBatteryManager.h"
-#include "WKBatteryStatus.h"
-#include "WKContext.h"
+#include "WebBatteryManagerProxy.h"
+#include "WebBatteryStatus.h"
+#include "WebContext.h"
using namespace WebCore;
using namespace WebKit;
@@ -55,33 +56,31 @@
{
m_provider.stopUpdating();
- WKBatteryManagerRef wkBatteryManager = WKContextGetBatteryManager(m_wkContext.get());
- ASSERT(wkBatteryManager);
-
- WKBatteryManagerSetProvider(wkBatteryManager, 0);
+ ASSERT(m_context->batteryManagerProxy());
+ m_context->batteryManagerProxy()->initializeProvider(0);
}
-PassRefPtr<BatteryProvider> BatteryProvider::create(WKContextRef wkContext)
+PassRefPtr<BatteryProvider> BatteryProvider::create(PassRefPtr<WebContext> context)
{
- return adoptRef(new BatteryProvider(wkContext));
+ ASSERT(context);
+ return adoptRef(new BatteryProvider(context));
}
-BatteryProvider::BatteryProvider(WKContextRef wkContext)
- : m_wkContext(wkContext)
+BatteryProvider::BatteryProvider(PassRefPtr<WebContext> context)
+ : m_context(context)
, m_provider(this)
{
- ASSERT(m_wkContext);
+ ASSERT(context);
- WKBatteryManagerRef wkBatteryManager = WKContextGetBatteryManager(m_wkContext.get());
- ASSERT(wkBatteryManager);
-
WKBatteryProvider wkBatteryProvider = {
kWKBatteryProviderCurrentVersion,
this, // clientInfo
startUpdatingCallback,
stopUpdatingCallback
};
- WKBatteryManagerSetProvider(wkBatteryManager, &wkBatteryProvider);
+
+ ASSERT(m_context->batteryManagerProxy());
+ m_context->batteryManagerProxy()->initializeProvider(&wkBatteryProvider);
}
void BatteryProvider::startUpdating()
@@ -96,11 +95,9 @@
void BatteryProvider::didChangeBatteryStatus(const AtomicString& eventType, PassRefPtr<BatteryStatus> status)
{
- WKBatteryManagerRef wkBatteryManager = WKContextGetBatteryManager(m_wkContext.get());
- ASSERT(wkBatteryManager);
+ RefPtr<WebBatteryStatus> batteryStatus = WebBatteryStatus::create(status->charging(), status->chargingTime(), status->dischargingTime(), status->level());
- WKRetainPtr<WKBatteryStatusRef> wkBatteryStatus(AdoptWK, WKBatteryStatusCreate(status->charging(), status->chargingTime(), status->dischargingTime(), status->level()));
- WKBatteryManagerProviderDidChangeBatteryStatus(wkBatteryManager, toAPI(eventType.impl()), wkBatteryStatus.get());
+ ASSERT(m_context->batteryManagerProxy());
+ m_context->batteryManagerProxy()->providerDidChangeBatteryStatus(eventType, batteryStatus.get());
}
-
#endif // ENABLE(BATTERY_STATUS)
Modified: trunk/Source/WebKit2/UIProcess/efl/BatteryProvider.h (134042 => 134043)
--- trunk/Source/WebKit2/UIProcess/efl/BatteryProvider.h 2012-11-09 11:12:14 UTC (rev 134042)
+++ trunk/Source/WebKit2/UIProcess/efl/BatteryProvider.h 2012-11-09 11:25:24 UTC (rev 134043)
@@ -31,7 +31,7 @@
#include "BatteryProviderEfl.h"
#include "BatteryProviderEflClient.h"
#include "BatteryStatus.h"
-#include "WKRetainPtr.h"
+#include "WebContext.h"
#include <WebKit2/WKBase.h>
#include <wtf/PassRefPtr.h>
@@ -40,18 +40,18 @@
class BatteryProvider : public RefCounted<BatteryProvider>, public WebCore::BatteryProviderEflClient {
public:
virtual ~BatteryProvider();
- static PassRefPtr<BatteryProvider> create(WKContextRef);
+ static PassRefPtr<BatteryProvider> create(PassRefPtr<WebContext>);
void startUpdating();
void stopUpdating();
private:
- explicit BatteryProvider(WKContextRef);
+ explicit BatteryProvider(PassRefPtr<WebContext>);
// BatteryProviderEflClient interface.
virtual void didChangeBatteryStatus(const AtomicString& eventType, PassRefPtr<WebCore::BatteryStatus>);
- WKRetainPtr<WKContextRef> m_wkContext;
+ RefPtr<WebContext> m_context;
WebCore::BatteryProviderEfl m_provider;
};
Modified: trunk/Source/WebKit2/UIProcess/efl/ContextHistoryClientEfl.cpp (134042 => 134043)
--- trunk/Source/WebKit2/UIProcess/efl/ContextHistoryClientEfl.cpp 2012-11-09 11:12:14 UTC (rev 134042)
+++ trunk/Source/WebKit2/UIProcess/efl/ContextHistoryClientEfl.cpp 2012-11-09 11:25:24 UTC (rev 134043)
@@ -106,7 +106,7 @@
historyClient->m_populateVisitedLinks(historyClient->m_userData);
}
-ContextHistoryClientEfl::ContextHistoryClientEfl(WKContextRef context)
+ContextHistoryClientEfl::ContextHistoryClientEfl(PassRefPtr<WebContext> context)
: m_userData(0)
, m_navigate(0)
, m_clientRedirect(0)
@@ -128,7 +128,7 @@
wkHistoryClient.didUpdateHistoryTitle = didUpdateHistoryTitle;
wkHistoryClient.populateVisitedLinks = populateVisitedLinks;
- WKContextSetHistoryClient(context, &wkHistoryClient);
+ context->initializeHistoryClient(&wkHistoryClient);
}
void ContextHistoryClientEfl::setCallbacks(Ewk_History_Navigation_Cb navigate, Ewk_History_Client_Redirection_Cb clientRedirect, Ewk_History_Server_Redirection_Cb serverRedirect, Ewk_History_Title_Update_Cb titleUpdate, Ewk_History_Populate_Visited_Links_Cb populateVisitedLinks, void* data)
Modified: trunk/Source/WebKit2/UIProcess/efl/ContextHistoryClientEfl.h (134042 => 134043)
--- trunk/Source/WebKit2/UIProcess/efl/ContextHistoryClientEfl.h 2012-11-09 11:12:14 UTC (rev 134042)
+++ trunk/Source/WebKit2/UIProcess/efl/ContextHistoryClientEfl.h 2012-11-09 11:25:24 UTC (rev 134043)
@@ -26,6 +26,7 @@
#ifndef ContextHistoryClientEfl_h
#define ContextHistoryClientEfl_h
+#include "WebContext.h"
#include "ewk_context.h"
#include <WebKit2/WKBase.h>
#include <wtf/PassOwnPtr.h>
@@ -34,7 +35,7 @@
class ContextHistoryClientEfl {
public:
- static PassOwnPtr<ContextHistoryClientEfl> create(WKContextRef context)
+ static PassOwnPtr<ContextHistoryClientEfl> create(PassRefPtr<WebContext> context)
{
return adoptPtr(new ContextHistoryClientEfl(context));
}
@@ -42,7 +43,7 @@
void setCallbacks(Ewk_History_Navigation_Cb, Ewk_History_Client_Redirection_Cb, Ewk_History_Server_Redirection_Cb, Ewk_History_Title_Update_Cb, Ewk_History_Populate_Visited_Links_Cb, void*);
private:
- explicit ContextHistoryClientEfl(WKContextRef);
+ explicit ContextHistoryClientEfl(PassRefPtr<WebContext>);
static void didNavigateWithNavigationData(WKContextRef, WKPageRef, WKNavigationDataRef, WKFrameRef, const void*);
static void didPerformClientRedirect(WKContextRef, WKPageRef, WKURLRef sourceURL, WKURLRef, WKFrameRef, const void*);
Modified: trunk/Source/WebKit2/UIProcess/efl/NetworkInfoProvider.cpp (134042 => 134043)
--- trunk/Source/WebKit2/UIProcess/efl/NetworkInfoProvider.cpp 2012-11-09 11:12:14 UTC (rev 134042)
+++ trunk/Source/WebKit2/UIProcess/efl/NetworkInfoProvider.cpp 2012-11-09 11:25:24 UTC (rev 134043)
@@ -28,8 +28,9 @@
#if ENABLE(NETWORK_INFO)
-#include "WKContext.h"
#include "WKNetworkInfoManager.h"
+#include "WebContext.h"
+#include "WebNetworkInfoManagerProxy.h"
#include <NotImplemented.h>
using namespace WebKit;
@@ -59,19 +60,16 @@
return toNetworkInfoProvider(clientInfo)->metered();
}
-PassRefPtr<NetworkInfoProvider> NetworkInfoProvider::create(WKContextRef wkContext)
+PassRefPtr<NetworkInfoProvider> NetworkInfoProvider::create(PassRefPtr<WebContext> context)
{
- return adoptRef(new NetworkInfoProvider(wkContext));
+ return adoptRef(new NetworkInfoProvider(context));
}
-NetworkInfoProvider::NetworkInfoProvider(WKContextRef wkContext)
- : m_wkContext(wkContext)
+NetworkInfoProvider::NetworkInfoProvider(PassRefPtr<WebContext> context)
+ : m_context(context)
{
- ASSERT(wkContext);
+ ASSERT(context);
- WKNetworkInfoManagerRef wkNetworkInfoManager = WKContextGetNetworkInfoManager(m_wkContext.get());
- ASSERT(wkNetworkInfoManager);
-
WKNetworkInfoProvider wkNetworkInfoProvider = {
kWKNetworkInfoProviderCurrentVersion,
this, // clientInfo
@@ -80,15 +78,15 @@
getBandwidthCallback,
isMeteredCallback
};
- WKNetworkInfoManagerSetProvider(wkNetworkInfoManager, &wkNetworkInfoProvider);
+
+ ASSERT(m_context->networkInfoManagerProxy());
+ m_context->networkInfoManagerProxy()->initializeProvider(&wkNetworkInfoProvider);
}
NetworkInfoProvider::~NetworkInfoProvider()
{
- WKNetworkInfoManagerRef wkNetworkInfoManager = WKContextGetNetworkInfoManager(m_wkContext.get());
- ASSERT(wkNetworkInfoManager);
-
- WKNetworkInfoManagerSetProvider(wkNetworkInfoManager, 0);
+ ASSERT(m_context->networkInfoManagerProxy());
+ m_context->networkInfoManagerProxy()->initializeProvider(0);
}
double NetworkInfoProvider::bandwidth() const
Modified: trunk/Source/WebKit2/UIProcess/efl/NetworkInfoProvider.h (134042 => 134043)
--- trunk/Source/WebKit2/UIProcess/efl/NetworkInfoProvider.h 2012-11-09 11:12:14 UTC (rev 134042)
+++ trunk/Source/WebKit2/UIProcess/efl/NetworkInfoProvider.h 2012-11-09 11:25:24 UTC (rev 134043)
@@ -28,6 +28,7 @@
#if ENABLE(NETWORK_INFO)
+#include "WebContext.h"
#include <NetworkInfoClient.h>
#include <NetworkInfoProviderEfl.h>
#include <WebKit2/WKBase.h>
@@ -39,7 +40,7 @@
class NetworkInfoProvider : public RefCounted<NetworkInfoProvider>, public WebCore::NetworkInfoClient {
public:
virtual ~NetworkInfoProvider();
- static PassRefPtr<NetworkInfoProvider> create(WKContextRef);
+ static PassRefPtr<NetworkInfoProvider> create(PassRefPtr<WebContext>);
// NetworkInfoClient interface.
virtual double bandwidth() const;
@@ -49,9 +50,9 @@
virtual void stopUpdating();
private:
- explicit NetworkInfoProvider(WKContextRef);
+ explicit NetworkInfoProvider(PassRefPtr<WebContext>);
- WKRetainPtr<WKContextRef> m_wkContext;
+ RefPtr<WebContext> m_context;
WebCore::NetworkInfoProviderEfl m_provider;
};
