diff --git a/mozilla/content/shared/public/nsCSSPropList.h b/mozilla/content/shared/public/nsCSSPropList.h index f676ad3c025..a11f3e8b388 100644 --- a/mozilla/content/shared/public/nsCSSPropList.h +++ b/mozilla/content/shared/public/nsCSSPropList.h @@ -131,11 +131,11 @@ CSS_PROP(-moz-box-sizing, box_sizing, REFLOW) // XXX bug 3935 CSS_PROP(-moz-box-ordinal-group, box_ordinal_group, FRAMECHANGE) CSS_PROP(caption-side, caption_side, REFLOW) CSS_PROP(clear, clear, REFLOW) -CSS_PROP(clip, clip, VISUAL) -CSS_PROP(-x-clip-bottom, clip_bottom, VISUAL) // XXX bug 3935 -CSS_PROP(-x-clip-left, clip_left, VISUAL) // XXX bug 3935 -CSS_PROP(-x-clip-right, clip_right, VISUAL) // XXX bug 3935 -CSS_PROP(-x-clip-top, clip_top, VISUAL) // XXX bug 3935 +CSS_PROP(clip, clip, REFLOW) +CSS_PROP(-x-clip-bottom, clip_bottom, REFLOW) // XXX bug 3935 +CSS_PROP(-x-clip-left, clip_left, REFLOW) // XXX bug 3935 +CSS_PROP(-x-clip-right, clip_right, REFLOW) // XXX bug 3935 +CSS_PROP(-x-clip-top, clip_top, REFLOW) // XXX bug 3935 CSS_PROP(color, color, VISUAL) CSS_PROP(content, content, FRAMECHANGE) CSS_PROP(counter-increment, counter_increment, REFLOW) diff --git a/mozilla/content/shared/src/nsStyleStruct.cpp b/mozilla/content/shared/src/nsStyleStruct.cpp index 3a18360327d..c40bd61d393 100644 --- a/mozilla/content/shared/src/nsStyleStruct.cpp +++ b/mozilla/content/shared/src/nsStyleStruct.cpp @@ -897,12 +897,10 @@ PRInt32 nsStyleDisplay::CalcDifference(const nsStyleDisplay& aOther) const (mOverflow == aOther.mOverflow)) { if ((mBreakType == aOther.mBreakType) && (mBreakBefore == aOther.mBreakBefore) && - (mBreakAfter == aOther.mBreakAfter)) { - if ((mClipFlags == aOther.mClipFlags) && - (mClip == aOther.mClip)) { - return NS_STYLE_HINT_NONE; - } - return NS_STYLE_HINT_VISUAL; + (mBreakAfter == aOther.mBreakAfter) && + (mClipFlags == aOther.mClipFlags) && + (mClip == aOther.mClip)) { + return NS_STYLE_HINT_NONE; } return NS_STYLE_HINT_REFLOW; } diff --git a/mozilla/layout/style/nsCSSPropList.h b/mozilla/layout/style/nsCSSPropList.h index f676ad3c025..a11f3e8b388 100644 --- a/mozilla/layout/style/nsCSSPropList.h +++ b/mozilla/layout/style/nsCSSPropList.h @@ -131,11 +131,11 @@ CSS_PROP(-moz-box-sizing, box_sizing, REFLOW) // XXX bug 3935 CSS_PROP(-moz-box-ordinal-group, box_ordinal_group, FRAMECHANGE) CSS_PROP(caption-side, caption_side, REFLOW) CSS_PROP(clear, clear, REFLOW) -CSS_PROP(clip, clip, VISUAL) -CSS_PROP(-x-clip-bottom, clip_bottom, VISUAL) // XXX bug 3935 -CSS_PROP(-x-clip-left, clip_left, VISUAL) // XXX bug 3935 -CSS_PROP(-x-clip-right, clip_right, VISUAL) // XXX bug 3935 -CSS_PROP(-x-clip-top, clip_top, VISUAL) // XXX bug 3935 +CSS_PROP(clip, clip, REFLOW) +CSS_PROP(-x-clip-bottom, clip_bottom, REFLOW) // XXX bug 3935 +CSS_PROP(-x-clip-left, clip_left, REFLOW) // XXX bug 3935 +CSS_PROP(-x-clip-right, clip_right, REFLOW) // XXX bug 3935 +CSS_PROP(-x-clip-top, clip_top, REFLOW) // XXX bug 3935 CSS_PROP(color, color, VISUAL) CSS_PROP(content, content, FRAMECHANGE) CSS_PROP(counter-increment, counter_increment, REFLOW) diff --git a/mozilla/layout/style/nsStyleStruct.cpp b/mozilla/layout/style/nsStyleStruct.cpp index 3a18360327d..c40bd61d393 100644 --- a/mozilla/layout/style/nsStyleStruct.cpp +++ b/mozilla/layout/style/nsStyleStruct.cpp @@ -897,12 +897,10 @@ PRInt32 nsStyleDisplay::CalcDifference(const nsStyleDisplay& aOther) const (mOverflow == aOther.mOverflow)) { if ((mBreakType == aOther.mBreakType) && (mBreakBefore == aOther.mBreakBefore) && - (mBreakAfter == aOther.mBreakAfter)) { - if ((mClipFlags == aOther.mClipFlags) && - (mClip == aOther.mClip)) { - return NS_STYLE_HINT_NONE; - } - return NS_STYLE_HINT_VISUAL; + (mBreakAfter == aOther.mBreakAfter) && + (mClipFlags == aOther.mClipFlags) && + (mClip == aOther.mClip)) { + return NS_STYLE_HINT_NONE; } return NS_STYLE_HINT_REFLOW; }