Bug 970647 patch 3: Rename (to match convention) and better share nsStyleDisplay* variable in nsIFrame::Preserves3DChildren. r=mattwoodrow

This commit is contained in:
L. David Baron 2014-02-10 17:03:25 -08:00
parent d20f2fd0fd
commit 20e815fd1f

View File

@ -1020,8 +1020,9 @@ nsIFrame::IsSVGTransformed(gfx::Matrix *aOwnTransforms,
bool
nsIFrame::Preserves3DChildren() const
{
if (StyleDisplay()->mTransformStyle != NS_STYLE_TRANSFORM_STYLE_PRESERVE_3D ||
!StyleDisplay()->HasTransform(this)) {
const nsStyleDisplay* disp = StyleDisplay();
if (disp->mTransformStyle != NS_STYLE_TRANSFORM_STYLE_PRESERVE_3D ||
!disp->HasTransform(this)) {
return false;
}
@ -1031,9 +1032,8 @@ nsIFrame::Preserves3DChildren() const
}
nsRect temp;
const nsStyleDisplay* displayStyle = StyleDisplay();
return !nsFrame::ShouldApplyOverflowClipping(this, displayStyle) &&
!GetClipPropClipRect(displayStyle, &temp, GetSize()) &&
return !nsFrame::ShouldApplyOverflowClipping(this, disp) &&
!GetClipPropClipRect(disp, &temp, GetSize()) &&
!nsSVGIntegrationUtils::UsingEffectsForFrame(this);
}