Back out 0642a5722c59 (bug 1178382) for OS X reftest failures in 825999.html

This commit is contained in:
Phil Ringnalda 2015-07-03 19:44:39 -07:00
parent ab06bdf2b9
commit 6d4fe3b709

View File

@ -582,10 +582,8 @@ public:
static bool ShouldApplyOverflowClipping(const nsIFrame* aFrame,
const nsStyleDisplay* aDisp)
{
// clip overflow:-moz-hidden-unscrollable, except for nsListControlFrame,
// which is an nsHTMLScrollFrame.
if (MOZ_UNLIKELY(aDisp->mOverflowX == NS_STYLE_OVERFLOW_CLIP &&
aFrame->GetType() != nsGkAtoms::listControlFrame)) {
// clip overflow:-moz-hidden-unscrollable ...
if (MOZ_UNLIKELY(aDisp->mOverflowX == NS_STYLE_OVERFLOW_CLIP)) {
return true;
}