Diff
Modified: trunk/Source/WebKit2/ChangeLog (132467 => 132468)
--- trunk/Source/WebKit2/ChangeLog 2012-10-25 11:16:37 UTC (rev 132467)
+++ trunk/Source/WebKit2/ChangeLog 2012-10-25 11:27:09 UTC (rev 132468)
@@ -1,3 +1,25 @@
+2012-10-25 Byungwoo Lee <[email protected]>
+
+ [EFL][WK2] Add missing namespace.
+ https://bugs.webkit.org/show_bug.cgi?id=100251
+
+ Reviewed by Kenneth Rohde Christiansen.
+
+ Add 'WebKit' namespace for BatteryProvider, NetworkInfoProvider and
+ VibrationProvider.
+
+ * UIProcess/API/efl/BatteryProvider.h:
+ (WebKit):
+ * UIProcess/API/efl/NetworkInfoProvider.cpp:
+ * UIProcess/API/efl/NetworkInfoProvider.h:
+ (WebKit):
+ * UIProcess/API/efl/VibrationProvider.cpp:
+ * UIProcess/API/efl/VibrationProvider.h:
+ (WebKit):
+ * UIProcess/API/efl/ewk_context_private.h:
+ (WebKit):
+ (Ewk_Context):
+
2012-10-25 Jocelyn Turcotte <[email protected]>
[Qt] Detach WebContext's clients from QtWebContext
Modified: trunk/Source/WebKit2/UIProcess/API/efl/BatteryProvider.h (132467 => 132468)
--- trunk/Source/WebKit2/UIProcess/API/efl/BatteryProvider.h 2012-10-25 11:16:37 UTC (rev 132467)
+++ trunk/Source/WebKit2/UIProcess/API/efl/BatteryProvider.h 2012-10-25 11:27:09 UTC (rev 132468)
@@ -35,6 +35,8 @@
#include <WebKit2/WKBase.h>
#include <wtf/PassRefPtr.h>
+namespace WebKit {
+
class BatteryProvider : public RefCounted<BatteryProvider>, public WebCore::BatteryProviderEflClient {
public:
virtual ~BatteryProvider();
@@ -53,6 +55,8 @@
WebCore::BatteryProviderEfl m_provider;
};
+} // namespace WebKit
+
#endif // ENABLE(BATTERY_STATUS)
#endif // BatteryProvider_h
Modified: trunk/Source/WebKit2/UIProcess/API/efl/NetworkInfoProvider.cpp (132467 => 132468)
--- trunk/Source/WebKit2/UIProcess/API/efl/NetworkInfoProvider.cpp 2012-10-25 11:16:37 UTC (rev 132467)
+++ trunk/Source/WebKit2/UIProcess/API/efl/NetworkInfoProvider.cpp 2012-10-25 11:27:09 UTC (rev 132468)
@@ -32,6 +32,8 @@
#include "WKNetworkInfoManager.h"
#include <NotImplemented.h>
+using namespace WebKit;
+
static inline NetworkInfoProvider* toNetworkInfoProvider(const void* clientInfo)
{
return static_cast<NetworkInfoProvider*>(const_cast<void*>(clientInfo));
Modified: trunk/Source/WebKit2/UIProcess/API/efl/NetworkInfoProvider.h (132467 => 132468)
--- trunk/Source/WebKit2/UIProcess/API/efl/NetworkInfoProvider.h 2012-10-25 11:16:37 UTC (rev 132467)
+++ trunk/Source/WebKit2/UIProcess/API/efl/NetworkInfoProvider.h 2012-10-25 11:27:09 UTC (rev 132468)
@@ -34,6 +34,8 @@
#include <WebKit2/WKRetainPtr.h>
#include <wtf/PassRefPtr.h>
+namespace WebKit {
+
class NetworkInfoProvider : public RefCounted<NetworkInfoProvider>, public WebCore::NetworkInfoClient {
public:
virtual ~NetworkInfoProvider();
@@ -53,6 +55,8 @@
WebCore::NetworkInfoProviderEfl m_provider;
};
+} // namespace WebKit
+
#endif // ENABLE(NETWORK_INFO)
#endif // NetworkInfoProvider_h
Modified: trunk/Source/WebKit2/UIProcess/API/efl/VibrationProvider.cpp (132467 => 132468)
--- trunk/Source/WebKit2/UIProcess/API/efl/VibrationProvider.cpp 2012-10-25 11:16:37 UTC (rev 132467)
+++ trunk/Source/WebKit2/UIProcess/API/efl/VibrationProvider.cpp 2012-10-25 11:27:09 UTC (rev 132468)
@@ -34,6 +34,7 @@
#include <Evas.h>
using namespace WebCore;
+using namespace WebKit;
/**
* \struct Ewk_Vibration_Client
Modified: trunk/Source/WebKit2/UIProcess/API/efl/VibrationProvider.h (132467 => 132468)
--- trunk/Source/WebKit2/UIProcess/API/efl/VibrationProvider.h 2012-10-25 11:16:37 UTC (rev 132467)
+++ trunk/Source/WebKit2/UIProcess/API/efl/VibrationProvider.h 2012-10-25 11:27:09 UTC (rev 132468)
@@ -35,6 +35,8 @@
typedef struct Ewk_Vibration_Client Ewk_Vibration_Client;
+namespace WebKit {
+
class VibrationProvider : public RefCounted<VibrationProvider> {
public:
static PassRefPtr<VibrationProvider> create(WKContextRef);
@@ -51,6 +53,8 @@
OwnPtr<Ewk_Vibration_Client> m_vibrationClient;
};
+} // namespace WebKit
+
#endif // ENABLE(VIBRATION)
#endif // VibrationProvider_h
Modified: trunk/Source/WebKit2/UIProcess/API/efl/ewk_context_private.h (132467 => 132468)
--- trunk/Source/WebKit2/UIProcess/API/efl/ewk_context_private.h 2012-10-25 11:16:37 UTC (rev 132467)
+++ trunk/Source/WebKit2/UIProcess/API/efl/ewk_context_private.h 2012-10-25 11:27:09 UTC (rev 132468)
@@ -28,6 +28,10 @@
class Ewk_Url_Scheme_Request;
class Ewk_Cookie_Manager;
class Ewk_Favicon_Database;
+
+namespace WebKit {
+class ContextHistoryClientEfl;
+class RequestManagerClientEfl;
#if ENABLE(BATTERY_STATUS)
class BatteryProvider;
#endif
@@ -37,10 +41,6 @@
#if ENABLE(VIBRATION)
class VibrationProvider;
#endif
-
-namespace WebKit {
-class ContextHistoryClientEfl;
-class RequestManagerClientEfl;
}
class Ewk_Context : public RefCounted<Ewk_Context> {
@@ -60,7 +60,7 @@
WebKit::RequestManagerClientEfl* requestManager();
#if ENABLE(VIBRATION)
- PassRefPtr<VibrationProvider> vibrationProvider();
+ PassRefPtr<WebKit::VibrationProvider> vibrationProvider();
#endif
void addVisitedLink(const String& visitedURL);
@@ -85,13 +85,13 @@
OwnPtr<Ewk_Cookie_Manager> m_cookieManager;
OwnPtr<Ewk_Favicon_Database> m_faviconDatabase;
#if ENABLE(BATTERY_STATUS)
- RefPtr<BatteryProvider> m_batteryProvider;
+ RefPtr<WebKit::BatteryProvider> m_batteryProvider;
#endif
#if ENABLE(NETWORK_INFO)
- RefPtr<NetworkInfoProvider> m_networkInfoProvider;
+ RefPtr<WebKit::NetworkInfoProvider> m_networkInfoProvider;
#endif
#if ENABLE(VIBRATION)
- RefPtr<VibrationProvider> m_vibrationProvider;
+ RefPtr<WebKit::VibrationProvider> m_vibrationProvider;
#endif
OwnPtr<WebKit::DownloadManagerEfl> m_downloadManager;
OwnPtr<WebKit::RequestManagerClientEfl> m_requestManagerClient;
