Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-12 04:45:45 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 180931. If we move a frame temporarily during reflow, we'd better invalidate the whole overflow area because invalidates may have been issued at the temporary position.

Browse Source
This commit is contained in:
roc+%cs.cmu.edu 2004-02-22 03:31:30 +00:00
parent e18fed3f6a
commit 8e85f2ae12
9 changed files with 76 additions and 82 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
gfx/public/nsRect.h
View File

@ -123,14 +123,24 @@ struct NS_GFX nsRect {
PRBool operator!=(const nsRect& aRect) const {
return (PRBool) !operator==(aRect);
}
// This method is weird. It should probably be deprecated.
nsRect operator+(const nsRect& aRect) const {
return nsRect(x + aRect.x, y + aRect.y,
width + aRect.width, height + aRect.height);
}
nsRect operator+(const nsPoint& aPoint) const {
return nsRect(x + aPoint.x, y + aPoint.y, width, height);
}
// This method is weird. It should probably be deprecated.
nsRect operator-(const nsRect& aRect) const {
return nsRect(x - aRect.x, y - aRect.y,
width - aRect.width, height - aRect.height);
}
nsRect operator-(const nsPoint& aPoint) const {
return nsRect(x - aPoint.x, y - aPoint.y, width, height);
}
nsRect& operator+=(const nsPoint& aPoint) {x += aPoint.x; y += aPoint.y; return *this;}
nsRect& operator-=(const nsPoint& aPoint) {x -= aPoint.x; y -= aPoint.y; return *this;}

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

@ -1010,6 +1010,14 @@ public:
*/
NS_IMETHOD IsPercentageBase(PRBool& aBase) const = 0;
// Invalidate part of the frame by asking the view manager to repaint.
// aDamageRect is in the frame's local coordinate space
void Invalidate(const nsRect& aDamageRect, PRBool aImmediate = PR_FALSE) const;
// XXX deprecated, remove once we've fixed all callers
void Invalidate(nsIPresContext* aPresContext,
const nsRect& aDamageRect, PRBool aImmediate = PR_FALSE) const
{ Invalidate(aDamageRect, aImmediate); }
/** Selection related calls
*/
/**

19
layout/generic/nsContainerFrame.cpp
View File

@ -1036,11 +1036,20 @@ nsContainerFrame::FinishReflowChild(nsIFrame* aKidFrame,
&aDesiredSize.mOverflowArea,
aFlags);
}
else if (0 == (aFlags & NS_FRAME_NO_MOVE_VIEW) &&
((curOrigin.x != aX) || (curOrigin.y != aY))) {
// If the frame has moved, then we need to make sure any child views are
// correctly positioned
PositionChildViews(aPresContext, aKidFrame);
if (!(aFlags & NS_FRAME_NO_MOVE_VIEW) &&
(curOrigin.x != aX || curOrigin.y != aY)) {
if (!aKidFrame->HasView()) {
// If the frame has moved, then we need to make sure any child views are
// correctly positioned
PositionChildViews(aPresContext, aKidFrame);
}
// We also need to redraw the frame because if the frame's Reflow issued any
// invalidates, then they will be at the wrong offset ... note that this includes
// invalidates issued against the frame's children, so we need to invalidate
// the overflow area too.
aKidFrame->Invalidate(aDesiredSize.mOverflowArea);
}
return aKidFrame->DidReflow(aPresContext, aReflowState, NS_FRAME_REFLOW_FINISHED);

41
layout/generic/nsFrame.cpp
View File

@ -2489,44 +2489,25 @@ nsFrame::GetType() const
}
void
nsFrame::Invalidate(nsIPresContext* aPresContext,
const nsRect& aDamageRect,
PRBool aImmediate) const
nsIFrame::Invalidate(const nsRect& aDamageRect,
PRBool aImmediate) const
{
if (aDamageRect.IsEmpty()) {
return;
}
if (aPresContext) {
// Don't allow invalidates to do anything when
// painting is suppressed.
nsIPresShell *shell = aPresContext->GetPresShell();
if (shell) {
PRBool suppressed = PR_FALSE;
shell->IsPaintingSuppressed(&suppressed);
if (suppressed)
return;
}
// Don't allow invalidates to do anything when
// painting is suppressed.
nsIPresShell *shell = GetPresContext()->GetPresShell();
if (shell) {
PRBool suppressed = PR_FALSE;
shell->IsPaintingSuppressed(&suppressed);
if (suppressed)
return;
}
nsRect damageRect(aDamageRect);
#if 0
// NOTE: inflating the damagerect is to account for outlines but
// ONLY WHEN outlines are actually drawn outside of the frame. This
// assumes that they are *but they are not* and it also assumes that the
// entire frame is being invalidated, which it often is not
// - therefore, this code is invalid and has been removed
// Checks to see if the damaged rect should be infalted
// to include the outline
nscoord width;
GetStyleOutline()->GetOutlineWidth(width);
if (width > 0) {
damageRect.Inflate(width, width);
}
#endif
PRUint32 flags = aImmediate ? NS_VMREFRESH_IMMEDIATE : NS_VMREFRESH_NO_SYNC;
if (HasView()) {
nsIView* view = GetView();
@ -2536,7 +2517,7 @@ nsFrame::Invalidate(nsIPresContext* aPresContext,
nsPoint offset;
nsIView *view;
GetOffsetFromView(aPresContext, offset, &view);
GetOffsetFromView(GetPresContext(), offset, &view);
NS_ASSERTION(view, "no view");
rect += offset;
view->GetViewManager()->UpdateView(view, rect, flags);

6
layout/generic/nsFrame.h
View File

@ -327,12 +327,6 @@ public:
//--------------------------------------------------
// Additional methods
// Invalidate part of the frame by asking the view manager to repaint.
// aDamageRect is in the frame's local coordinate space
void Invalidate(nsIPresContext* aPresContext,
const nsRect& aDamageRect,
PRBool aImmediate = PR_FALSE) const;
/**
* Helper method to invalidate portions of a standard container frame if the
* reflow state indicates that the size has changed (specifically border,

8
layout/generic/nsIFrame.h
View File

@ -1010,6 +1010,14 @@ public:
*/
NS_IMETHOD IsPercentageBase(PRBool& aBase) const = 0;
// Invalidate part of the frame by asking the view manager to repaint.
// aDamageRect is in the frame's local coordinate space
void Invalidate(const nsRect& aDamageRect, PRBool aImmediate = PR_FALSE) const;
// XXX deprecated, remove once we've fixed all callers
void Invalidate(nsIPresContext* aPresContext,
const nsRect& aDamageRect, PRBool aImmediate = PR_FALSE) const
{ Invalidate(aDamageRect, aImmediate); }
/** Selection related calls
*/
/**

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

@ -1036,11 +1036,20 @@ nsContainerFrame::FinishReflowChild(nsIFrame* aKidFrame,
&aDesiredSize.mOverflowArea,
aFlags);
}
else if (0 == (aFlags & NS_FRAME_NO_MOVE_VIEW) &&
((curOrigin.x != aX) || (curOrigin.y != aY))) {
// If the frame has moved, then we need to make sure any child views are
// correctly positioned
PositionChildViews(aPresContext, aKidFrame);
if (!(aFlags & NS_FRAME_NO_MOVE_VIEW) &&
(curOrigin.x != aX || curOrigin.y != aY)) {
if (!aKidFrame->HasView()) {
// If the frame has moved, then we need to make sure any child views are
// correctly positioned
PositionChildViews(aPresContext, aKidFrame);
}
// We also need to redraw the frame because if the frame's Reflow issued any
// invalidates, then they will be at the wrong offset ... note that this includes
// invalidates issued against the frame's children, so we need to invalidate
// the overflow area too.
aKidFrame->Invalidate(aDesiredSize.mOverflowArea);
}
return aKidFrame->DidReflow(aPresContext, aReflowState, NS_FRAME_REFLOW_FINISHED);

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

@ -2489,44 +2489,25 @@ nsFrame::GetType() const
}
void
nsFrame::Invalidate(nsIPresContext* aPresContext,
const nsRect& aDamageRect,
PRBool aImmediate) const
nsIFrame::Invalidate(const nsRect& aDamageRect,
PRBool aImmediate) const
{
if (aDamageRect.IsEmpty()) {
return;
}
if (aPresContext) {
// Don't allow invalidates to do anything when
// painting is suppressed.
nsIPresShell *shell = aPresContext->GetPresShell();
if (shell) {
PRBool suppressed = PR_FALSE;
shell->IsPaintingSuppressed(&suppressed);
if (suppressed)
return;
}
// Don't allow invalidates to do anything when
// painting is suppressed.
nsIPresShell *shell = GetPresContext()->GetPresShell();
if (shell) {
PRBool suppressed = PR_FALSE;
shell->IsPaintingSuppressed(&suppressed);
if (suppressed)
return;
}
nsRect damageRect(aDamageRect);
#if 0
// NOTE: inflating the damagerect is to account for outlines but
// ONLY WHEN outlines are actually drawn outside of the frame. This
// assumes that they are *but they are not* and it also assumes that the
// entire frame is being invalidated, which it often is not
// - therefore, this code is invalid and has been removed
// Checks to see if the damaged rect should be infalted
// to include the outline
nscoord width;
GetStyleOutline()->GetOutlineWidth(width);
if (width > 0) {
damageRect.Inflate(width, width);
}
#endif
PRUint32 flags = aImmediate ? NS_VMREFRESH_IMMEDIATE : NS_VMREFRESH_NO_SYNC;
if (HasView()) {
nsIView* view = GetView();
@ -2536,7 +2517,7 @@ nsFrame::Invalidate(nsIPresContext* aPresContext,
nsPoint offset;
nsIView *view;
GetOffsetFromView(aPresContext, offset, &view);
GetOffsetFromView(GetPresContext(), offset, &view);
NS_ASSERTION(view, "no view");
rect += offset;
view->GetViewManager()->UpdateView(view, rect, flags);

6
layout/html/base/src/nsFrame.h
View File

@ -327,12 +327,6 @@ public:
//--------------------------------------------------
// Additional methods
// Invalidate part of the frame by asking the view manager to repaint.
// aDamageRect is in the frame's local coordinate space
void Invalidate(nsIPresContext* aPresContext,
const nsRect& aDamageRect,
PRBool aImmediate = PR_FALSE) const;
/**
* Helper method to invalidate portions of a standard container frame if the
* reflow state indicates that the size has changed (specifically border,