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

It is possible that we may get a call from WebCore that the first layout has

Browse Source 
completed before we've successfully syncd the webview dimensions from Java to
native and in this case, we end up syncing a height of 0 to WebKit. This causes
hit detection to fail, as WebKit thinks we have a 0-height visible area. This
patch fixes this scenario by syncing the height of the webview back to WebKit
in the case that the first layout comes back before we've sent our dimensions.

Fix for b/2449863

Change-Id: Id72c37b17411f3409edc7104d83ca5ffd17ab09b
This commit is contained in:
Ben Murdoch
2010-03-05 11:30:07 +00:00
parent ff846009ec
commit d1bee05d64
1 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
core/java/android/webkit/WebViewCore.java
View File

@@ -2191,7 +2191,14 @@ final class WebViewCore {
);
}
data.mWidth = Math.round(webViewWidth / data.mScale);
data.mHeight = mCurrentViewHeight * data.mWidth / viewportWidth;
// We may get a call here when mCurrentViewHeight == 0 if webcore completes the
// first layout before we sync our webview dimensions to it. In that case, we
// request the real height of the webview. This is not a perfect solution as we
// are calling a WebView method from the WebCore thread. But this is preferable
// to syncing an incorrect height.
data.mHeight = mCurrentViewHeight == 0 ?
Math.round(mWebView.getViewHeight() / data.mScale)
: mCurrentViewHeight * data.mWidth / viewportWidth;
data.mTextWrapWidth = Math.round(webViewWidth
/ mRestoreState.mTextWrapScale);
data.mIgnoreHeight = false;