mozilla
/
pjs
зеркало из https://github.com/mozilla/pjs.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

Backing out fix for bug 170330... againr=dbaron

This commit is contained in:
roc+%cs.cmu.edu 2002-12-22 05:40:51 +00:00
Родитель 19fff00ceb
Коммит e48869f9a2
14 изменённых файлов: 157 добавлений и 207 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

7
layout/base/public/nsIFrame.h
Просмотреть файл

@ -794,13 +794,6 @@ public:
PRInt32* outFrameContentOffset,
nsIFrame* *outChildFrame) = 0;
/**
* Returns true iff the frame has a view (i.e., GetView() returns non-null)
*/
PRBool HasView() {
return (mState & NS_FRAME_HAS_VIEW) != 0;
}
/**
* Get the current frame-state value for this frame. aResult is
* filled in with the state bits.

46
layout/generic/nsBlockFrame.cpp
Просмотреть файл

@ -771,16 +771,21 @@ nsBlockFrame::Reflow(nsIPresContext* aPresContext,
// Whether or not we're complete hasn't changed
aStatus = (nsnull != mNextInFlow) ? NS_FRAME_NOT_COMPLETE : NS_FRAME_COMPLETE;
ComputeCombinedArea(aReflowState, aMetrics);
// Factor the absolutely positioned child bounds into the overflow area
ComputeCombinedArea(aReflowState, aMetrics);
nsRect childBounds;
mAbsoluteContainer.CalculateChildBounds(aPresContext, childBounds);
aMetrics.mOverflowArea.UnionRect(aMetrics.mOverflowArea, childBounds);
// Finish computing the overflow area, taking account of outline and
// overflow:hidden etc
ComputeOverflowArea(aMetrics.mOverflowArea, aMetrics.mOverflowArea);
// Make sure the NS_FRAME_OUTSIDE_CHILDREN flag is set correctly
if ((aMetrics.mOverflowArea.x < 0) ||
(aMetrics.mOverflowArea.y < 0) ||
(aMetrics.mOverflowArea.XMost() > aMetrics.width) ||
(aMetrics.mOverflowArea.YMost() > aMetrics.height)) {
mState |= NS_FRAME_OUTSIDE_CHILDREN;
} else {
mState &= ~NS_FRAME_OUTSIDE_CHILDREN;
}
return NS_OK;
}
@ -1090,12 +1095,17 @@ nsBlockFrame::Reflow(nsIPresContext* aPresContext,
// Factor the absolutely positioned child bounds into the overflow area
aMetrics.mOverflowArea.UnionRect(aMetrics.mOverflowArea, childBounds);
}
// Area of child content has been computed into mOverflowArea
// Finish computing the overflow area, taking account of outline and
// overflow:hidden etc
ComputeOverflowArea(aMetrics.mOverflowArea, aMetrics.mOverflowArea);
// Make sure the NS_FRAME_OUTSIDE_CHILDREN flag is set correctly
if ((aMetrics.mOverflowArea.x < 0) ||
(aMetrics.mOverflowArea.y < 0) ||
(aMetrics.mOverflowArea.XMost() > aMetrics.width) ||
(aMetrics.mOverflowArea.YMost() > aMetrics.height)) {
mState |= NS_FRAME_OUTSIDE_CHILDREN;
} else {
mState &= ~NS_FRAME_OUTSIDE_CHILDREN;
}
}
// Clear the space manager pointer in the block reflow state so we
// don't waste time translating the coordinate system back on a dead
@ -1159,6 +1169,10 @@ nsBlockFrame::Reflow(nsIPresContext* aPresContext,
}
#endif
#ifdef DEBUG_roc
printf("*** Metrics width/height on the way out=%d,%d\n", aMetrics.width, aMetrics.height);
#endif
NS_FRAME_SET_TRUNCATION(aStatus, aReflowState, aMetrics);
return rv;
}
@ -1532,6 +1546,18 @@ nsBlockFrame::ComputeFinalSize(const nsHTMLReflowState& aReflowState,
}
ComputeCombinedArea(aReflowState, aMetrics);
// If the combined area of our children exceeds our bounding box
// then set the NS_FRAME_OUTSIDE_CHILDREN flag, otherwise clear it.
if ((aMetrics.mOverflowArea.x < 0) ||
(aMetrics.mOverflowArea.y < 0) ||
(aMetrics.mOverflowArea.XMost() > aMetrics.width) ||
(aMetrics.mOverflowArea.YMost() > aMetrics.height)) {
mState |= NS_FRAME_OUTSIDE_CHILDREN;
}
else {
mState &= ~NS_FRAME_OUTSIDE_CHILDREN;
}
}
void

49
layout/generic/nsFrame.cpp
Просмотреть файл

@ -754,55 +754,6 @@ nsFrame::DisplaySelection(nsIPresContext* aPresContext, PRBool isOkToTurnOn)
return selType;
}
void
nsFrame::ComputeOverflowArea(nsRect& aOverflowArea,
const nsRect& aCombinedChildren)
{
// the frame's rect in its own coordinate system
nsRect r(0, 0, mRect.width, mRect.height);
// Make the default combined area: frame U children
aOverflowArea.UnionRect(aCombinedChildren, r);
// WARNING: aCombinedChildren might be the same rect as aOverflowArea.
// It may have been destroyed now. Don't use it below.
// Don't do the following mildly expensive stuff unless we have a view;
// any block frame with overflow:hidden will have a view
// (see nsContainerFrame::FrameNeedsView).
// HasView() is very cheap; it just checks a bit on mState.
if (HasView()) {
// The following code is temporarily disabled. We'll turn it on
// when proper support for 'outline' lands. Note that it assumes
// any frame with 'outline' has a view. --- roc
#if 0
// Add in the outline width, which overflows our border area
const nsStyleOutline* outline;
::GetStyleData(mStyleContext, &outline);
nscoord width;
outline->GetOutlineWidth(width);
r.Inflate(width, width);
#endif
// overflow:hidden doesn't need to take account of the child area
const nsStyleDisplay* display;
::GetStyleData(mStyleContext, &display);
if (NS_STYLE_OVERFLOW_HIDDEN == display->mOverflow
&& (display->IsBlockLevel() || display->IsFloating())) {
aOverflowArea = r;
}
}
// Set state bit to indicate whether there is any overflow
if (aOverflowArea.x < 0
|| aOverflowArea.y < 0
|| aOverflowArea.XMost() > mRect.width
|| aOverflowArea.YMost() > mRect.height) {
mState |= NS_FRAME_OUTSIDE_CHILDREN;
} else {
mState &= ~NS_FRAME_OUTSIDE_CHILDREN;
}
}
void
nsFrame::SetOverflowClipRect(nsIRenderingContext& aRenderingContext)
{

5
layout/generic/nsFrame.h
Просмотреть файл

@ -348,11 +348,6 @@ public:
const nsRect& aDamageRect,
PRBool aImmediate = PR_FALSE) const;
// Helper function to compute the overflow area for a frame,
// taking into account overflow:hidden and any outline present.
// This sets the frame state bit FRAME_OUTSIDE_CHILDREN if necessary.
void ComputeOverflowArea(nsRect& aOverflowArea, const nsRect& aCombinedChildren);
// Helper function to return the index in parent of the frame's content
// object. Returns -1 on error or if the frame doesn't have a content object
static PRInt32 ContentIndexInContainer(const nsIFrame* aFrame);

7
layout/generic/nsIFrame.h
Просмотреть файл

@ -794,13 +794,6 @@ public:
PRInt32* outFrameContentOffset,
nsIFrame* *outChildFrame) = 0;
/**
* Returns true iff the frame has a view (i.e., GetView() returns non-null)
*/
PRBool HasView() {
return (mState & NS_FRAME_HAS_VIEW) != 0;
}
/**
* Get the current frame-state value for this frame. aResult is
* filled in with the state bits.

20
layout/generic/nsInlineFrame.cpp
Просмотреть файл

@ -1311,8 +1311,16 @@ nsPositionedInlineFrame::Reflow(nsIPresContext* aPresContext,
mAbsoluteContainer.CalculateChildBounds(aPresContext, childBounds);
aDesiredSize.mOverflowArea.UnionRect(aDesiredSize.mOverflowArea, childBounds);
// Make sure the NS_FRAME_OUTSIDE_CHILDREN flag is set correctly
if ((aDesiredSize.mOverflowArea.x < 0) ||
(aDesiredSize.mOverflowArea.y < 0) ||
(aDesiredSize.mOverflowArea.XMost() > aDesiredSize.width) ||
(aDesiredSize.mOverflowArea.YMost() > aDesiredSize.height)) {
mState |= NS_FRAME_OUTSIDE_CHILDREN;
} else {
mState &= ~NS_FRAME_OUTSIDE_CHILDREN;
}
#endif
// Don't update the overflow area state here. It's done by line layout.
return rv;
}
}
@ -1348,8 +1356,16 @@ nsPositionedInlineFrame::Reflow(nsIPresContext* aPresContext,
// Factor the absolutely positioned child bounds into the overflow area
aDesiredSize.mOverflowArea.UnionRect(aDesiredSize.mOverflowArea, childBounds);
// Make sure the NS_FRAME_OUTSIDE_CHILDREN flag is set correctly
if ((aDesiredSize.mOverflowArea.x < 0) ||
(aDesiredSize.mOverflowArea.y < 0) ||
(aDesiredSize.mOverflowArea.XMost() > aDesiredSize.width) ||
(aDesiredSize.mOverflowArea.YMost() > aDesiredSize.height)) {
mState |= NS_FRAME_OUTSIDE_CHILDREN;
} else {
mState &= ~NS_FRAME_OUTSIDE_CHILDREN;
}
#endif
// Don't update the overflow area state here. It's done by line layout.
}
return rv;

39
layout/generic/nsLineLayout.cpp
Просмотреть файл

@ -1258,11 +1258,16 @@ nsLineLayout::ReflowFrame(nsIFrame* aFrame,
nsIView* view;
aFrame->GetView(mPresContext, &view);
if (view) {
nsCOMPtr<nsIViewManager> vm;
view->GetViewManager(*getter_AddRefs(vm));
nsIViewManager *vm;
view->GetViewManager(vm);
#if 0 // XXX This is the correct code. We'll turn it on later to mitigate risk.
vm->ResizeView(view, pfd->mCombinedArea);
//nsContainerFrame::SyncFrameViewAfterSizeChange(mPresContext, pfd->mFrame, nsnull, view);
#else // imitate the old, wrong code
nsRect r(0, 0, metrics.width, metrics.height);
vm->ResizeView(view, r);
#endif
NS_RELEASE(vm);
}
// Tell the frame that we're done reflowing it
@ -3318,26 +3323,20 @@ nsLineLayout::RelativePositionFrames(PerSpanData* psd, nsRect& aCombinedArea)
}
// If we just computed a spans combined area, we need to update its
// NS_FRAME_OUTSIDE_CHILDREN bit. We also may need to take into account
// an outline.
// NS_FRAME_OUTSIDE_CHILDREN bit..
if (nsnull != psd->mFrame) {
pfd = psd->mFrame;
nsIFrame* frame = pfd->mFrame;
// We're conservative here; the combined area for this span/frame
// is the union of the area that the frame computed during reflow
// and the area that we computed for it here in RelativePositionFrames.
// We do this because relatively positioned frames that are also spans
// have two contributors to the overflow area: overflowing inline children
// and overflowing absolute children.
// This could be larger than necessary if inline alignment caused an inline child
// to overflow less, because its old overflow would still be counted in
// pfd->mCombinedArea.
// But in practice it's OK to have an overflow area that's larger than necessary.
// (Although if it happens too often it could become a paint performance issue).
nsRect children;
children.UnionRect(pfd->mCombinedArea, aCombinedArea);
NS_STATIC_CAST(nsFrame*, frame)->ComputeOverflowArea(aCombinedArea, children);
nsFrameState oldState;
frame->GetFrameState(&oldState);
nsFrameState newState = oldState & ~NS_FRAME_OUTSIDE_CHILDREN;
if ((minX < 0) || (minY < 0) ||
(maxX > pfd->mBounds.width) || (maxY > pfd->mBounds.height)) {
newState |= NS_FRAME_OUTSIDE_CHILDREN;
}
if (newState != oldState) {
frame->SetFrameState(newState);
}
}
}

46
layout/html/base/src/nsBlockFrame.cpp
Просмотреть файл

@ -771,16 +771,21 @@ nsBlockFrame::Reflow(nsIPresContext* aPresContext,
// Whether or not we're complete hasn't changed
aStatus = (nsnull != mNextInFlow) ? NS_FRAME_NOT_COMPLETE : NS_FRAME_COMPLETE;
ComputeCombinedArea(aReflowState, aMetrics);
// Factor the absolutely positioned child bounds into the overflow area
ComputeCombinedArea(aReflowState, aMetrics);
nsRect childBounds;
mAbsoluteContainer.CalculateChildBounds(aPresContext, childBounds);
aMetrics.mOverflowArea.UnionRect(aMetrics.mOverflowArea, childBounds);
// Finish computing the overflow area, taking account of outline and
// overflow:hidden etc
ComputeOverflowArea(aMetrics.mOverflowArea, aMetrics.mOverflowArea);
// Make sure the NS_FRAME_OUTSIDE_CHILDREN flag is set correctly
if ((aMetrics.mOverflowArea.x < 0) ||
(aMetrics.mOverflowArea.y < 0) ||
(aMetrics.mOverflowArea.XMost() > aMetrics.width) ||
(aMetrics.mOverflowArea.YMost() > aMetrics.height)) {
mState |= NS_FRAME_OUTSIDE_CHILDREN;
} else {
mState &= ~NS_FRAME_OUTSIDE_CHILDREN;
}
return NS_OK;
}
@ -1090,12 +1095,17 @@ nsBlockFrame::Reflow(nsIPresContext* aPresContext,
// Factor the absolutely positioned child bounds into the overflow area
aMetrics.mOverflowArea.UnionRect(aMetrics.mOverflowArea, childBounds);
}
// Area of child content has been computed into mOverflowArea
// Finish computing the overflow area, taking account of outline and
// overflow:hidden etc
ComputeOverflowArea(aMetrics.mOverflowArea, aMetrics.mOverflowArea);
// Make sure the NS_FRAME_OUTSIDE_CHILDREN flag is set correctly
if ((aMetrics.mOverflowArea.x < 0) ||
(aMetrics.mOverflowArea.y < 0) ||
(aMetrics.mOverflowArea.XMost() > aMetrics.width) ||
(aMetrics.mOverflowArea.YMost() > aMetrics.height)) {
mState |= NS_FRAME_OUTSIDE_CHILDREN;
} else {
mState &= ~NS_FRAME_OUTSIDE_CHILDREN;
}
}
// Clear the space manager pointer in the block reflow state so we
// don't waste time translating the coordinate system back on a dead
@ -1159,6 +1169,10 @@ nsBlockFrame::Reflow(nsIPresContext* aPresContext,
}
#endif
#ifdef DEBUG_roc
printf("*** Metrics width/height on the way out=%d,%d\n", aMetrics.width, aMetrics.height);
#endif
NS_FRAME_SET_TRUNCATION(aStatus, aReflowState, aMetrics);
return rv;
}
@ -1532,6 +1546,18 @@ nsBlockFrame::ComputeFinalSize(const nsHTMLReflowState& aReflowState,
}
ComputeCombinedArea(aReflowState, aMetrics);
// If the combined area of our children exceeds our bounding box
// then set the NS_FRAME_OUTSIDE_CHILDREN flag, otherwise clear it.
if ((aMetrics.mOverflowArea.x < 0) ||
(aMetrics.mOverflowArea.y < 0) ||
(aMetrics.mOverflowArea.XMost() > aMetrics.width) ||
(aMetrics.mOverflowArea.YMost() > aMetrics.height)) {
mState |= NS_FRAME_OUTSIDE_CHILDREN;
}
else {
mState &= ~NS_FRAME_OUTSIDE_CHILDREN;
}
}
void

49
layout/html/base/src/nsFrame.cpp
Просмотреть файл

@ -754,55 +754,6 @@ nsFrame::DisplaySelection(nsIPresContext* aPresContext, PRBool isOkToTurnOn)
return selType;
}
void
nsFrame::ComputeOverflowArea(nsRect& aOverflowArea,
const nsRect& aCombinedChildren)
{
// the frame's rect in its own coordinate system
nsRect r(0, 0, mRect.width, mRect.height);
// Make the default combined area: frame U children
aOverflowArea.UnionRect(aCombinedChildren, r);
// WARNING: aCombinedChildren might be the same rect as aOverflowArea.
// It may have been destroyed now. Don't use it below.
// Don't do the following mildly expensive stuff unless we have a view;
// any block frame with overflow:hidden will have a view
// (see nsContainerFrame::FrameNeedsView).
// HasView() is very cheap; it just checks a bit on mState.
if (HasView()) {
// The following code is temporarily disabled. We'll turn it on
// when proper support for 'outline' lands. Note that it assumes
// any frame with 'outline' has a view. --- roc
#if 0
// Add in the outline width, which overflows our border area
const nsStyleOutline* outline;
::GetStyleData(mStyleContext, &outline);
nscoord width;
outline->GetOutlineWidth(width);
r.Inflate(width, width);
#endif
// overflow:hidden doesn't need to take account of the child area
const nsStyleDisplay* display;
::GetStyleData(mStyleContext, &display);
if (NS_STYLE_OVERFLOW_HIDDEN == display->mOverflow
&& (display->IsBlockLevel() || display->IsFloating())) {
aOverflowArea = r;
}
}
// Set state bit to indicate whether there is any overflow
if (aOverflowArea.x < 0
|| aOverflowArea.y < 0
|| aOverflowArea.XMost() > mRect.width
|| aOverflowArea.YMost() > mRect.height) {
mState |= NS_FRAME_OUTSIDE_CHILDREN;
} else {
mState &= ~NS_FRAME_OUTSIDE_CHILDREN;
}
}
void
nsFrame::SetOverflowClipRect(nsIRenderingContext& aRenderingContext)
{

5
layout/html/base/src/nsFrame.h
Просмотреть файл

@ -348,11 +348,6 @@ public:
const nsRect& aDamageRect,
PRBool aImmediate = PR_FALSE) const;
// Helper function to compute the overflow area for a frame,
// taking into account overflow:hidden and any outline present.
// This sets the frame state bit FRAME_OUTSIDE_CHILDREN if necessary.
void ComputeOverflowArea(nsRect& aOverflowArea, const nsRect& aCombinedChildren);
// Helper function to return the index in parent of the frame's content
// object. Returns -1 on error or if the frame doesn't have a content object
static PRInt32 ContentIndexInContainer(const nsIFrame* aFrame);

20
layout/html/base/src/nsInlineFrame.cpp
Просмотреть файл

@ -1311,8 +1311,16 @@ nsPositionedInlineFrame::Reflow(nsIPresContext* aPresContext,
mAbsoluteContainer.CalculateChildBounds(aPresContext, childBounds);
aDesiredSize.mOverflowArea.UnionRect(aDesiredSize.mOverflowArea, childBounds);
// Make sure the NS_FRAME_OUTSIDE_CHILDREN flag is set correctly
if ((aDesiredSize.mOverflowArea.x < 0) ||
(aDesiredSize.mOverflowArea.y < 0) ||
(aDesiredSize.mOverflowArea.XMost() > aDesiredSize.width) ||
(aDesiredSize.mOverflowArea.YMost() > aDesiredSize.height)) {
mState |= NS_FRAME_OUTSIDE_CHILDREN;
} else {
mState &= ~NS_FRAME_OUTSIDE_CHILDREN;
}
#endif
// Don't update the overflow area state here. It's done by line layout.
return rv;
}
}
@ -1348,8 +1356,16 @@ nsPositionedInlineFrame::Reflow(nsIPresContext* aPresContext,
// Factor the absolutely positioned child bounds into the overflow area
aDesiredSize.mOverflowArea.UnionRect(aDesiredSize.mOverflowArea, childBounds);
// Make sure the NS_FRAME_OUTSIDE_CHILDREN flag is set correctly
if ((aDesiredSize.mOverflowArea.x < 0) ||
(aDesiredSize.mOverflowArea.y < 0) ||
(aDesiredSize.mOverflowArea.XMost() > aDesiredSize.width) ||
(aDesiredSize.mOverflowArea.YMost() > aDesiredSize.height)) {
mState |= NS_FRAME_OUTSIDE_CHILDREN;
} else {
mState &= ~NS_FRAME_OUTSIDE_CHILDREN;
}
#endif
// Don't update the overflow area state here. It's done by line layout.
}
return rv;

39
layout/html/base/src/nsLineLayout.cpp
Просмотреть файл

@ -1258,11 +1258,16 @@ nsLineLayout::ReflowFrame(nsIFrame* aFrame,
nsIView* view;
aFrame->GetView(mPresContext, &view);
if (view) {
nsCOMPtr<nsIViewManager> vm;
view->GetViewManager(*getter_AddRefs(vm));
nsIViewManager *vm;
view->GetViewManager(vm);
#if 0 // XXX This is the correct code. We'll turn it on later to mitigate risk.
vm->ResizeView(view, pfd->mCombinedArea);
//nsContainerFrame::SyncFrameViewAfterSizeChange(mPresContext, pfd->mFrame, nsnull, view);
#else // imitate the old, wrong code
nsRect r(0, 0, metrics.width, metrics.height);
vm->ResizeView(view, r);
#endif
NS_RELEASE(vm);
}
// Tell the frame that we're done reflowing it
@ -3318,26 +3323,20 @@ nsLineLayout::RelativePositionFrames(PerSpanData* psd, nsRect& aCombinedArea)
}
// If we just computed a spans combined area, we need to update its
// NS_FRAME_OUTSIDE_CHILDREN bit. We also may need to take into account
// an outline.
// NS_FRAME_OUTSIDE_CHILDREN bit..
if (nsnull != psd->mFrame) {
pfd = psd->mFrame;
nsIFrame* frame = pfd->mFrame;
// We're conservative here; the combined area for this span/frame
// is the union of the area that the frame computed during reflow
// and the area that we computed for it here in RelativePositionFrames.
// We do this because relatively positioned frames that are also spans
// have two contributors to the overflow area: overflowing inline children
// and overflowing absolute children.
// This could be larger than necessary if inline alignment caused an inline child
// to overflow less, because its old overflow would still be counted in
// pfd->mCombinedArea.
// But in practice it's OK to have an overflow area that's larger than necessary.
// (Although if it happens too often it could become a paint performance issue).
nsRect children;
children.UnionRect(pfd->mCombinedArea, aCombinedArea);
NS_STATIC_CAST(nsFrame*, frame)->ComputeOverflowArea(aCombinedArea, children);
nsFrameState oldState;
frame->GetFrameState(&oldState);
nsFrameState newState = oldState & ~NS_FRAME_OUTSIDE_CHILDREN;
if ((minX < 0) || (minY < 0) ||
(maxX > pfd->mBounds.width) || (maxY > pfd->mBounds.height)) {
newState |= NS_FRAME_OUTSIDE_CHILDREN;
}
if (newState != oldState) {
frame->SetFrameState(newState);
}
}
}

3
view/public/nsIViewManager.h
Просмотреть файл

@ -547,9 +547,6 @@ public:
};
//update view as if a child view was being invalidated,
//so the view should apply its 'child clip'
#define NS_VMREFRESH_FORCHILD 0x0001
//update view now?
#define NS_VMREFRESH_IMMEDIATE 0x0002
//prevent "sync painting"

29
view/src/nsViewManager.cpp
Просмотреть файл

@ -1629,18 +1629,12 @@ NS_IMETHODIMP nsViewManager::UpdateView(nsIView *aView, const nsRect &aRect, PRU
}
view->ConvertFromParentCoords(&clippedRect.x, &clippedRect.y);
if ((aUpdateFlags & NS_VMREFRESH_FORCHILD) != 0 && view->GetClipChildren()) {
nsRect childClipRect;
view->GetChildClip(childClipRect);
if (!clippedRect.IntersectRect(clippedRect, childClipRect)) {
return NS_OK;
}
}
nsRect damagedRect;
if (!damagedRect.IntersectRect(aRect, clippedRect)) {
return NS_OK;
}
damagedRect.x = aRect.x;
damagedRect.y = aRect.y;
damagedRect.width = aRect.width;
damagedRect.height = aRect.height;
damagedRect.IntersectRect(aRect, clippedRect);
// If the rectangle is not visible then abort
// without invalidating. This is a performance
@ -2506,10 +2500,10 @@ NS_IMETHODIMP nsViewManager::MoveViewTo(nsIView *aView, nscoord aX, nscoord aY)
view->GetVisibility(visibility);
if (visibility != nsViewVisibility_kHide) {
nsView* parentView = view->GetParent();
UpdateView(parentView, oldArea, NS_VMREFRESH_NO_SYNC | NS_VMREFRESH_FORCHILD);
UpdateView(parentView, oldArea, NS_VMREFRESH_NO_SYNC);
nsRect newArea;
view->GetBounds(newArea);
UpdateView(parentView, newArea, NS_VMREFRESH_NO_SYNC | NS_VMREFRESH_FORCHILD);
UpdateView(parentView, newArea, NS_VMREFRESH_NO_SYNC);
}
}
return NS_OK;
@ -2570,7 +2564,7 @@ NS_IMETHODIMP nsViewManager::ResizeView(nsIView *aView, const nsRect &aRect, PRB
UpdateView(view, aRect, NS_VMREFRESH_NO_SYNC);
view->ConvertToParentCoords(&oldDimensions.x, &oldDimensions.y);
UpdateView(parentView, oldDimensions, NS_VMREFRESH_NO_SYNC | NS_VMREFRESH_FORCHILD);
UpdateView(parentView, oldDimensions, NS_VMREFRESH_NO_SYNC);
} else {
view->SetDimensions(aRect, PR_FALSE);
@ -2578,7 +2572,7 @@ NS_IMETHODIMP nsViewManager::ResizeView(nsIView *aView, const nsRect &aRect, PRB
nsRect r = aRect;
view->ConvertToParentCoords(&r.x, &r.y);
view->ConvertToParentCoords(&oldDimensions.x, &oldDimensions.y);
InvalidateRectDifference(parentView, oldDimensions, r, NS_VMREFRESH_NO_SYNC | NS_VMREFRESH_FORCHILD);
InvalidateRectDifference(parentView, oldDimensions, r, NS_VMREFRESH_NO_SYNC);
}
}
@ -2656,8 +2650,7 @@ NS_IMETHODIMP nsViewManager::SetViewChildClipRegion(nsIView *aView, const nsRegi
if (parent != nsnull) {
view->ConvertToParentCoords(&oldClipRect.x, &oldClipRect.y);
view->ConvertToParentCoords(&newClipRect.x, &newClipRect.y);
InvalidateRectDifference(parent, oldClipRect, newClipRect,
NS_VMREFRESH_NO_SYNC | NS_VMREFRESH_FORCHILD);
InvalidateRectDifference(parent, oldClipRect, newClipRect, NS_VMREFRESH_NO_SYNC);
}
}
@ -2894,7 +2887,7 @@ NS_IMETHODIMP nsViewManager::SetViewVisibility(nsIView *aView, nsViewVisibility
if (parentView) {
nsRect bounds;
view->GetBounds(bounds);
UpdateView(parentView, bounds, NS_VMREFRESH_NO_SYNC | NS_VMREFRESH_FORCHILD);
UpdateView(parentView, bounds, NS_VMREFRESH_NO_SYNC);
}
}
else {