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

Merge "Fix bug 5309557 - Monkeys and SIGSEGV do not mix!"

Browse Source
This commit is contained in:
Adam Powell
2011-09-13 17:15:46 -07:00
committed by Android (Google) Code Review
parent 98da88c366 cc2264fe47
commit 911d63d159
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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