Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2025-04-03 21:22:47 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 133165. Draw the outline outside the frame's normal overflow area. r+sr=dbaron. Also, correct some trivial misuses of nsChangeHint, r+sr=mozbot

Browse Source
This commit is contained in:
roc+%cs.cmu.edu 2004-08-26 00:07:56 +00:00
parent 8cf5b0fda0
commit dba4f07f62
22 changed files with 130 additions and 156 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
layout/base/nsCSSFrameConstructor.cpp
View File

@ -9780,7 +9780,7 @@ UpdateViewsForTree(nsPresContext* aPresContext, nsIFrame* aFrame,
}
}
nsRect bounds = aFrame->GetOutlineRect();
nsRect bounds = aFrame->GetOverflowRect();
// now do children of frame
PRInt32 listIndex = 0;
@ -10103,7 +10103,7 @@ nsCSSFrameConstructor::RestyleElement(nsPresContext *aPresContext,
RecreateFramesForContent(aPresContext, aContent);
} else if (aPrimaryFrame) {
nsStyleChangeList changeList;
if (aMinHint != NS_STYLE_HINT_NONE) {
if (aMinHint) {
changeList.AppendChange(aPrimaryFrame, aContent, aMinHint);
}
nsChangeHint frameChange = aPresContext->GetPresShell()->FrameManager()->
@ -13525,7 +13525,7 @@ ProcessRestyle(nsISupports* aContent,
if (aData.mRestyleHint & eReStyle_Self) {
shell->FrameConstructor()->RestyleElement(context, content, primaryFrame,
aData.mChangeHint);
} else if (aData.mChangeHint != NS_STYLE_HINT_NONE &&
} else if (aData.mChangeHint &&
(primaryFrame ||
(aData.mChangeHint & nsChangeHint_ReconstructFrame))) {
// Don't need to recompute style; just apply the hint
@ -13557,7 +13557,7 @@ nsCSSFrameConstructor::PostRestyleEvent(nsIContent* aContent,
nsReStyleHint aRestyleHint,
nsChangeHint aMinChangeHint)
{
if (aRestyleHint == 0 && aMinChangeHint == NS_STYLE_HINT_NONE) {
if (aRestyleHint == 0 && !aMinChangeHint) {
// Nothing to do here
return;
}

13
layout/base/nsCSSRendering.cpp
View File

@ -2087,12 +2087,15 @@ nscoord width;
}
}
nsRect inside(aBorderArea);
nsRect outside(inside);
outside.Inflate(width, width);
nsRect* overflowArea = aForFrame->GetOverflowAreaProperty(PR_FALSE);
if (!overflowArea) {
NS_WARNING("Hmm, outline painting should always find an overflow area here");
return;
}
nsRect clipRect(aBorderArea);
clipRect.Inflate(width, width); // make clip extra big for now
nsRect outside(*overflowArea);
nsRect inside(outside);
inside.Deflate(width, width);
// rounded version of the border
for(i=0;i<4;i++){

9
layout/base/public/nsIFrame.h
View File

@ -1033,13 +1033,14 @@ public:
void Invalidate(const nsRect& aDamageRect, PRBool aImmediate = PR_FALSE) const;
/**
* Computes a rect that includes this frame's outline. The returned rect is
* relative to this frame's origin.
* Computes a rect that includes this frame, all its descendant
* frames, this frame's outline (if any), and all descendant frames'
* outlines (if any). This is the union of everything that might be painted by
* this frame subtree.
*
* @param if nonnull, we record whether this rect is bigger than the frame's bounds
* @return the rect relative to this frame's origin
*/
nsRect GetOutlineRect(PRBool* aAnyOutline = nsnull, nsSize *aUseSize = nsnull) const;
nsRect GetOverflowRect() const;
/**
* Set/unset the NS_FRAME_OUTSIDE_CHILDREN flag and store the overflow area

2
layout/forms/nsGfxCheckboxControlFrame.cpp
View File

@ -167,7 +167,7 @@ NS_IMETHODIMP
nsGfxCheckboxControlFrame::OnChecked(nsPresContext* aPresContext,
PRBool aChecked)
{
Invalidate(GetOutlineRect(), PR_FALSE);
Invalidate(GetOverflowRect(), PR_FALSE);
return aChecked;
}

2
layout/forms/nsGfxRadioControlFrame.cpp
View File

@ -238,7 +238,7 @@ NS_IMETHODIMP
nsGfxRadioControlFrame::OnChecked(nsPresContext* aPresContext,
PRBool aChecked)
{
Invalidate(GetOutlineRect(), PR_FALSE);
Invalidate(GetOverflowRect(), PR_FALSE);
return NS_OK;
}

6
layout/generic/nsContainerFrame.cpp
View File

@ -1320,6 +1320,12 @@ nsContainerFrame::List(nsPresContext* aPresContext, FILE* out, PRInt32 aIndent)
fprintf(out, " [state=%08x]", mState);
}
fprintf(out, " [content=%p]", NS_STATIC_CAST(void*, mContent));
nsContainerFrame* f = NS_CONST_CAST(nsContainerFrame*, this);
nsRect* overflowArea = f->GetOverflowAreaProperty(PR_FALSE);
if (overflowArea) {
fprintf(out, " [overflow=%d,%d,%d,%d]", overflowArea->x, overflowArea->y,
overflowArea->width, overflowArea->height);
}
fprintf(out, " [sc=%p]", NS_STATIC_CAST(void*, mStyleContext));
// Output the children

81
layout/generic/nsFrame.cpp
View File

@ -766,23 +766,6 @@ nsFrame::SetOverflowClipRect(nsIRenderingContext& aRenderingContext)
aRenderingContext.SetClipRect(clipRect, nsClipCombine_kIntersect);
}
/********************************************************
* Refreshes this frame and all child frames that are frames for aContent
*********************************************************/
static void RefreshAllContentFrames(nsIFrame* aFrame, nsIContent* aContent)
{
if (aFrame->GetContent() == aContent) {
// XXX is this necessary?
aFrame->Invalidate(aFrame->GetOutlineRect(), PR_FALSE);
}
aFrame = aFrame->GetFirstChild(nsnull);
while (aFrame) {
RefreshAllContentFrames(aFrame, aContent);
aFrame = aFrame->GetNextSibling();
}
}
/********************************************************
* Refreshes each content's frame
*********************************************************/
@ -1704,9 +1687,6 @@ static nsIView* GetNearestCapturingView(nsIFrame* aFrame) {
return nsnull;
}
#ifdef DEBUG_roc
printf("*** Setting capture to frame %p, view %p\n", (void*)aFrame, (void*)view);
#endif
return view;
}
@ -2503,17 +2483,12 @@ nsIFrame::Invalidate(const nsRect& aDamageRect,
}
}
nsRect
nsIFrame::GetOutlineRect(PRBool* aAnyOutline, nsSize *aUseSize) const
{
const nsStyleOutline* outline = GetStyleOutline();
static nsRect ComputeOutlineRect(const nsIFrame* aFrame, PRBool* aAnyOutline,
const nsRect& aOverflowRect) {
const nsStyleOutline* outline = aFrame->GetStyleOutline();
PRUint8 outlineStyle = outline->GetOutlineStyle();
nsRect r(0, 0, mRect.width, mRect.height);
if (aUseSize) {
r.width = aUseSize->width;
r.height = aUseSize->height;
}
PRBool anyOutline = PR_FALSE;
nsRect r = aOverflowRect;
*aAnyOutline = PR_FALSE;
if (outlineStyle != NS_STYLE_BORDER_STYLE_NONE) {
nscoord width;
#ifdef DEBUG
@ -2523,15 +2498,29 @@ nsIFrame::GetOutlineRect(PRBool* aAnyOutline, nsSize *aUseSize) const
NS_ASSERTION(result, "GetOutlineWidth had no cached outline width");
if (width > 0) {
r.Inflate(width, width);
anyOutline = PR_TRUE;
*aAnyOutline = PR_TRUE;
}
}
if (aAnyOutline) {
*aAnyOutline = anyOutline;
}
return r;
}
nsRect
nsIFrame::GetOverflowRect() const
{
// Note that in some cases the overflow area might not have been
// updated (yet) to reflect any outline set on the frame or the area
// of child frames. That's OK because any reflow that updates these
// areas will invalidate the appropriate area, so any (mis)uses of
// this method will be fixed up.
nsRect* storedOA = NS_CONST_CAST(nsIFrame*, this)
->GetOverflowAreaProperty(PR_FALSE);
if (storedOA) {
return *storedOA;
} else {
return nsRect(nsPoint(0, 0), GetSize());
}
}
void
nsFrame::CheckInvalidateSizeChange(nsPresContext* aPresContext,
nsHTMLReflowMetrics& aDesiredSize,
@ -2553,7 +2542,8 @@ nsFrame::CheckInvalidateSizeChange(nsPresContext* aPresContext,
// Invalidate the entire old frame+outline if the frame has an outline
PRBool anyOutline;
nsRect r = GetOutlineRect(&anyOutline);
nsRect r = ComputeOutlineRect(this, &anyOutline,
aDesiredSize.mOverflowArea);
if (anyOutline) {
Invalidate(r);
return;
@ -2683,6 +2673,12 @@ nsFrame::List(nsPresContext* aPresContext, FILE* out, PRInt32 aIndent) const
fprintf(out, " [state=%08x]", mState);
}
fprintf(out, " [content=%p]", NS_STATIC_CAST(void*, mContent));
nsFrame* f = NS_CONST_CAST(nsFrame*, this);
nsRect* overflowArea = f->GetOverflowAreaProperty(PR_FALSE);
if (overflowArea) {
fprintf(out, " [overflow=%d,%d,%d,%d]", overflowArea->x, overflowArea->y,
overflowArea->width, overflowArea->height);
}
fputs("\n", out);
return NS_OK;
}
@ -3019,14 +3015,8 @@ nsFrame::SetSelected(nsPresContext* aPresContext, nsIDOMRange *aRange, PRBool aS
else
RemoveStateBits(NS_FRAME_SELECTED_CONTENT);
// repaint this frame's outline area.
// In CSS3 selection can change the outline style! and border and content too
Invalidate(GetOutlineRect(), PR_FALSE);
if (GetStateBits() & NS_FRAME_OUTSIDE_CHILDREN)
{
RefreshAllContentFrames(this, mContent);
}
// Repaint this frame subtree's entire area
Invalidate(GetOverflowRect(), PR_FALSE);
#ifdef IBMBIDI
PRInt32 start, end;
@ -4250,7 +4240,7 @@ nsIFrame::FinishAndStoreOverflow(nsRect* aOverflowArea, nsSize aNewSize)
// we should think about starting a new method like GetAdditionalOverflow()
PRBool hasOutline;
nsRect outlineRect(GetOutlineRect(&hasOutline, &aNewSize));
nsRect outlineRect(ComputeOutlineRect(this, &hasOutline, *aOverflowArea));
if (hasOutline ||
(aOverflowArea->x < 0) ||
@ -4260,8 +4250,7 @@ nsIFrame::FinishAndStoreOverflow(nsRect* aOverflowArea, nsSize aNewSize)
mState |= NS_FRAME_OUTSIDE_CHILDREN;
nsRect* overflowArea = GetOverflowAreaProperty(PR_TRUE);
NS_ASSERTION(overflowArea, "should have created rect");
aOverflowArea->UnionRect(outlineRect, *aOverflowArea);
*overflowArea = *aOverflowArea;
*aOverflowArea = *overflowArea = outlineRect;
}
else {
if (mState & NS_FRAME_OUTSIDE_CHILDREN) {

4
layout/generic/nsHTMLFrame.cpp
View File

@ -348,7 +348,7 @@ CanvasFrame::RemoveFrame(nsPresContext* aPresContext,
// Damage the area occupied by the deleted frame
// The child of the canvas probably can't have an outline, but why bother
// thinking about that?
Invalidate(aOldFrame->GetOutlineRect() + aOldFrame->GetPosition(), PR_FALSE);
Invalidate(aOldFrame->GetOverflowRect() + aOldFrame->GetPosition(), PR_FALSE);
// Remove the frame and destroy it
mFrames.DestroyFrame(aPresContext, aOldFrame);
@ -566,7 +566,7 @@ CanvasFrame::Reflow(nsPresContext* aPresContext,
// If the child frame was just inserted, then we're responsible for making sure
// it repaints
if (isDirtyChildReflow) {
Invalidate(kidFrame->GetOutlineRect() + kidFrame->GetPosition(), PR_FALSE);
Invalidate(kidFrame->GetOverflowRect() + kidFrame->GetPosition(), PR_FALSE);
}
// Return our desired size

9
layout/generic/nsIFrame.h
View File

@ -1033,13 +1033,14 @@ public:
void Invalidate(const nsRect& aDamageRect, PRBool aImmediate = PR_FALSE) const;
/**
* Computes a rect that includes this frame's outline. The returned rect is
* relative to this frame's origin.
* Computes a rect that includes this frame, all its descendant
* frames, this frame's outline (if any), and all descendant frames'
* outlines (if any). This is the union of everything that might be painted by
* this frame subtree.
*
* @param if nonnull, we record whether this rect is bigger than the frame's bounds
* @return the rect relative to this frame's origin
*/
nsRect GetOutlineRect(PRBool* aAnyOutline = nsnull, nsSize *aUseSize = nsnull) const;
nsRect GetOverflowRect() const;
/**
* Set/unset the NS_FRAME_OUTSIDE_CHILDREN flag and store the overflow area

6
layout/html/base/src/nsContainerFrame.cpp
View File

@ -1320,6 +1320,12 @@ nsContainerFrame::List(nsPresContext* aPresContext, FILE* out, PRInt32 aIndent)
fprintf(out, " [state=%08x]", mState);
}
fprintf(out, " [content=%p]", NS_STATIC_CAST(void*, mContent));
nsContainerFrame* f = NS_CONST_CAST(nsContainerFrame*, this);
nsRect* overflowArea = f->GetOverflowAreaProperty(PR_FALSE);
if (overflowArea) {
fprintf(out, " [overflow=%d,%d,%d,%d]", overflowArea->x, overflowArea->y,
overflowArea->width, overflowArea->height);
}
fprintf(out, " [sc=%p]", NS_STATIC_CAST(void*, mStyleContext));
// Output the children

81
layout/html/base/src/nsFrame.cpp
View File

@ -766,23 +766,6 @@ nsFrame::SetOverflowClipRect(nsIRenderingContext& aRenderingContext)
aRenderingContext.SetClipRect(clipRect, nsClipCombine_kIntersect);
}
/********************************************************
* Refreshes this frame and all child frames that are frames for aContent
*********************************************************/
static void RefreshAllContentFrames(nsIFrame* aFrame, nsIContent* aContent)
{
if (aFrame->GetContent() == aContent) {
// XXX is this necessary?
aFrame->Invalidate(aFrame->GetOutlineRect(), PR_FALSE);
}
aFrame = aFrame->GetFirstChild(nsnull);
while (aFrame) {
RefreshAllContentFrames(aFrame, aContent);
aFrame = aFrame->GetNextSibling();
}
}
/********************************************************
* Refreshes each content's frame
*********************************************************/
@ -1704,9 +1687,6 @@ static nsIView* GetNearestCapturingView(nsIFrame* aFrame) {
return nsnull;
}
#ifdef DEBUG_roc
printf("*** Setting capture to frame %p, view %p\n", (void*)aFrame, (void*)view);
#endif
return view;
}
@ -2503,17 +2483,12 @@ nsIFrame::Invalidate(const nsRect& aDamageRect,
}
}
nsRect
nsIFrame::GetOutlineRect(PRBool* aAnyOutline, nsSize *aUseSize) const
{
const nsStyleOutline* outline = GetStyleOutline();
static nsRect ComputeOutlineRect(const nsIFrame* aFrame, PRBool* aAnyOutline,
const nsRect& aOverflowRect) {
const nsStyleOutline* outline = aFrame->GetStyleOutline();
PRUint8 outlineStyle = outline->GetOutlineStyle();
nsRect r(0, 0, mRect.width, mRect.height);
if (aUseSize) {
r.width = aUseSize->width;
r.height = aUseSize->height;
}
PRBool anyOutline = PR_FALSE;
nsRect r = aOverflowRect;
*aAnyOutline = PR_FALSE;
if (outlineStyle != NS_STYLE_BORDER_STYLE_NONE) {
nscoord width;
#ifdef DEBUG
@ -2523,15 +2498,29 @@ nsIFrame::GetOutlineRect(PRBool* aAnyOutline, nsSize *aUseSize) const
NS_ASSERTION(result, "GetOutlineWidth had no cached outline width");
if (width > 0) {
r.Inflate(width, width);
anyOutline = PR_TRUE;
*aAnyOutline = PR_TRUE;
}
}
if (aAnyOutline) {
*aAnyOutline = anyOutline;
}
return r;
}
nsRect
nsIFrame::GetOverflowRect() const
{
// Note that in some cases the overflow area might not have been
// updated (yet) to reflect any outline set on the frame or the area
// of child frames. That's OK because any reflow that updates these
// areas will invalidate the appropriate area, so any (mis)uses of
// this method will be fixed up.
nsRect* storedOA = NS_CONST_CAST(nsIFrame*, this)
->GetOverflowAreaProperty(PR_FALSE);
if (storedOA) {
return *storedOA;
} else {
return nsRect(nsPoint(0, 0), GetSize());
}
}
void
nsFrame::CheckInvalidateSizeChange(nsPresContext* aPresContext,
nsHTMLReflowMetrics& aDesiredSize,
@ -2553,7 +2542,8 @@ nsFrame::CheckInvalidateSizeChange(nsPresContext* aPresContext,
// Invalidate the entire old frame+outline if the frame has an outline
PRBool anyOutline;
nsRect r = GetOutlineRect(&anyOutline);
nsRect r = ComputeOutlineRect(this, &anyOutline,
aDesiredSize.mOverflowArea);
if (anyOutline) {
Invalidate(r);
return;
@ -2683,6 +2673,12 @@ nsFrame::List(nsPresContext* aPresContext, FILE* out, PRInt32 aIndent) const
fprintf(out, " [state=%08x]", mState);
}
fprintf(out, " [content=%p]", NS_STATIC_CAST(void*, mContent));
nsFrame* f = NS_CONST_CAST(nsFrame*, this);
nsRect* overflowArea = f->GetOverflowAreaProperty(PR_FALSE);
if (overflowArea) {
fprintf(out, " [overflow=%d,%d,%d,%d]", overflowArea->x, overflowArea->y,
overflowArea->width, overflowArea->height);
}
fputs("\n", out);
return NS_OK;
}
@ -3019,14 +3015,8 @@ nsFrame::SetSelected(nsPresContext* aPresContext, nsIDOMRange *aRange, PRBool aS
else
RemoveStateBits(NS_FRAME_SELECTED_CONTENT);
// repaint this frame's outline area.
// In CSS3 selection can change the outline style! and border and content too
Invalidate(GetOutlineRect(), PR_FALSE);
if (GetStateBits() & NS_FRAME_OUTSIDE_CHILDREN)
{
RefreshAllContentFrames(this, mContent);
}
// Repaint this frame subtree's entire area
Invalidate(GetOverflowRect(), PR_FALSE);
#ifdef IBMBIDI
PRInt32 start, end;
@ -4250,7 +4240,7 @@ nsIFrame::FinishAndStoreOverflow(nsRect* aOverflowArea, nsSize aNewSize)
// we should think about starting a new method like GetAdditionalOverflow()
PRBool hasOutline;
nsRect outlineRect(GetOutlineRect(&hasOutline, &aNewSize));
nsRect outlineRect(ComputeOutlineRect(this, &hasOutline, *aOverflowArea));
if (hasOutline ||
(aOverflowArea->x < 0) ||
@ -4260,8 +4250,7 @@ nsIFrame::FinishAndStoreOverflow(nsRect* aOverflowArea, nsSize aNewSize)
mState |= NS_FRAME_OUTSIDE_CHILDREN;
nsRect* overflowArea = GetOverflowAreaProperty(PR_TRUE);
NS_ASSERTION(overflowArea, "should have created rect");
aOverflowArea->UnionRect(outlineRect, *aOverflowArea);
*overflowArea = *aOverflowArea;
*aOverflowArea = *overflowArea = outlineRect;
}
else {
if (mState & NS_FRAME_OUTSIDE_CHILDREN) {

4
layout/html/base/src/nsHTMLFrame.cpp
View File

@ -348,7 +348,7 @@ CanvasFrame::RemoveFrame(nsPresContext* aPresContext,
// Damage the area occupied by the deleted frame
// The child of the canvas probably can't have an outline, but why bother
// thinking about that?
Invalidate(aOldFrame->GetOutlineRect() + aOldFrame->GetPosition(), PR_FALSE);
Invalidate(aOldFrame->GetOverflowRect() + aOldFrame->GetPosition(), PR_FALSE);
// Remove the frame and destroy it
mFrames.DestroyFrame(aPresContext, aOldFrame);
@ -566,7 +566,7 @@ CanvasFrame::Reflow(nsPresContext* aPresContext,
// If the child frame was just inserted, then we're responsible for making sure
// it repaints
if (isDirtyChildReflow) {
Invalidate(kidFrame->GetOutlineRect() + kidFrame->GetPosition(), PR_FALSE);
Invalidate(kidFrame->GetOverflowRect() + kidFrame->GetPosition(), PR_FALSE);
}
// Return our desired size

12
layout/html/document/src/html.css
View File

@ -408,18 +408,6 @@ noframes {
display: none;
}
*|*:-moz-any-link:focus img {
-moz-outline: 1px dotted invert;
}
*|*:-moz-any-link:focus object {
-moz-outline: 1px dotted invert;
}
*|*:-moz-any-link:focus embed {
-moz-outline: 1px dotted invert;
}
/* focusable content: anything w/ tabindex >=0 is focusable */
abbr:focus, acronym:focus, address:focus, applet:focus, b:focus,
base:focus, big:focus, blockquote:focus, br:focus, caption:focus, center:focus,

2
layout/html/forms/src/nsGfxCheckboxControlFrame.cpp
View File

@ -167,7 +167,7 @@ NS_IMETHODIMP
nsGfxCheckboxControlFrame::OnChecked(nsPresContext* aPresContext,
PRBool aChecked)
{
Invalidate(GetOutlineRect(), PR_FALSE);
Invalidate(GetOverflowRect(), PR_FALSE);
return aChecked;
}

2
layout/html/forms/src/nsGfxRadioControlFrame.cpp
View File

@ -238,7 +238,7 @@ NS_IMETHODIMP
nsGfxRadioControlFrame::OnChecked(nsPresContext* aPresContext,
PRBool aChecked)
{
Invalidate(GetOutlineRect(), PR_FALSE);
Invalidate(GetOverflowRect(), PR_FALSE);
return NS_OK;
}

8
layout/html/style/src/nsCSSFrameConstructor.cpp
View File

@ -9780,7 +9780,7 @@ UpdateViewsForTree(nsPresContext* aPresContext, nsIFrame* aFrame,
}
}
nsRect bounds = aFrame->GetOutlineRect();
nsRect bounds = aFrame->GetOverflowRect();
// now do children of frame
PRInt32 listIndex = 0;
@ -10103,7 +10103,7 @@ nsCSSFrameConstructor::RestyleElement(nsPresContext *aPresContext,
RecreateFramesForContent(aPresContext, aContent);
} else if (aPrimaryFrame) {
nsStyleChangeList changeList;
if (aMinHint != NS_STYLE_HINT_NONE) {
if (aMinHint) {
changeList.AppendChange(aPrimaryFrame, aContent, aMinHint);
}
nsChangeHint frameChange = aPresContext->GetPresShell()->FrameManager()->
@ -13525,7 +13525,7 @@ ProcessRestyle(nsISupports* aContent,
if (aData.mRestyleHint & eReStyle_Self) {
shell->FrameConstructor()->RestyleElement(context, content, primaryFrame,
aData.mChangeHint);
} else if (aData.mChangeHint != NS_STYLE_HINT_NONE &&
} else if (aData.mChangeHint &&
(primaryFrame ||
(aData.mChangeHint & nsChangeHint_ReconstructFrame))) {
// Don't need to recompute style; just apply the hint
@ -13557,7 +13557,7 @@ nsCSSFrameConstructor::PostRestyleEvent(nsIContent* aContent,
nsReStyleHint aRestyleHint,
nsChangeHint aMinChangeHint)
{
if (aRestyleHint == 0 && aMinChangeHint == NS_STYLE_HINT_NONE) {
if (aRestyleHint == 0 && !aMinChangeHint) {
// Nothing to do here
return;
}

13
layout/html/style/src/nsCSSRendering.cpp
View File

@ -2087,12 +2087,15 @@ nscoord width;
}
}
nsRect inside(aBorderArea);
nsRect outside(inside);
outside.Inflate(width, width);
nsRect* overflowArea = aForFrame->GetOverflowAreaProperty(PR_FALSE);
if (!overflowArea) {
NS_WARNING("Hmm, outline painting should always find an overflow area here");
return;
}
nsRect clipRect(aBorderArea);
clipRect.Inflate(width, width); // make clip extra big for now
nsRect outside(*overflowArea);
nsRect inside(outside);
inside.Deflate(width, width);
// rounded version of the border
for(i=0;i<4;i++){

4
layout/html/table/src/nsTableCellFrame.cpp
View File

@ -499,7 +499,7 @@ nsTableCellFrame::SetSelected(nsPresContext* aPresContext,
result = frameSelection->GetTableCellSelection(&tableCellSelectionMode);
if (NS_SUCCEEDED(result) && tableCellSelectionMode) {
// Selection can affect content, border and outline
Invalidate(GetOutlineRect(), PR_FALSE);
Invalidate(GetOverflowRect(), PR_FALSE);
}
}
return NS_OK;
@ -860,7 +860,7 @@ NS_METHOD nsTableCellFrame::Reflow(nsPresContext* aPresContext,
kidOrigin.x, kidOrigin.y, 0, aStatus);
SetLastBlockHeight(kidSize.height);
if (isStyleChanged) {
Invalidate(GetOutlineRect(), PR_FALSE);
Invalidate(GetOverflowRect(), PR_FALSE);
}
#if defined DEBUG_TABLE_REFLOW_TIMING

12
layout/style/html.css
View File

@ -408,18 +408,6 @@ noframes {
display: none;
}
*|*:-moz-any-link:focus img {
-moz-outline: 1px dotted invert;
}
*|*:-moz-any-link:focus object {
-moz-outline: 1px dotted invert;
}
*|*:-moz-any-link:focus embed {
-moz-outline: 1px dotted invert;
}
/* focusable content: anything w/ tabindex >=0 is focusable */
abbr:focus, acronym:focus, address:focus, applet:focus, b:focus,
base:focus, big:focus, blockquote:focus, br:focus, caption:focus, center:focus,

4
layout/tables/nsTableCellFrame.cpp
View File

@ -499,7 +499,7 @@ nsTableCellFrame::SetSelected(nsPresContext* aPresContext,
result = frameSelection->GetTableCellSelection(&tableCellSelectionMode);
if (NS_SUCCEEDED(result) && tableCellSelectionMode) {
// Selection can affect content, border and outline
Invalidate(GetOutlineRect(), PR_FALSE);
Invalidate(GetOverflowRect(), PR_FALSE);
}
}
return NS_OK;
@ -860,7 +860,7 @@ NS_METHOD nsTableCellFrame::Reflow(nsPresContext* aPresContext,
kidOrigin.x, kidOrigin.y, 0, aStatus);
SetLastBlockHeight(kidSize.height);
if (isStyleChanged) {
Invalidate(GetOutlineRect(), PR_FALSE);
Invalidate(GetOverflowRect(), PR_FALSE);
}
#if defined DEBUG_TABLE_REFLOW_TIMING

2
layout/xul/base/src/nsBox.cpp
View File

@ -1119,7 +1119,7 @@ nsBox::Redraw(nsBoxLayoutState& aState,
if (aDamageRect)
damageRect = *aDamageRect;
else
damageRect = frame->GetOutlineRect();
damageRect = frame->GetOverflowRect();
frame->Invalidate(damageRect, aImmediate);

2
layout/xul/base/src/tree/src/nsTreeBodyFrame.cpp
View File

@ -642,7 +642,7 @@ nsTreeBodyFrame::Invalidate()
if (mUpdateBatchNest)
return NS_OK;
nsIFrame::Invalidate(GetOutlineRect(), PR_FALSE);
nsIFrame::Invalidate(GetOverflowRect(), PR_FALSE);
return NS_OK;
}