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

fixed bug 29854

Browse Source 
r=waterson


git-svn-id: svn://10.0.0.236/trunk@71991 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
buster%netscape.com
2000-06-11 05:25:14 +00:00
parent d6f8fc5767
commit 37a339735a
2 changed files with 52 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
mozilla/layout/base/public/nsIFrame.h
View File

@@ -296,6 +296,32 @@ struct nsHTMLReflowMetrics {
maxElementSize->width += aBorderPadding.left + aBorderPadding.right;
maxElementSize->height += aBorderPadding.top + aBorderPadding.bottom;
}
nsHTMLReflowMetrics& operator=(const nsHTMLReflowMetrics& aOther)
{
if (maxElementSize && aOther.maxElementSize) {
maxElementSize->width = aOther.maxElementSize->width;
maxElementSize->height = aOther.maxElementSize->height;
}
mMaximumWidth = aOther.mMaximumWidth;
mFlags = aOther.mFlags;
mCarriedOutBottomMargin = aOther.mCarriedOutBottomMargin;
mOverflowArea.x = aOther.mOverflowArea.x;
mOverflowArea.y = aOther.mOverflowArea.y;
mOverflowArea.width = aOther.mOverflowArea.width;
mOverflowArea.height = aOther.mOverflowArea.height;
mNothingChanged = aOther.mNothingChanged;
#ifdef MOZ_MATHML
mBoundingMetrics = aOther.mBoundingMetrics;
#endif
width = aOther.width;
height = aOther.height;
ascent = aOther.ascent;
descent = aOther.descent;
return *this;
}
};
// Carried out margin flags

26
mozilla/layout/generic/nsIFrame.h
View File

@@ -296,6 +296,32 @@ struct nsHTMLReflowMetrics {
maxElementSize->width += aBorderPadding.left + aBorderPadding.right;
maxElementSize->height += aBorderPadding.top + aBorderPadding.bottom;
}
nsHTMLReflowMetrics& operator=(const nsHTMLReflowMetrics& aOther)
{
if (maxElementSize && aOther.maxElementSize) {
maxElementSize->width = aOther.maxElementSize->width;
maxElementSize->height = aOther.maxElementSize->height;
}
mMaximumWidth = aOther.mMaximumWidth;
mFlags = aOther.mFlags;
mCarriedOutBottomMargin = aOther.mCarriedOutBottomMargin;
mOverflowArea.x = aOther.mOverflowArea.x;
mOverflowArea.y = aOther.mOverflowArea.y;
mOverflowArea.width = aOther.mOverflowArea.width;
mOverflowArea.height = aOther.mOverflowArea.height;
mNothingChanged = aOther.mNothingChanged;
#ifdef MOZ_MATHML
mBoundingMetrics = aOther.mBoundingMetrics;
#endif
width = aOther.width;
height = aOther.height;
ascent = aOther.ascent;
descent = aOther.descent;
return *this;
}
};
// Carried out margin flags