<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[127436] trunk/Source</title>
</head>
<body>

<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt;  }
#msg dl a { font-weight: bold}
#msg dl a:link    { color:#fc3; }
#msg dl a:active  { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff  {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/127436">127436</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2012-09-03 18:44:41 -0700 (Mon, 03 Sep 2012)</dd>
</dl>

<h3>Log Message</h3>
<pre>[EFL] Fix e_dbus_shutdown() error when exiting the Minibrowser
https://bugs.webkit.org/show_bug.cgi?id=95636

Patch by Jinwoo Song &lt;jinwoo7.song@samsung.com&gt; 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):</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreplatformeflBatteryProviderEflcpp">trunk/Source/WebCore/platform/efl/BatteryProviderEfl.cpp</a></li>
<li><a href="#trunkSourceWebKiteflChangeLog">trunk/Source/WebKit/efl/ChangeLog</a></li>
<li><a href="#trunkSourceWebKiteflWebCoreSupportBatteryClientEflcpp">trunk/Source/WebKit/efl/WebCoreSupport/BatteryClientEfl.cpp</a></li>
<li><a href="#trunkSourceWebKiteflWebCoreSupportBatteryClientEflh">trunk/Source/WebKit/efl/WebCoreSupport/BatteryClientEfl.h</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (127435 => 127436)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -1,3 +1,18 @@
</span><ins>+2012-09-03  Jinwoo Song  &lt;jinwoo7.song@samsung.com&gt;
+
+        [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):
+
</ins><span class="cx"> 2012-09-03  Sheriff Bot  &lt;webkit.review.bot@gmail.com&gt;
</span><span class="cx"> 
</span><span class="cx">         Unreviewed, rolling out r127427.
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformeflBatteryProviderEflcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/efl/BatteryProviderEfl.cpp (127435 => 127436)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -59,6 +59,9 @@
</span><span class="cx"> 
</span><span class="cx"> void BatteryProviderEfl::stopUpdating()
</span><span class="cx"> {
</span><ins>+    if (!m_timer.isActive())
+        return;
+
</ins><span class="cx">     m_timer.stop();
</span><span class="cx">     e_ukit_shutdown();
</span><span class="cx">     e_dbus_shutdown();
</span></span></pre></div>
<a id="trunkSourceWebKiteflChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/efl/ChangeLog (127435 => 127436)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -1,5 +1,21 @@
</span><span class="cx"> 2012-09-03  Jinwoo Song  &lt;jinwoo7.song@samsung.com&gt;
</span><span class="cx"> 
</span><ins>+        [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  &lt;jinwoo7.song@samsung.com&gt;
+
</ins><span class="cx">         [EFL] Use WebKitVersion.h to get version information
</span><span class="cx">         https://bugs.webkit.org/show_bug.cgi?id=95669
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkSourceWebKiteflWebCoreSupportBatteryClientEflcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/efl/WebCoreSupport/BatteryClientEfl.cpp (127435 => 127436)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -32,6 +32,11 @@
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx"> 
</span><ins>+BatteryClientEfl::~BatteryClientEfl()
+{
+    m_provider.stopUpdating();
+}
+
</ins><span class="cx"> void BatteryClientEfl::startUpdating()
</span><span class="cx"> {
</span><span class="cx">     m_provider.startUpdating();
</span></span></pre></div>
<a id="trunkSourceWebKiteflWebCoreSupportBatteryClientEflh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/efl/WebCoreSupport/BatteryClientEfl.h (127435 => 127436)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -36,7 +36,7 @@
</span><span class="cx"> class BatteryClientEfl : public WebCore::BatteryClient, public WebCore::BatteryProviderEflClient {
</span><span class="cx"> public:
</span><span class="cx">     explicit BatteryClientEfl(Evas_Object* view);
</span><del>-    virtual ~BatteryClientEfl() { }
</del><ins>+    virtual ~BatteryClientEfl();
</ins><span class="cx"> 
</span><span class="cx">     // BatteryClient interface.
</span><span class="cx">     virtual void startUpdating();
</span></span></pre>
</div>
</div>

</body>
</html>