From e5df81af3dd3ff3590a82d3897f34ee230c5f0f4 Mon Sep 17 00:00:00 2001 From: "troy%netscape.com" Date: Wed, 1 Sep 1999 01:10:24 +0000 Subject: [PATCH] Fix for bug #12864. Changed CreateViewForFrame() so it respects the z-index of relatively positioned elements git-svn-id: svn://10.0.0.236/trunk@45404 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/layout/generic/nsHTMLContainerFrame.cpp | 7 ++++++- mozilla/layout/html/base/src/nsHTMLContainerFrame.cpp | 7 ++++++- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/mozilla/layout/generic/nsHTMLContainerFrame.cpp b/mozilla/layout/generic/nsHTMLContainerFrame.cpp index 4ff8e4f1e21..0531e191f9e 100644 --- a/mozilla/layout/generic/nsHTMLContainerFrame.cpp +++ b/mozilla/layout/generic/nsHTMLContainerFrame.cpp @@ -327,6 +327,11 @@ nsHTMLContainerFrame::CreateViewForFrame(nsIPresContext& aPresContext, ("nsHTMLContainerFrame::CreateViewForFrame: frame=%p relatively positioned", aFrame)); aForce = PR_TRUE; + + // Get the z-index to use + if (position->mZIndex.GetUnit() == eStyleUnit_Integer) { + zIndex = position->mZIndex.GetIntValue(); + } } else if (position->IsAbsolutelyPositioned()) { NS_FRAME_LOG(NS_FRAME_TRACE_CALLS, @@ -334,7 +339,7 @@ nsHTMLContainerFrame::CreateViewForFrame(nsIPresContext& aPresContext, aFrame)); aForce = PR_TRUE; - // Get the z-index to use. This only applies to positioned elements + // Get the z-index to use if (position->mZIndex.GetUnit() == eStyleUnit_Integer) { zIndex = position->mZIndex.GetIntValue(); } diff --git a/mozilla/layout/html/base/src/nsHTMLContainerFrame.cpp b/mozilla/layout/html/base/src/nsHTMLContainerFrame.cpp index 4ff8e4f1e21..0531e191f9e 100644 --- a/mozilla/layout/html/base/src/nsHTMLContainerFrame.cpp +++ b/mozilla/layout/html/base/src/nsHTMLContainerFrame.cpp @@ -327,6 +327,11 @@ nsHTMLContainerFrame::CreateViewForFrame(nsIPresContext& aPresContext, ("nsHTMLContainerFrame::CreateViewForFrame: frame=%p relatively positioned", aFrame)); aForce = PR_TRUE; + + // Get the z-index to use + if (position->mZIndex.GetUnit() == eStyleUnit_Integer) { + zIndex = position->mZIndex.GetIntValue(); + } } else if (position->IsAbsolutelyPositioned()) { NS_FRAME_LOG(NS_FRAME_TRACE_CALLS, @@ -334,7 +339,7 @@ nsHTMLContainerFrame::CreateViewForFrame(nsIPresContext& aPresContext, aFrame)); aForce = PR_TRUE; - // Get the z-index to use. This only applies to positioned elements + // Get the z-index to use if (position->mZIndex.GetUnit() == eStyleUnit_Integer) { zIndex = position->mZIndex.GetIntValue(); }