Bug 1652194 - Remove SVGGenericContainerFrame r=jwatt

Differential Revision: https://phabricator.services.mozilla.com/D83257
dothq · Jul 16, 2020 · 63ae9a2 · 63ae9a2
1 parent 0cfcab6
commit 63ae9a2
Show file tree

Hide file tree

Showing 5 changed files with 0 additions and 113 deletions.
diff --git a/layout/base/nsCSSFrameConstructor.cpp b/layout/base/nsCSSFrameConstructor.cpp
@@ -142,8 +142,6 @@ nsContainerFrame* NS_NewSVGOuterSVGAnonChildFrame(PresShell* aPresShell,
 nsIFrame* NS_NewSVGInnerSVGFrame(PresShell* aPresShell, ComputedStyle* aStyle);
 nsIFrame* NS_NewSVGGeometryFrame(PresShell* aPresShell, ComputedStyle* aStyle);
 nsIFrame* NS_NewSVGGFrame(PresShell* aPresShell, ComputedStyle* aStyle);
-nsIFrame* NS_NewSVGGenericContainerFrame(PresShell* aPresShell,
-                                         ComputedStyle* aStyle);
 nsContainerFrame* NS_NewSVGForeignObjectFrame(PresShell* aPresShell,
                                               ComputedStyle* aStyle);
 nsIFrame* NS_NewSVGAFrame(PresShell* aPresShell, ComputedStyle* aStyle);
@@ -5006,7 +5004,6 @@ nsCSSFrameConstructor::FindSVGData(const Element& aElement,
       SIMPLE_SVG_CREATE(rect, NS_NewSVGGeometryFrame),
       SIMPLE_SVG_CREATE(path, NS_NewSVGGeometryFrame),
       SIMPLE_SVG_CREATE(defs, NS_NewSVGContainerFrame),
-      SIMPLE_SVG_CREATE(generic_, NS_NewSVGGenericContainerFrame),
       {nsGkAtoms::text,
        FCDATA_WITH_WRAPPING_BLOCK(
            FCDATA_DISALLOW_OUT_OF_FLOW | FCDATA_ALLOW_BLOCK_STYLES,

diff --git a/layout/svg/SVGGenericContainerFrame.cpp b/layout/svg/SVGGenericContainerFrame.cpp
diff --git a/layout/svg/SVGGenericContainerFrame.h b/layout/svg/SVGGenericContainerFrame.h
diff --git a/layout/svg/moz.build b/layout/svg/moz.build
@@ -52,7 +52,6 @@ UNIFIED_SOURCES += [
     'SVGFilterFrame.cpp',
     'SVGFilterInstance.cpp',
     'SVGForeignObjectFrame.cpp',
-    'SVGGenericContainerFrame.cpp',
     'SVGGeometryFrame.cpp',
     'SVGGFrame.cpp',
     'SVGGradientFrame.cpp',

diff --git a/xpcom/ds/StaticAtoms.py b/xpcom/ds/StaticAtoms.py
@@ -1406,8 +1406,6 @@
     Atom("G", "G"),
     Atom("g", "g"),
     Atom("gamma", "gamma"),
-    # 'generic' conflicts with msvc11 winrt compiler extensions
-    Atom("generic_", "generic"),
     Atom("glyphRef", "glyphRef"),
     Atom("grad", "grad"),
     Atom("gradientTransform", "gradientTransform"),