wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Back out changeset e8bf739addfa (bug 868498 patch 2) for causing bug 894931.

Browse Source
This commit is contained in:
L. David Baron 2013-07-18 01:09:16 -07:00
parent d29289ef8f
commit c157fded2b
1 changed files with 2 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
layout/style/nsStyleStruct.cpp
View File

@ -2213,34 +2213,18 @@ nsStyleDisplay::nsStyleDisplay(const nsStyleDisplay& aSource)
mPerspectiveOrigin[1] = aSource.mPerspectiveOrigin[1];
}
static uint8_t
MapRelativePositionToStatic(uint8_t aPositionValue)
{
return aPositionValue == NS_STYLE_POSITION_RELATIVE ?
NS_STYLE_POSITION_STATIC : aPositionValue;
}
nsChangeHint nsStyleDisplay::CalcDifference(const nsStyleDisplay& aOther) const
{
nsChangeHint hint = nsChangeHint(0);
// Changes between position:static and position:relative don't need
// to reconstruct frames.
if (!EqualURIs(mBinding, aOther.mBinding)
|| MapRelativePositionToStatic(mPosition) !=
MapRelativePositionToStatic(aOther.mPosition)
|| mPosition != aOther.mPosition
|| mDisplay != aOther.mDisplay
|| (mFloats == NS_STYLE_FLOAT_NONE) != (aOther.mFloats == NS_STYLE_FLOAT_NONE)
|| mOverflowX != aOther.mOverflowX
|| mOverflowY != aOther.mOverflowY
|| mResize != aOther.mResize) {
|| mResize != aOther.mResize)
NS_UpdateHint(hint, nsChangeHint_ReconstructFrame);
}
if (mPosition != aOther.mPosition) {
NS_UpdateHint(hint,
NS_CombineHint(nsChangeHint_NeedReflow, nsChangeHint_RepaintFrame));
}
if (mFloats != aOther.mFloats) {
// Changing which side we float on doesn't affect descendants directly