Title: [127436] trunk/Source
- Revision
- 127436
- Author
- [email protected]
- Date
- 2012-09-03 18:44:41 -0700 (Mon, 03 Sep 2012)
Log Message
[EFL] Fix e_dbus_shutdown() error when exiting the Minibrowser
https://bugs.webkit.org/show_bug.cgi?id=95636
Patch by Jinwoo Song <[email protected]> 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):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (127435 => 127436)
--- trunk/Source/WebCore/ChangeLog 2012-09-04 01:40:14 UTC (rev 127435)
+++ trunk/Source/WebCore/ChangeLog 2012-09-04 01:44:41 UTC (rev 127436)
@@ -1,3 +1,18 @@
+2012-09-03 Jinwoo Song <[email protected]>
+
+ [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 <[email protected]>
Unreviewed, rolling out r127427.
Modified: trunk/Source/WebCore/platform/efl/BatteryProviderEfl.cpp (127435 => 127436)
--- trunk/Source/WebCore/platform/efl/BatteryProviderEfl.cpp 2012-09-04 01:40:14 UTC (rev 127435)
+++ trunk/Source/WebCore/platform/efl/BatteryProviderEfl.cpp 2012-09-04 01:44:41 UTC (rev 127436)
@@ -59,6 +59,9 @@
void BatteryProviderEfl::stopUpdating()
{
+ if (!m_timer.isActive())
+ return;
+
m_timer.stop();
e_ukit_shutdown();
e_dbus_shutdown();
Modified: trunk/Source/WebKit/efl/ChangeLog (127435 => 127436)
--- trunk/Source/WebKit/efl/ChangeLog 2012-09-04 01:40:14 UTC (rev 127435)
+++ trunk/Source/WebKit/efl/ChangeLog 2012-09-04 01:44:41 UTC (rev 127436)
@@ -1,5 +1,21 @@
2012-09-03 Jinwoo Song <[email protected]>
+ [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 <[email protected]>
+
[EFL] Use WebKitVersion.h to get version information
https://bugs.webkit.org/show_bug.cgi?id=95669
Modified: trunk/Source/WebKit/efl/WebCoreSupport/BatteryClientEfl.cpp (127435 => 127436)
--- trunk/Source/WebKit/efl/WebCoreSupport/BatteryClientEfl.cpp 2012-09-04 01:40:14 UTC (rev 127435)
+++ trunk/Source/WebKit/efl/WebCoreSupport/BatteryClientEfl.cpp 2012-09-04 01:44:41 UTC (rev 127436)
@@ -32,6 +32,11 @@
{
}
+BatteryClientEfl::~BatteryClientEfl()
+{
+ m_provider.stopUpdating();
+}
+
void BatteryClientEfl::startUpdating()
{
m_provider.startUpdating();
Modified: trunk/Source/WebKit/efl/WebCoreSupport/BatteryClientEfl.h (127435 => 127436)
--- trunk/Source/WebKit/efl/WebCoreSupport/BatteryClientEfl.h 2012-09-04 01:40:14 UTC (rev 127435)
+++ trunk/Source/WebKit/efl/WebCoreSupport/BatteryClientEfl.h 2012-09-04 01:44:41 UTC (rev 127436)
@@ -36,7 +36,7 @@
class BatteryClientEfl : public WebCore::BatteryClient, public WebCore::BatteryProviderEflClient {
public:
explicit BatteryClientEfl(Evas_Object* view);
- virtual ~BatteryClientEfl() { }
+ virtual ~BatteryClientEfl();
// BatteryClient interface.
virtual void startUpdating();
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo/webkit-changes
