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

Merge "Fix artifact with clipped webview content" into honeycomb

Browse Source
This commit is contained in:
Chet Haase
2011-01-28 10:16:54 -08:00
committed by Android (Google) Code Review
parent b8498f1dcf 91fc3cf3b6
commit fe38b7b793
1 changed files with 18 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -350,6 +350,7 @@ public class WebView extends AbsoluteLayout
private ZoomManager mZoomManager;
private Rect mGLRectViewport = new Rect();
private boolean mGLViewportEmpty = false;
/**
* Transportation object for returning WebView across thread boundaries.
@@ -4075,7 +4076,8 @@ public class WebView extends AbsoluteLayout
}
if (canvas.isHardwareAccelerated()) {
int functor = nativeGetDrawGLFunction(mGLRectViewport, getScale(), extras);
int functor = nativeGetDrawGLFunction(mGLViewportEmpty ? null : mGLRectViewport,
getScale(), extras);
((HardwareCanvas) canvas).callDrawGLFunction(functor);
} else {
DrawFilter df = null;
@@ -5159,16 +5161,21 @@ public class WebView extends AbsoluteLayout
void setGLRectViewport() {
// Use the getGlobalVisibleRect() to get the intersection among the parents
getGlobalVisibleRect(mGLRectViewport);
// Then need to invert the Y axis, just for GL
View rootView = getRootView();
int rootViewHeight = rootView.getHeight();
int savedWebViewBottom = mGLRectViewport.bottom;
mGLRectViewport.bottom = rootViewHeight - mGLRectViewport.top - getVisibleTitleHeight();
mGLRectViewport.top = rootViewHeight - savedWebViewBottom;
nativeUpdateDrawGLFunction(mGLRectViewport);
// visible == false means we're clipped - send a null rect down to indicate that
// we should not draw
boolean visible = getGlobalVisibleRect(mGLRectViewport);
if (visible) {
// Then need to invert the Y axis, just for GL
View rootView = getRootView();
int rootViewHeight = rootView.getHeight();
int savedWebViewBottom = mGLRectViewport.bottom;
mGLRectViewport.bottom = rootViewHeight - mGLRectViewport.top - getVisibleTitleHeight();
mGLRectViewport.top = rootViewHeight - savedWebViewBottom;
mGLViewportEmpty = false;
} else {
mGLViewportEmpty = true;
}
nativeUpdateDrawGLFunction(mGLViewportEmpty ? null : mGLRectViewport);
}
/**