Don't make clip view optimizations when the clip view contains Z placeholders. b=225811 Patch by Robert O'Callahan <roc@ocallahan.org>. r+sr=dbaron a=asa

git-svn-id: svn://10.0.0.236/trunk@150400 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
dbaron%dbaron.org
2003-12-17 21:05:37 +00:00
parent 2ba9f517a6
commit 0702ac1728

View File

@@ -3406,8 +3406,9 @@ PRBool nsViewManager::CreateDisplayList(nsView *aView, PRBool aReparentedViewsPr
bounds.y += aY;
pos.MoveBy(aX, aY);
// is this a clip view?
PRBool isClipView = IsClipView(aView);
// does this view clip all its children?
PRBool isClipView = IsClipView(aView)
&& !(aView->GetViewFlags() & NS_VIEW_FLAG_CONTAINS_PLACEHOLDER);
PRBool overlap;
nsRect irect;
@@ -3445,8 +3446,7 @@ PRBool nsViewManager::CreateDisplayList(nsView *aView, PRBool aReparentedViewsPr
// visible area can lie outside our bounds, so it can't intersect
// the dirty area. Also, if we don't contain any placeholder views,
// then there is no way for anyone to reparent below us.
if (!overlap && (isClipView ||
(aView->GetViewFlags() & NS_VIEW_FLAG_CONTAINS_PLACEHOLDER) == 0)) {
if (!overlap && !(aView->GetViewFlags() & NS_VIEW_FLAG_CONTAINS_PLACEHOLDER)) {
return PR_FALSE;
}