Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug 392785 overflowed underline sometimes is not repainted at scrolling r+sr=roc b1.9=dbaron

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@245831 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
masayuki%d-toybox.com
2008-02-16 15:31:33 +00:00
parent 0d6e0a51e9
commit d5d7f20c6e
18 changed files with 374 additions and 129 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
mozilla/layout/generic/nsHTMLContainerFrame.cpp
View File

@@ -85,6 +85,7 @@ public:
virtual void Paint(nsDisplayListBuilder* aBuilder, nsIRenderingContext* aCtx,
const nsRect& aDirtyRect);
virtual nsRect GetBounds(nsDisplayListBuilder* aBuilder);
NS_DISPLAY_DECL_NAME("TextDecoration")
private:
nsLineBox* mLine;
@@ -122,6 +123,12 @@ nsDisplayTextDecoration::Paint(nsDisplayListBuilder* aBuilder,
}
}
nsRect
nsDisplayTextDecoration::GetBounds(nsDisplayListBuilder* aBuilder)
{
return mFrame->GetOverflowRect() + aBuilder->ToReferenceFrame(mFrame);
}
nsresult
nsHTMLContainerFrame::DisplayTextDecorations(nsDisplayListBuilder* aBuilder,
nsDisplayList* aBelowTextDecorations,
@@ -188,7 +195,7 @@ nsHTMLContainerFrame::BuildDisplayList(nsDisplayListBuilder* aBuilder,
}
static PRBool
HasTextFrameDescendantOrInFlow(nsPresContext* aPresContext, nsIFrame* aFrame);
HasTextFrameDescendantOrInFlow(nsIFrame* aFrame);
/*virtual*/ void
nsHTMLContainerFrame::PaintTextDecorationLine(
@@ -220,7 +227,6 @@ nsHTMLContainerFrame::PaintTextDecorationLine(
nsCSSRendering::PaintDecorationLine(
ctx, aColor, pt, size, PresContext()->AppUnitsToGfxUnits(aAscent),
PresContext()->AppUnitsToGfxUnits(aOffset),
PresContext()->AppUnitsToGfxUnits(aSize),
aDecoration, NS_STYLE_BORDER_STYLE_SOLID, isRTL);
}
@@ -296,14 +302,14 @@ nsHTMLContainerFrame::GetTextDecorations(nsPresContext* aPresContext,
if (aDecorations) {
// If this frame contains no text, we're required to ignore this property
if (!HasTextFrameDescendantOrInFlow(aPresContext, this)) {
if (!HasTextFrameDescendantOrInFlow(this)) {
aDecorations = NS_STYLE_TEXT_DECORATION_NONE;
}
}
}
static PRBool
HasTextFrameDescendant(nsPresContext* aPresContext, nsIFrame* aParent)
HasTextFrameDescendant(nsIFrame* aParent)
{
for (nsIFrame* kid = aParent->GetFirstChild(nsnull); kid;
kid = kid->GetNextSibling())
@@ -316,7 +322,7 @@ HasTextFrameDescendant(nsPresContext* aPresContext, nsIFrame* aParent)
return PR_TRUE;
}
}
if (HasTextFrameDescendant(aPresContext, kid)) {
if (HasTextFrameDescendant(kid)) {
return PR_TRUE;
}
}
@@ -324,10 +330,10 @@ HasTextFrameDescendant(nsPresContext* aPresContext, nsIFrame* aParent)
}
static PRBool
HasTextFrameDescendantOrInFlow(nsPresContext* aPresContext, nsIFrame* aFrame)
HasTextFrameDescendantOrInFlow(nsIFrame* aFrame)
{
for (nsIFrame *f = aFrame->GetFirstInFlow(); f; f = f->GetNextInFlow()) {
if (HasTextFrameDescendant(aPresContext, f))
if (HasTextFrameDescendant(f))
return PR_TRUE;
}
return PR_FALSE;