wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Backout of bug 409383 to correct test failure on fxdbug-win32-tb.

Browse Source
This commit is contained in:
dtownsend@oxymoronical.com 2008-01-03 12:19:21 -08:00
parent 2ac57e72a8
commit cf11bf9970
3 changed files with 3 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
content/base/src/nsGkAtomList.h
View File

@ -1472,7 +1472,6 @@ GK_ATOM(svgPathGeometryFrame, "SVGPathGeometryFrame")
GK_ATOM(svgPatternFrame, "SVGPatternFrame")
GK_ATOM(svgRadialGradientFrame, "SVGRadialGradientFrame")
GK_ATOM(svgStopFrame, "SVGStopFrame")
GK_ATOM(svgSwitchFrame, "SVGSwitchFrame")
GK_ATOM(svgTextFrame, "SVGTextFrame")
GK_ATOM(svgTextPathFrame, "SVGTextPathFrame")
GK_ATOM(svgTSpanFrame, "SVGTSpanFrame")

10
layout/base/nsCSSFrameConstructor.cpp
View File

@ -175,8 +175,6 @@ NS_NewSVGAFrame(nsIPresShell* aPresShell, nsIContent* aContent, nsStyleContext*
nsIFrame*
NS_NewSVGGlyphFrame(nsIPresShell* aPresShell, nsIContent* aContent, nsIFrame* parent, nsStyleContext* aContext);
nsIFrame*
NS_NewSVGSwitchFrame(nsIPresShell* aPresShell, nsIContent* aContent, nsStyleContext* aContext);
nsIFrame*
NS_NewSVGTextFrame(nsIPresShell* aPresShell, nsIContent* aContent, nsStyleContext* aContext);
nsIFrame*
NS_NewSVGTSpanFrame(nsIPresShell* aPresShell, nsIContent* aContent, nsIFrame* parent, nsStyleContext* aContext);
@ -7349,7 +7347,7 @@ nsCSSFrameConstructor::ConstructSVGFrame(nsFrameConstructorState& aState,
// Are we another child of a switch which already has a child
if (aParentFrame &&
aParentFrame->GetType() == nsGkAtoms::svgSwitchFrame &&
aParentFrame->GetType() == nsGkAtoms::svgSwitch &&
aParentFrame->GetFirstChild(nsnull)) {
*aHaltProcessing = PR_TRUE;
return NS_OK;
@ -7398,12 +7396,10 @@ nsCSSFrameConstructor::ConstructSVGFrame(nsFrameConstructorState& aState,
newFrame = NS_NewSVGInnerSVGFrame(mPresShell, aContent, aStyleContext);
}
}
else if (aTag == nsGkAtoms::g) {
else if (aTag == nsGkAtoms::g ||
aTag == nsGkAtoms::svgSwitch) {
newFrame = NS_NewSVGGFrame(mPresShell, aContent, aStyleContext);
}
else if (aTag == nsGkAtoms::svgSwitch) {
newFrame = NS_NewSVGSwitchFrame(mPresShell, aContent, aStyleContext);
}
else if (aTag == nsGkAtoms::polygon ||
aTag == nsGkAtoms::polyline ||
aTag == nsGkAtoms::circle ||

1
layout/svg/base/src/Makefile.in
View File

@ -87,7 +87,6 @@ CPPSRCS = \
nsSVGPathGeometryFrame.cpp \
nsSVGPatternFrame.cpp \
nsSVGStopFrame.cpp \
nsSVGSwitchFrame.cpp \
nsSVGTextContainerFrame.cpp \
nsSVGTextFrame.cpp \
nsSVGTextPathFrame.cpp \