Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix bug 5314559 - Slow menu scrolling in browser on some devices"

Browse Source
This commit is contained in:
Adam Powell
2011-09-13 21:13:15 -07:00
committed by Android (Google) Code Review
parent d18addb4e3 f4f520ae9f
commit 87105a3d48
1 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
core/java/android/webkit/WebView.java
View File

@@ -5580,18 +5580,16 @@ public class WebView extends AbsoluteLayout
setActive(hasWindowFocus); setActive(hasWindowFocus);
if (hasWindowFocus) { if (hasWindowFocus) {
JWebCoreJavaBridge.setActiveWebView(this); JWebCoreJavaBridge.setActiveWebView(this);
if (mPictureUpdatePausedForFocusChange && mNativeClass != 0) { if (mPictureUpdatePausedForFocusChange) {
WebViewCore.resumeUpdatePicture(mWebViewCore); WebViewCore.resumeUpdatePicture(mWebViewCore);
nativeSetIsScrolling(false);
mPictureUpdatePausedForFocusChange = false; mPictureUpdatePausedForFocusChange = false;
} }
} else { } else {
JWebCoreJavaBridge.removeActiveWebView(this); JWebCoreJavaBridge.removeActiveWebView(this);
final WebSettings settings = getSettings(); final WebSettings settings = getSettings();
if (settings != null && settings.enableSmoothTransition() && mNativeClass != 0 && if (settings != null && settings.enableSmoothTransition() &&
mWebViewCore != null && !WebViewCore.isUpdatePicturePaused(mWebViewCore)) { mWebViewCore != null && !WebViewCore.isUpdatePicturePaused(mWebViewCore)) {
WebViewCore.pauseUpdatePicture(mWebViewCore); WebViewCore.pauseUpdatePicture(mWebViewCore);
nativeSetIsScrolling(true);
mPictureUpdatePausedForFocusChange = true; mPictureUpdatePausedForFocusChange = true;
} }
} }