Diff
Modified: trunk/Source/WebKit2/CMakeLists.txt (122298 => 122299)
--- trunk/Source/WebKit2/CMakeLists.txt 2012-07-11 05:43:06 UTC (rev 122298)
+++ trunk/Source/WebKit2/CMakeLists.txt 2012-07-11 06:10:43 UTC (rev 122299)
@@ -43,6 +43,7 @@
"${WEBKIT2_DIR}/WebProcess/WebCoreSupport"
"${WEBKIT2_DIR}/WebProcess/WebPage"
"${WEBCORE_DIR}"
+ "${WEBCORE_DIR}/Modules/battery"
"${WEBCORE_DIR}/Modules/intents"
"${WEBCORE_DIR}/accessibility"
"${WEBCORE_DIR}/bindings/js"
Modified: trunk/Source/WebKit2/ChangeLog (122298 => 122299)
--- trunk/Source/WebKit2/ChangeLog 2012-07-11 05:43:06 UTC (rev 122298)
+++ trunk/Source/WebKit2/ChangeLog 2012-07-11 06:10:43 UTC (rev 122299)
@@ -1,3 +1,33 @@
+2012-07-10 Christophe Dumez <[email protected]>
+
+ [WK2][EFL] Add Battery Status Provider
+ https://bugs.webkit.org/show_bug.cgi?id=90543
+
+ Reviewed by Kenneth Rohde Christiansen.
+
+ Define a battery status provider for WebKit2 EFL which
+ relies on WebCore::BatteryProviderEfl.
+
+ * CMakeLists.txt: Add WebCore/Modules/battery to include
+ paths.
+ * PlatformEfl.cmake: Add BatteryProvider class to CMake.
+ * UIProcess/API/efl/BatteryProvider.cpp: Added.
+ (toBatteryProvider):
+ (startUpdatingCallback):
+ (stopUpdatingCallback):
+ (BatteryProvider::~BatteryProvider):
+ (BatteryProvider::create):
+ (BatteryProvider::BatteryProvider):
+ (BatteryProvider::startUpdating):
+ (BatteryProvider::stopUpdating):
+ (BatteryProvider::didChangeBatteryStatus):
+ * UIProcess/API/efl/BatteryProvider.h: Added.
+ (BatteryProvider):
+ * UIProcess/API/efl/ewk_context.cpp:
+ (_Ewk_Context): Add BatteryProvider to Ewk_Context.
+ (createDefaultEwkContext):
+ (ewk_context_default_get):
+
2012-07-10 No'am Rosenthal <[email protected]>
[Qt] Enable antialiasing for TextureMapper
Modified: trunk/Source/WebKit2/PlatformEfl.cmake (122298 => 122299)
--- trunk/Source/WebKit2/PlatformEfl.cmake 2012-07-11 05:43:06 UTC (rev 122298)
+++ trunk/Source/WebKit2/PlatformEfl.cmake 2012-07-11 06:10:43 UTC (rev 122299)
@@ -32,6 +32,7 @@
UIProcess/API/C/soup/WKContextSoup.cpp
UIProcess/API/C/soup/WKSoupRequestManager.cpp
+ UIProcess/API/efl/BatteryProvider.cpp
UIProcess/API/efl/PageClientImpl.cpp
UIProcess/API/efl/ewk_context.cpp
UIProcess/API/efl/ewk_intent.cpp
Added: trunk/Source/WebKit2/UIProcess/API/efl/BatteryProvider.cpp (0 => 122299)
--- trunk/Source/WebKit2/UIProcess/API/efl/BatteryProvider.cpp (rev 0)
+++ trunk/Source/WebKit2/UIProcess/API/efl/BatteryProvider.cpp 2012-07-11 06:10:43 UTC (rev 122299)
@@ -0,0 +1,94 @@
+/*
+ * 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
+ * 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.
+ */
+
+#include "config.h"
+#include "BatteryProvider.h"
+
+#if ENABLE(BATTERY_STATUS)
+
+#include "WKAPICast.h"
+#include "WKBatteryManager.h"
+#include "WKBatteryStatus.h"
+
+using namespace WebCore;
+using namespace WebKit;
+
+static inline BatteryProviderEfl* toBatteryProvider(const void* clientInfo)
+{
+ return static_cast<BatteryProviderEfl*>(const_cast<void*>(clientInfo));
+}
+
+static void startUpdatingCallback(WKBatteryManagerRef batteryManager, const void* clientInfo)
+{
+ toBatteryProvider(clientInfo)->startUpdating();
+}
+
+static void stopUpdatingCallback(WKBatteryManagerRef batteryManager, const void* clientInfo)
+{
+ toBatteryProvider(clientInfo)->stopUpdating();
+}
+
+BatteryProvider::~BatteryProvider()
+{
+ m_provider.stopUpdating();
+}
+
+PassRefPtr<BatteryProvider> BatteryProvider::create(WKBatteryManagerRef wkBatteryManager)
+{
+ return adoptRef(new BatteryProvider(wkBatteryManager));
+}
+
+BatteryProvider::BatteryProvider(WKBatteryManagerRef wkBatteryManager)
+ : m_wkBatteryManager(wkBatteryManager)
+ , m_provider(this)
+{
+ ASSERT(wkBatteryManager);
+
+ WKBatteryProvider wkBatteryProvider = {
+ kWKBatteryProviderCurrentVersion,
+ this, // clientInfo
+ startUpdatingCallback,
+ stopUpdatingCallback
+ };
+ WKBatteryManagerSetProvider(m_wkBatteryManager.get(), &wkBatteryProvider);
+}
+
+void BatteryProvider::startUpdating()
+{
+ m_provider.startUpdating();
+}
+
+void BatteryProvider::stopUpdating()
+{
+ m_provider.stopUpdating();
+}
+
+void BatteryProvider::didChangeBatteryStatus(const AtomicString& eventType, PassRefPtr<BatteryStatus> status)
+{
+ WKRetainPtr<WKBatteryStatusRef> wkBatteryStatus(AdoptWK, WKBatteryStatusCreate(status->charging(), status->chargingTime(), status->dischargingTime(), status->level()));
+ WKBatteryManagerProviderDidChangeBatteryStatus(m_wkBatteryManager.get(), toAPI(eventType.impl()), wkBatteryStatus.get());
+}
+
+#endif // ENABLE(BATTERY_STATUS)
Added: trunk/Source/WebKit2/UIProcess/API/efl/BatteryProvider.h (0 => 122299)
--- trunk/Source/WebKit2/UIProcess/API/efl/BatteryProvider.h (rev 0)
+++ trunk/Source/WebKit2/UIProcess/API/efl/BatteryProvider.h 2012-07-11 06:10:43 UTC (rev 122299)
@@ -0,0 +1,58 @@
+/*
+ * 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
+ * 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 BatteryProvider_h
+#define BatteryProvider_h
+
+#if ENABLE(BATTERY_STATUS)
+
+#include "BatteryProviderEfl.h"
+#include "BatteryProviderEflClient.h"
+#include "BatteryStatus.h"
+#include "WKRetainPtr.h"
+#include <WebKit2/WKBase.h>
+#include <wtf/PassRefPtr.h>
+
+class BatteryProvider : public RefCounted<BatteryProvider>, public WebCore::BatteryProviderEflClient {
+public:
+ virtual ~BatteryProvider();
+ static PassRefPtr<BatteryProvider> create(WKBatteryManagerRef);
+
+ void startUpdating();
+ void stopUpdating();
+
+private:
+ BatteryProvider(WKBatteryManagerRef);
+
+ // BatteryProviderEflClient interface.
+ virtual void didChangeBatteryStatus(const AtomicString& eventType, PassRefPtr<WebCore::BatteryStatus>);
+
+ WKRetainPtr<WKBatteryManagerRef> m_wkBatteryManager;
+ WebCore::BatteryProviderEfl m_provider;
+};
+
+#endif // ENABLE(BATTERY_STATUS)
+
+#endif // BatteryProvider_h
Modified: trunk/Source/WebKit2/UIProcess/API/efl/ewk_context.cpp (122298 => 122299)
--- trunk/Source/WebKit2/UIProcess/API/efl/ewk_context.cpp 2012-07-11 05:43:06 UTC (rev 122298)
+++ trunk/Source/WebKit2/UIProcess/API/efl/ewk_context.cpp 2012-07-11 06:10:43 UTC (rev 122299)
@@ -21,6 +21,7 @@
#include "config.h"
#include "ewk_context.h"
+#include "BatteryProvider.h"
#include "WKAPICast.h"
#include "WKRetainPtr.h"
#include "ewk_context_private.h"
@@ -29,6 +30,9 @@
struct _Ewk_Context {
WKRetainPtr<WKContextRef> context;
+#if ENABLE(BATTERY_STATUS)
+ RefPtr<BatteryProvider> batteryProvider;
+#endif
_Ewk_Context(WKContextRef contextRef)
{
@@ -41,8 +45,22 @@
return ewkContext->context.get();
}
+static inline Ewk_Context* createDefaultEwkContext()
+{
+ WKContextRef wkContext = WKContextGetSharedProcessContext();
+ Ewk_Context* ewkContext = new Ewk_Context(wkContext);
+
+#if ENABLE(BATTERY_STATUS)
+ WKBatteryManagerRef wkBatteryManager = WKContextGetBatteryManager(wkContext);
+ ewkContext->batteryProvider = BatteryProvider::create(wkBatteryManager);
+#endif
+
+ return ewkContext;
+}
+
Ewk_Context* ewk_context_default_get()
{
- DEFINE_STATIC_LOCAL(Ewk_Context, defaultContext, (WKContextGetSharedProcessContext()));
- return &defaultContext;
+ static Ewk_Context* defaultContext = createDefaultEwkContext();
+
+ return defaultContext;
}
