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

Correctly mark layers dirty when drawing WebView.

Browse Source 
Change-Id: I7ae0c3cfa0916d8fbeaf01e8da127c621a06a0f4
This commit is contained in:
Romain Guy
2011-03-01 14:55:21 -08:00
parent 321dce646d
commit d643bb56fd
2 changed files with 26 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
core/java/android/view/ViewGroup.java
View File

@@ -2447,21 +2447,26 @@ public abstract class ViewGroup extends View implements ViewParent, ViewManager
}
cache = child.getDrawingCache(true);
} else {
if (layerType == LAYER_TYPE_SOFTWARE) {
child.buildDrawingCache(true);
cache = child.getDrawingCache(true);
} else if (layerType == LAYER_TYPE_NONE) {
// Delay getting the display list until animation-driven alpha values are
// set up and possibly passed on to the view
hasDisplayList = child.canHaveDisplayList();
switch (layerType) {
case LAYER_TYPE_SOFTWARE:
child.buildDrawingCache(true);
cache = child.getDrawingCache(true);
break;
case LAYER_TYPE_NONE:
// Delay getting the display list until animation-driven alpha values are
// set up and possibly passed on to the view
hasDisplayList = child.canHaveDisplayList();
break;
}
}
}
final boolean hasNoCache = cache == null || hasDisplayList;
final boolean offsetForScroll = cache == null && !hasDisplayList &&
layerType != LAYER_TYPE_HARDWARE;
final int restoreTo = canvas.save();
if (cache == null && !hasDisplayList) {
if (offsetForScroll) {
canvas.translate(cl - sx, ct - sy);
} else {
canvas.translate(cl, ct);
@@ -2477,7 +2482,7 @@ public abstract class ViewGroup extends View implements ViewParent, ViewManager
int transX = 0;
int transY = 0;
if (cache == null && !hasDisplayList) {
if (offsetForScroll) {
transX = -sx;
transY = -sy;
}
@@ -2532,7 +2537,7 @@ public abstract class ViewGroup extends View implements ViewParent, ViewManager
}
if ((flags & FLAG_CLIP_CHILDREN) == FLAG_CLIP_CHILDREN) {
if (cache == null && !hasDisplayList) {
if (offsetForScroll) {
canvas.clipRect(sx, sy, sx + (cr - cl), sy + (cb - ct));
} else {
if (!scalingRequired || cache == null) {

11
libs/hwui/OpenGLRenderer.cpp
View File

@@ -213,6 +213,17 @@ bool OpenGLRenderer::callDrawGLFunction(Functor *functor) {
if (mDirtyClip) {
setScissorFromClip();
}
#if RENDER_LAYERS_AS_REGIONS
// Since we don't know what the functor will draw, let's dirty
// tne entire clip region
if (hasLayer()) {
Rect clip(*mSnapshot->clipRect);
clip.snapToPixelBoundaries();
dirtyLayerUnchecked(clip, getRegion());
}
#endif
status_t result = (*functor)();
resume();
return (result == 0) ? false : true;