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

Bug 409383 - Switch sometimes ends up with multiple child frames. r+sr=roc,a1.9=beltzner

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@242298 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
longsonr%gmail.com
2008-01-03 14:30:03 +00:00
parent 54a9bd0356
commit 3342e265a7
4 changed files with 96 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1472,6 +1472,7 @@ 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
mozilla/layout/base/nsCSSFrameConstructor.cpp
View File

@@ -175,6 +175,8 @@ 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);
@@ -7347,7 +7349,7 @@ nsCSSFrameConstructor::ConstructSVGFrame(nsFrameConstructorState& aState,
// Are we another child of a switch which already has a child
if (aParentFrame &&
aParentFrame->GetType() == nsGkAtoms::svgSwitch &&
aParentFrame->GetType() == nsGkAtoms::svgSwitchFrame &&
aParentFrame->GetFirstChild(nsnull)) {
*aHaltProcessing = PR_TRUE;
return NS_OK;
@@ -7396,10 +7398,12 @@ nsCSSFrameConstructor::ConstructSVGFrame(nsFrameConstructorState& aState,
newFrame = NS_NewSVGInnerSVGFrame(mPresShell, aContent, aStyleContext);
}
}
else if (aTag == nsGkAtoms::g ||
aTag == nsGkAtoms::svgSwitch) {
else if (aTag == nsGkAtoms::g) {
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
mozilla/layout/svg/base/src/Makefile.in
View File

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

87
mozilla/layout/svg/base/src/nsSVGSwitchFrame.cpp Normal file
View File

@@ -0,0 +1,87 @@
/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
/* ***** BEGIN LICENSE BLOCK *****
* Version: MPL 1.1/GPL 2.0/LGPL 2.1
*
* The contents of this file are subject to the Mozilla Public License Version
* 1.1 (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
* http://www.mozilla.org/MPL/
*
* Software distributed under the License is distributed on an "AS IS" basis,
* WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
* for the specific language governing rights and limitations under the
* License.
*
* The Original Code is the Mozilla SVG project.
*
* The Initial Developer of the Original Code is
* Robert Longson
* Portions created by the Initial Developer are Copyright (C) 2007
* the Initial Developer. All Rights Reserved.
*
* Contributor(s):
* Robert Longson <longsonr@gmail.com> (original author)
*
* Alternatively, the contents of this file may be used under the terms of
* either the GNU General Public License Version 2 or later (the "GPL"), or
* the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
* in which case the provisions of the GPL or the LGPL are applicable instead
* of those above. If you wish to allow use of your version of this file only
* under the terms of either the GPL or the LGPL, and not to allow others to
* use your version of this file under the terms of the MPL, indicate your
* decision by deleting the provisions above and replace them with the notice
* and other provisions required by the GPL or the LGPL. If you do not delete
* the provisions above, a recipient may use your version of this file under
* the terms of any one of the MPL, the GPL or the LGPL.
*
* ***** END LICENSE BLOCK ***** */
#include "nsSVGGFrame.h"
#include "nsIDOMSVGSwitchElement.h"
typedef nsSVGGFrame nsSVGGSwitchFrameBase;
class nsSVGSwitchFrame : public nsSVGGSwitchFrameBase
{
friend nsIFrame*
NS_NewSVGSwitchFrame(nsIPresShell* aPresShell, nsIContent* aContent, nsStyleContext* aContext);
protected:
nsSVGSwitchFrame(nsStyleContext* aContext) :
nsSVGGSwitchFrameBase(aContext) {}
public:
/**
* Get the "type" of the frame
*
* @see nsGkAtoms::svgSwitchFrame
*/
virtual nsIAtom* GetType() const;
#ifdef DEBUG
NS_IMETHOD GetFrameName(nsAString& aResult) const
{
return MakeFrameName(NS_LITERAL_STRING("SVGSwitch"), aResult);
}
#endif
};
//----------------------------------------------------------------------
// Implementation
nsIFrame*
NS_NewSVGSwitchFrame(nsIPresShell* aPresShell, nsIContent* aContent, nsStyleContext* aContext)
{
nsCOMPtr<nsIDOMSVGSwitchElement> svgSwitch = do_QueryInterface(aContent);
if (!svgSwitch) {
NS_ERROR("Can't create frame. Content is not an SVG switch\n");
return nsnull;
}
return new (aPresShell) nsSVGSwitchFrame(aContext);
}
nsIAtom *
nsSVGSwitchFrame::GetType() const
{
return nsGkAtoms::svgSwitchFrame;
}