diff options
| author | Mathew Inwood <mathewi@google.com> | 2011-08-02 11:14:10 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-08-02 11:14:10 -0700 |
| commit | dcffae4ac85da22ce6fb441e943527ebf4491ec2 (patch) | |
| tree | 90c4498223901d2803735d383e20a4d3e110c735 | |
| parent | 513207630d500ac9a75d9d139655bf6aa32cc1be (diff) | |
| parent | cf9120ebd80d9ecdf54ec387bc1e8c4b9b91c6ea (diff) | |
| download | packages_apps_Browser-dcffae4ac85da22ce6fb441e943527ebf4491ec2.zip packages_apps_Browser-dcffae4ac85da22ce6fb441e943527ebf4491ec2.tar.gz packages_apps_Browser-dcffae4ac85da22ce6fb441e943527ebf4491ec2.tar.bz2 | |
Merge "Don't pause webview timers as we're rendering a preloaded tab."
| -rw-r--r-- | src/com/android/browser/Preloader.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/com/android/browser/Preloader.java b/src/com/android/browser/Preloader.java index 37cbc0e..3d30c96 100644 --- a/src/com/android/browser/Preloader.java +++ b/src/com/android/browser/Preloader.java @@ -84,7 +84,6 @@ public class Preloader { s.cancelTimeout(); } - WebViewTimersControl.getInstance().onPrerenderDone(s == null ? null : s.getWebView()); return s; } @@ -111,6 +110,7 @@ public class Preloader { PreloaderSession s = takeSession(id); if (s != null) { if (LOGD_ENABLED) Log.d(LOGTAG, "Discard preload session " + id); + WebViewTimersControl.getInstance().onPrerenderDone(s == null ? null : s.getWebView()); PreloadedTabControl t = s.getTabControl(); t.destroy(); } else { |