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

Merge "The visiblerect calculation should take view's scaling into consideration"

Browse Source
This commit is contained in:
Teng-Hui Zhu
2012-04-25 09:59:57 -07:00
committed by Android (Google) Code Review
parent 867b96bd15 227036b82b
commit d6c131dc47
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
core/java/android/webkit/WebViewClassic.java
View File

@@ -3039,14 +3039,14 @@ public final class WebViewClassic implements WebViewProvider, WebViewProvider.Sc
// the scale factor is not 1)
private void calcOurContentVisibleRectF(RectF r) {
calcOurVisibleRect(mContentVisibleRect);
r.left = viewToContentXf(mContentVisibleRect.left);
r.left = viewToContentXf(mContentVisibleRect.left) / mWebView.getScaleX();
// viewToContentY will remove the total height of the title bar. Add
// the visible height back in to account for the fact that if the title
// bar is partially visible, the part of the visible rect which is
// displaying our content is displaced by that amount.
r.top = viewToContentYf(mContentVisibleRect.top + getVisibleTitleHeightImpl());
r.right = viewToContentXf(mContentVisibleRect.right);
r.bottom = viewToContentYf(mContentVisibleRect.bottom);
r.top = viewToContentYf(mContentVisibleRect.top + getVisibleTitleHeightImpl()) / mWebView.getScaleY();
r.right = viewToContentXf(mContentVisibleRect.right) / mWebView.getScaleX();
r.bottom = viewToContentYf(mContentVisibleRect.bottom) / mWebView.getScaleY();
}
static class ViewSizeData {