Bug 331291 - clip setup from svg image was persistent. r=scooter
git-svn-id: svn://10.0.0.236/trunk@192818 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
@@ -319,9 +319,6 @@ nsSVGImageFrame::PaintSVG(nsISVGRendererCanvas* canvas)
|
||||
mWidth->GetValue(&width);
|
||||
mHeight->GetValue(&height);
|
||||
|
||||
if (GetStyleDisplay()->IsScrollableOverflow())
|
||||
canvas->SetClipRect(ctm, x, y, width, height);
|
||||
|
||||
PRUint32 nativeWidth, nativeHeight;
|
||||
mSurface->GetWidth(&nativeWidth);
|
||||
mSurface->GetHeight(&nativeHeight);
|
||||
@@ -338,9 +335,17 @@ nsSVGImageFrame::PaintSVG(nsISVGRendererCanvas* canvas)
|
||||
ctm->Translate(x, y, getter_AddRefs(ctmXY));
|
||||
ctmXY->Multiply(trans, getter_AddRefs(fini));
|
||||
|
||||
if (GetStyleDisplay()->IsScrollableOverflow()) {
|
||||
canvas->PushClip();
|
||||
canvas->SetClipRect(ctm, x, y, width, height);
|
||||
}
|
||||
|
||||
canvas->CompositeSurfaceMatrix(mSurface,
|
||||
fini,
|
||||
mStyleContext->GetStyleDisplay()->mOpacity);
|
||||
|
||||
if (GetStyleDisplay()->IsScrollableOverflow())
|
||||
canvas->PopClip();
|
||||
}
|
||||
|
||||
return NS_OK;
|
||||
|
||||
Reference in New Issue
Block a user