From c5363daee402e38acaebc0b8ba9b97107386af3d Mon Sep 17 00:00:00 2001 From: "commit-queue@webkit.org" Date: Wed, 4 Jul 2012 05:49:44 +0000 Subject: [PATCH] [EFL] Move BatteryClientEfl from WebKit to WebCore https://bugs.webkit.org/show_bug.cgi?id=90063 Patch by Christophe Dumez on 2012-07-03 Reviewed by Kenneth Rohde Christiansen. Move BatteryClientEfl class from WebKit to WebCore so that it can be reused in WebKit2. Source/WebCore: No new tests, no behavior change. * PlatformEfl.cmake: * platform/efl/BatteryClientEfl.cpp: Renamed from Source/WebKit/efl/WebCoreSupport/BatteryClientEfl.cpp. (WebCore): (WebCore::BatteryClientEfl::BatteryClientEfl): (WebCore::BatteryClientEfl::setController): (WebCore::BatteryClientEfl::startUpdating): (WebCore::BatteryClientEfl::stopUpdating): (WebCore::BatteryClientEfl::batteryControllerDestroyed): (WebCore::BatteryClientEfl::setBatteryStatus): (WebCore::BatteryClientEfl::timerFired): (WebCore::BatteryClientEfl::getBatteryStatus): (WebCore::BatteryClientEfl::setBatteryClient): * platform/efl/BatteryClientEfl.h: Renamed from Source/WebKit/efl/WebCoreSupport/BatteryClientEfl.h. (WebCore): (BatteryClientEfl): (WebCore::BatteryClientEfl::~BatteryClientEfl): (WebCore::BatteryClientEfl::batteryStatus): Source/WebKit: * PlatformEfl.cmake: git-svn-id: http://svn.webkit.org/repository/webkit/trunk@121828 268f45cc-cd09-0410-ab3c-d52691b4dbfc --- Source/WebCore/ChangeLog | 30 ++++++++++++++++++++++ Source/WebCore/PlatformEfl.cmake | 1 + .../platform/efl}/BatteryClientEfl.cpp | 6 +++++ .../platform/efl}/BatteryClientEfl.h | 8 +++--- Source/WebKit/ChangeLog | 12 +++++++++ Source/WebKit/PlatformEfl.cmake | 1 - 6 files changed, 53 insertions(+), 5 deletions(-) rename Source/{WebKit/efl/WebCoreSupport => WebCore/platform/efl}/BatteryClientEfl.cpp (98%) rename Source/{WebKit/efl/WebCoreSupport => WebCore/platform/efl}/BatteryClientEfl.h (93%) diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog index 36a5580..d9bdcae 100644 --- a/Source/WebCore/ChangeLog +++ b/Source/WebCore/ChangeLog @@ -1,3 +1,33 @@ +2012-07-03 Christophe Dumez + + [EFL] Move BatteryClientEfl from WebKit to WebCore + https://bugs.webkit.org/show_bug.cgi?id=90063 + + Reviewed by Kenneth Rohde Christiansen. + + Move BatteryClientEfl class from WebKit to WebCore + so that it can be reused in WebKit2. + + No new tests, no behavior change. + + * PlatformEfl.cmake: + * platform/efl/BatteryClientEfl.cpp: Renamed from Source/WebKit/efl/WebCoreSupport/BatteryClientEfl.cpp. + (WebCore): + (WebCore::BatteryClientEfl::BatteryClientEfl): + (WebCore::BatteryClientEfl::setController): + (WebCore::BatteryClientEfl::startUpdating): + (WebCore::BatteryClientEfl::stopUpdating): + (WebCore::BatteryClientEfl::batteryControllerDestroyed): + (WebCore::BatteryClientEfl::setBatteryStatus): + (WebCore::BatteryClientEfl::timerFired): + (WebCore::BatteryClientEfl::getBatteryStatus): + (WebCore::BatteryClientEfl::setBatteryClient): + * platform/efl/BatteryClientEfl.h: Renamed from Source/WebKit/efl/WebCoreSupport/BatteryClientEfl.h. + (WebCore): + (BatteryClientEfl): + (WebCore::BatteryClientEfl::~BatteryClientEfl): + (WebCore::BatteryClientEfl::batteryStatus): + 2012-07-03 Huang Dongsung Add a comment in order to clarify why diff --git a/Source/WebCore/PlatformEfl.cmake b/Source/WebCore/PlatformEfl.cmake index 94e690f..60cd635 100644 --- a/Source/WebCore/PlatformEfl.cmake +++ b/Source/WebCore/PlatformEfl.cmake @@ -23,6 +23,7 @@ LIST(APPEND WebCore_SOURCES page/efl/DragControllerEfl.cpp page/efl/EventHandlerEfl.cpp platform/Cursor.cpp + platform/efl/BatteryClientEfl.cpp platform/efl/ClipboardEfl.cpp platform/efl/ColorChooserEfl.cpp platform/efl/ContextMenuEfl.cpp diff --git a/Source/WebKit/efl/WebCoreSupport/BatteryClientEfl.cpp b/Source/WebCore/platform/efl/BatteryClientEfl.cpp similarity index 98% rename from Source/WebKit/efl/WebCoreSupport/BatteryClientEfl.cpp rename to Source/WebCore/platform/efl/BatteryClientEfl.cpp index 2e12c14..e665b3c 100644 --- a/Source/WebKit/efl/WebCoreSupport/BatteryClientEfl.cpp +++ b/Source/WebCore/platform/efl/BatteryClientEfl.cpp @@ -24,6 +24,7 @@ #include "BatteryController.h" #include "EventNames.h" +#include #include namespace WebCore { @@ -35,6 +36,11 @@ BatteryClientEfl::BatteryClientEfl() { } +BatteryStatus* BatteryClientEfl::batteryStatus() const +{ + return m_batteryStatus.get(); +} + void BatteryClientEfl::setController(BatteryController* controller) { m_controller = controller; diff --git a/Source/WebKit/efl/WebCoreSupport/BatteryClientEfl.h b/Source/WebCore/platform/efl/BatteryClientEfl.h similarity index 93% rename from Source/WebKit/efl/WebCoreSupport/BatteryClientEfl.h rename to Source/WebCore/platform/efl/BatteryClientEfl.h index df47d70..a9f150f 100644 --- a/Source/WebKit/efl/WebCoreSupport/BatteryClientEfl.h +++ b/Source/WebCore/platform/efl/BatteryClientEfl.h @@ -25,13 +25,13 @@ #include "BatteryClient.h" #include "BatteryStatus.h" #include "Timer.h" -#include #include +typedef struct DBusError DBusError; + namespace WebCore { class BatteryController; -class BatteryStatus; class BatteryClientEfl : public BatteryClient { public: @@ -44,7 +44,7 @@ public: virtual void batteryControllerDestroyed(); void setBatteryStatus(const AtomicString& eventType, PassRefPtr); - BatteryStatus* batteryStatus() { return m_batteryStatus.get(); } + BatteryStatus* batteryStatus() const; private: void timerFired(Timer*); @@ -59,6 +59,6 @@ private: } -#endif // BATTERY_STATUS +#endif // ENABLE(BATTERY_STATUS) #endif // BatteryClientEfl_h diff --git a/Source/WebKit/ChangeLog b/Source/WebKit/ChangeLog index 29798c0..35ac6c3 100644 --- a/Source/WebKit/ChangeLog +++ b/Source/WebKit/ChangeLog @@ -1,3 +1,15 @@ +2012-07-03 Christophe Dumez + + [EFL] Move BatteryClientEfl from WebKit to WebCore + https://bugs.webkit.org/show_bug.cgi?id=90063 + + Reviewed by Kenneth Rohde Christiansen. + + Move BatteryClientEfl class from WebKit to WebCore + so that it can be reused in WebKit2. + + * PlatformEfl.cmake: + 2012-07-02 Xiaobo Wang [BlackBerry] Use PUBLIC_BUILD to enable/disable DRT diff --git a/Source/WebKit/PlatformEfl.cmake b/Source/WebKit/PlatformEfl.cmake index 19fd36b..12212ef 100644 --- a/Source/WebKit/PlatformEfl.cmake +++ b/Source/WebKit/PlatformEfl.cmake @@ -161,7 +161,6 @@ ENDIF () IF (ENABLE_BATTERY_STATUS) LIST(APPEND WebKit_INCLUDE_DIRECTORIES ${WEBCORE_DIR}/Modules/battery) - LIST(APPEND WebKit_SOURCES efl/WebCoreSupport/BatteryClientEfl.cpp) ENDIF () IF (ENABLE_REGISTER_PROTOCOL_HANDLER) -- 2.7.4