mirror of
https://github.com/mozilla/gecko-dev.git
synced 2024-12-05 12:05:22 +00:00
Back out changeset e8bf739addfa (bug 868498 patch 2) for causing bug 894931.
This commit is contained in:
parent
cb9a271064
commit
a65b6c2ed4
@ -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
|
||||
|
Loading…
Reference in New Issue
Block a user