Changeset 127436 in webkit

Timestamp:

Sep 3, 2012 6:44:41 PM (12 years ago)

Author:

commit-queue@webkit.org

Message:

[EFL] Fix e_dbus_shutdown() error when exiting the Minibrowser
​https://bugs.webkit.org/show_bug.cgi?id=95636

Patch by Jinwoo Song <​jinwoo7.song@samsung.com> on 2012-09-03
Reviewed by Gyuyoung Kim.

Source/WebCore:

Check if the m_timer is active in stopUpdating()
to know the BatteryProvider is updating or not.
By checking the timer, stopUpdating() will be called
only BatteryProviderEfl is updating.

• platform/efl/BatteryProviderEfl.cpp:

(WebCore::BatteryProviderEfl::stopUpdating):

Source/WebKit/efl:

Invoke stopUpdating() in the destructor of BatteryClinetEfl()
to call e_ukit_shutdown() and e_dbus_shutdown() if and when
stopUpdating() has not been called explicitly.

• WebCoreSupport/BatteryClientEfl.cpp:

(BatteryClientEfl::~BatteryClientEfl):

• WebCoreSupport/BatteryClientEfl.h:

(BatteryClientEfl):

Location:

trunk/Source

Files:

• WebCore/ChangeLog (modified) (1 diff)
• WebCore/platform/efl/BatteryProviderEfl.cpp (modified) (1 diff)
• WebKit/efl/ChangeLog (modified) (1 diff)
• WebKit/efl/WebCoreSupport/BatteryClientEfl.cpp (modified) (1 diff)
• WebKit/efl/WebCoreSupport/BatteryClientEfl.h (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-09-03  Jinwoo Song  <jinwoo7.song@samsung.com>
+
+        [EFL] Fix e_dbus_shutdown() error when exiting the Minibrowser
+        https://bugs.webkit.org/show_bug.cgi?id=95636
+
+        Reviewed by Gyuyoung Kim.
+
+        Check if the m_timer is active in stopUpdating()
+        to know the BatteryProvider is updating or not.
+        By checking the timer, stopUpdating() will be called 
+        only BatteryProviderEfl is updating.
+
+        * platform/efl/BatteryProviderEfl.cpp:
+        (WebCore::BatteryProviderEfl::stopUpdating):
+
 2012-09-03  Sheriff Bot  <webkit.review.bot@gmail.com>
 

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

@@ -60 +60 @@
 void BatteryProviderEfl::stopUpdating()
 {
+    if (!m_timer.isActive())
+        return;
+
     m_timer.stop();
     e_ukit_shutdown();

trunk/Source/WebKit/efl/ChangeLog

@@ +1 @@
+2012-09-03  Jinwoo Song  <jinwoo7.song@samsung.com>
+
+        [EFL] Fix e_dbus_shutdown() error when exiting the Minibrowser
+        https://bugs.webkit.org/show_bug.cgi?id=95636
+
+        Reviewed by Gyuyoung Kim.
+
+        Invoke stopUpdating() in the destructor of BatteryClinetEfl()
+        to call e_ukit_shutdown() and e_dbus_shutdown() if and when 
+        stopUpdating() has not been called explicitly.
+
+        * WebCoreSupport/BatteryClientEfl.cpp:
+        (BatteryClientEfl::~BatteryClientEfl):
+        * WebCoreSupport/BatteryClientEfl.h:
+        (BatteryClientEfl):
+
 2012-09-03  Jinwoo Song  <jinwoo7.song@samsung.com>
 

trunk/Source/WebKit/efl/WebCoreSupport/BatteryClientEfl.cpp

@@ -33 +33 @@
 }
 
+BatteryClientEfl::~BatteryClientEfl()
+{
+    m_provider.stopUpdating();
+}
+
 void BatteryClientEfl::startUpdating()
 {

trunk/Source/WebKit/efl/WebCoreSupport/BatteryClientEfl.h

@@ -37 +37 @@
 public:
     explicit BatteryClientEfl(Evas_Object* view);
-    virtual ~BatteryClientEfl() { }
+    virtual ~BatteryClientEfl();
 
     // BatteryClient interface.