drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am de60ce66: am 358d2cd9: Simplify browser pause/resume logic to avoid stuck timer.

Browse Source 
* commit 'de60ce66c117ebd224b9d3181e2184ec5cfe87f9':
  Simplify browser pause/resume logic to avoid stuck timer.
This commit is contained in:
Shimeng (Simon) Wang
2011-05-23 12:55:37 -07:00
committed by Android Git Automerger
parent d5762583bd de60ce66c1
commit f55a00b1b8
1 changed files with 2 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
core/java/android/webkit/JWebCoreJavaBridge.java
View File

@ -39,9 +39,6 @@ final class JWebCoreJavaBridge extends Handler {
// immediately. // immediately.
private boolean mHasInstantTimer; private boolean mHasInstantTimer;
// Reference count the pause/resume of timers
private int mPauseTimerRefCount;
private boolean mTimerPaused; private boolean mTimerPaused;
private boolean mHasDeferredTimers; private boolean mHasDeferredTimers;
@ -136,7 +133,7 @@ final class JWebCoreJavaBridge extends Handler {
* Pause all timers. * Pause all timers.
*/ */
public void pause() { public void pause() {
if (--mPauseTimerRefCount == 0) { if (!mTimerPaused) {
mTimerPaused = true; mTimerPaused = true;
mHasDeferredTimers = false; mHasDeferredTimers = false;
} }
@ -146,7 +143,7 @@ final class JWebCoreJavaBridge extends Handler {
* Resume all timers. * Resume all timers.
*/ */
public void resume() { public void resume() {
if (++mPauseTimerRefCount == 1) { if (mTimerPaused) {
mTimerPaused = false; mTimerPaused = false;
if (mHasDeferredTimers) { if (mHasDeferredTimers) {
mHasDeferredTimers = false; mHasDeferredTimers = false;