Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-09 11:25:00 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 344173 - Unbounded inner <svg> not showing. r+sr=roc

Browse Source
This commit is contained in:
tor%cs.brown.edu 2006-07-12 15:36:23 +00:00
parent 899574c818
commit 32ded31b10
1 changed files with 16 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
layout/svg/base/src/nsSVGInnerSVGFrame.cpp
View File

@ -57,7 +57,6 @@ class nsSVGInnerSVGFrame : public nsSVGInnerSVGFrameBase,
NS_NewSVGInnerSVGFrame(nsIPresShell* aPresShell, nsIContent* aContent, nsStyleContext* aContext);
protected:
nsSVGInnerSVGFrame(nsStyleContext* aContext);
NS_IMETHOD InitSVG();
// nsISupports interface:
NS_IMETHOD QueryInterface(const nsIID& aIID, void** aInstancePtr);
@ -89,6 +88,7 @@ public:
// nsISVGChildFrame interface:
NS_IMETHOD PaintSVG(nsISVGRendererCanvas* canvas, nsRect *aDirtyRect);
NS_IMETHOD InitialUpdate();
NS_IMETHOD NotifyCanvasTMChanged(PRBool suppressInvalidation);
NS_IMETHOD SetMatrixPropagation(PRBool aPropagate);
NS_IMETHOD SetOverrideCTM(nsIDOMSVGMatrix *aCTM);
@ -111,6 +111,9 @@ public:
NS_IMETHOD NotifyViewportChange();
protected:
void UpdateCoordCtx();
nsCOMPtr<nsIDOMSVGMatrix> mCanvasTM;
nsCOMPtr<nsIDOMSVGMatrix> mOverrideCTM;
@ -134,20 +137,14 @@ nsSVGInnerSVGFrame::nsSVGInnerSVGFrame(nsStyleContext* aContext) :
#endif
}
NS_IMETHODIMP
nsSVGInnerSVGFrame::InitSVG()
void
nsSVGInnerSVGFrame::UpdateCoordCtx()
{
NS_ASSERTION(mParent, "no parent");
// hook up CoordContextProvider chain:
nsSVGContainerFrame *containerFrame = NS_STATIC_CAST(nsSVGContainerFrame*,
mParent);
nsCOMPtr<nsISVGSVGElement> SVGElement = do_QueryInterface(mContent);
NS_ASSERTION(SVGElement, "wrong content element");
SVGElement->SetParentCoordCtxProvider(nsRefPtr<nsSVGCoordCtxProvider>(containerFrame->GetCoordContextProvider()));
nsSVGSVGElement *svgElement = NS_STATIC_CAST(nsSVGSVGElement*, mContent);
return NS_OK;
svgElement->SetParentCoordCtxProvider(nsRefPtr<nsSVGCoordCtxProvider>(containerFrame->GetCoordContextProvider()));
}
//----------------------------------------------------------------------
@ -212,10 +209,18 @@ nsSVGInnerSVGFrame::NotifyCanvasTMChanged(PRBool suppressInvalidation)
{
// make sure our cached transform matrix gets (lazily) updated
mCanvasTM = nsnull;
UpdateCoordCtx();
return nsSVGInnerSVGFrameBase::NotifyCanvasTMChanged(suppressInvalidation);
}
NS_IMETHODIMP
nsSVGInnerSVGFrame::InitialUpdate()
{
UpdateCoordCtx();
return nsSVGInnerSVGFrameBase::InitialUpdate();
}
NS_IMETHODIMP
nsSVGInnerSVGFrame::SetMatrixPropagation(PRBool aPropagate)