Changeset 121828 in webkit

Timestamp:

Jul 3, 2012 10:49:44 PM (12 years ago)

Author:

commit-queue@webkit.org

Message:

[EFL] Move BatteryClientEfl from WebKit to WebCore
​https://bugs.webkit.org/show_bug.cgi?id=90063

Patch by Christophe Dumez <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:

Location:

trunk/Source

Files:

• WebCore/ChangeLog (modified) (1 diff)
• WebCore/PlatformEfl.cmake (modified) (1 diff)
• WebCore/platform/efl/BatteryClientEfl.cpp (moved) (moved from trunk/Source/WebKit/efl/WebCoreSupport/BatteryClientEfl.cpp) (2 diffs)
• WebCore/platform/efl/BatteryClientEfl.h (moved) (moved from trunk/Source/WebKit/efl/WebCoreSupport/BatteryClientEfl.h) (3 diffs)
• WebKit/ChangeLog (modified) (1 diff)
• WebKit/PlatformEfl.cmake (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-07-03  Christophe Dumez  <christophe.dumez@intel.com>
+
+        [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  <luxtella@company100.net>
 

trunk/Source/WebCore/PlatformEfl.cmake

@@ -24 +24 @@
   page/efl/EventHandlerEfl.cpp
   platform/Cursor.cpp
+  platform/efl/BatteryClientEfl.cpp
   platform/efl/ClipboardEfl.cpp
   platform/efl/ColorChooserEfl.cpp

trunk/Source/WebCore/platform/efl/BatteryClientEfl.cpp

@@ -25 +25 @@
 #include "BatteryController.h"
 #include "EventNames.h"
+#include <E_Ukit.h>
 #include <limits>
 
@@ -34 +35 @@
     , m_batteryStatusRefreshInterval(1.0)
 {
+}
+
+BatteryStatus* BatteryClientEfl::batteryStatus() const
+{
+    return m_batteryStatus.get();
 }
 

trunk/Source/WebCore/platform/efl/BatteryClientEfl.h

@@ -26 +26 @@
 #include "BatteryStatus.h"
 #include "Timer.h"
-#include <E_Ukit.h>
 #include <wtf/text/AtomicString.h>
+
+typedef struct DBusError DBusError;
 
 namespace WebCore {
 
 class BatteryController;
-class BatteryStatus;
 
 class BatteryClientEfl : public BatteryClient {
@@ -45 +45 @@
 
     void setBatteryStatus(const AtomicString& eventType, PassRefPtr<BatteryStatus>);
-    BatteryStatus* batteryStatus() { return m_batteryStatus.get(); }
+    BatteryStatus* batteryStatus() const;
 
 private:
@@ -60 +60 @@
 }
 
-#endif // BATTERY_STATUS
+#endif // ENABLE(BATTERY_STATUS)
 #endif // BatteryClientEfl_h
 

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2012-07-03  Christophe Dumez  <christophe.dumez@intel.com>
+
+        [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  <xbwang@torchmobile.com.cn>
 

trunk/Source/WebKit/PlatformEfl.cmake

@@ -162 +162 @@
 IF (ENABLE_BATTERY_STATUS)
     LIST(APPEND WebKit_INCLUDE_DIRECTORIES ${WEBCORE_DIR}/Modules/battery)
-    LIST(APPEND WebKit_SOURCES efl/WebCoreSupport/BatteryClientEfl.cpp)
 ENDIF ()