Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug 310436: Allow glyph frames as child of svg. r=tor sr=dbaron

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@188248 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
cvshook%sicking.cc
2006-01-26 18:32:55 +00:00
parent 8c96f94e35
commit b65ed3129c
1 changed files with 18 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
mozilla/layout/base/nsCSSFrameConstructor.cpp
View File

@@ -5572,9 +5572,11 @@ nsCSSFrameConstructor::ConstructTextFrame(nsFrameConstructorState& aState,
nsIFrame* newFrame = nsnull;
#ifdef MOZ_SVG
nsCOMPtr<nsISVGTextContainerFrame> svg_parent = do_QueryInterface(aParentFrame);
if (svg_parent)
{
if (aParentFrame->IsFrameOfType(nsIFrame::eSVG)) {
nsCOMPtr<nsISVGTextContainerFrame> svg_parent = do_QueryInterface(aParentFrame);
if (!svg_parent) {
return NS_OK;
}
newFrame = NS_NewSVGGlyphFrame(mPresShell, aContent, aParentFrame);
}
else {
@@ -8060,19 +8062,6 @@ nsCSSFrameConstructor::ConstructFrameInternal( nsFrameConstructorState& aState,
return NS_OK;
}
#ifdef MOZ_SVG
// Don't create frames for non-SVG children of SVG elements
if (aNameSpaceID != kNameSpaceID_SVG &&
aParentFrame &&
aParentFrame->IsFrameOfType(nsIFrame::eSVG)
#ifdef MOZ_SVG_FOREIGNOBJECT
&& !aParentFrame->IsFrameOfType(nsIFrame::eSVGForeignObject)
#endif
) {
return NS_OK;
}
#endif
nsIFrame* adjParentFrame = aParentFrame;
nsFrameItems* frameItems = &aFrameItems;
PRBool pseudoParent = PR_FALSE;
@@ -8089,6 +8078,19 @@ nsCSSFrameConstructor::ConstructFrameInternal( nsFrameConstructorState& aState,
return ConstructTextFrame(aState, aContent, adjParentFrame, styleContext,
*frameItems, pseudoParent);
#ifdef MOZ_SVG
// Don't create frames for non-SVG children of SVG elements
if (aNameSpaceID != kNameSpaceID_SVG &&
aParentFrame &&
aParentFrame->IsFrameOfType(nsIFrame::eSVG)
#ifdef MOZ_SVG_FOREIGNOBJECT
&& !aParentFrame->IsFrameOfType(nsIFrame::eSVGForeignObject)
#endif
) {
return NS_OK;
}
#endif
// Style resolution can normally happen lazily. However, getting the
// Visibility struct can cause |SetBidiEnabled| to be called on the
// pres context, and this needs to happen before we start reflow, so