Bug 596753: Flatten layout/svg/base/src into layout/svg. r=dholbert
authorAlexandre Dumont <dmt.alexandre@gmail.com>
Mon, 24 Sep 2012 23:01:21 +0200
changeset 108255 745b5180e4ebf5afec3265c50dca3344dcfe3395
parent 108254 474968430d66897d0172d705c3d3b5cfe4c3df25
child 108256 20169e3f33b350e251a8c228a140c5afa51f25e4
push id82
push usershu@rfrn.org
push dateFri, 05 Oct 2012 13:20:22 +0000
reviewersdholbert
bugs596753
milestone18.0a1
Bug 596753: Flatten layout/svg/base/src into layout/svg. r=dholbert
content/base/src/Makefile.in
content/svg/content/src/Makefile.in
image/src/Makefile.in
layout/Makefile.in
layout/base/Makefile.in
layout/build/Makefile.in
layout/generic/Makefile.in
layout/svg/Makefile.in
layout/svg/SVGFEContainerFrame.cpp
layout/svg/SVGFEImageFrame.cpp
layout/svg/SVGFELeafFrame.cpp
layout/svg/SVGFEUnstyledLeafFrame.cpp
layout/svg/SVGViewFrame.cpp
layout/svg/base/src/Makefile.in
layout/svg/base/src/SVGFEContainerFrame.cpp
layout/svg/base/src/SVGFEImageFrame.cpp
layout/svg/base/src/SVGFELeafFrame.cpp
layout/svg/base/src/SVGFEUnstyledLeafFrame.cpp
layout/svg/base/src/SVGViewFrame.cpp
layout/svg/base/src/nsISVGChildFrame.h
layout/svg/base/src/nsISVGGlyphFragmentNode.h
layout/svg/base/src/nsISVGSVGFrame.h
layout/svg/base/src/nsSVGAFrame.cpp
layout/svg/base/src/nsSVGClipPathFrame.cpp
layout/svg/base/src/nsSVGClipPathFrame.h
layout/svg/base/src/nsSVGContainerFrame.cpp
layout/svg/base/src/nsSVGContainerFrame.h
layout/svg/base/src/nsSVGEffects.cpp
layout/svg/base/src/nsSVGEffects.h
layout/svg/base/src/nsSVGFilterFrame.cpp
layout/svg/base/src/nsSVGFilterFrame.h
layout/svg/base/src/nsSVGFilterInstance.cpp
layout/svg/base/src/nsSVGFilterInstance.h
layout/svg/base/src/nsSVGFilterPaintCallback.h
layout/svg/base/src/nsSVGForeignObjectFrame.cpp
layout/svg/base/src/nsSVGForeignObjectFrame.h
layout/svg/base/src/nsSVGGFrame.cpp
layout/svg/base/src/nsSVGGFrame.h
layout/svg/base/src/nsSVGGenericContainerFrame.cpp
layout/svg/base/src/nsSVGGenericContainerFrame.h
layout/svg/base/src/nsSVGGeometryFrame.cpp
layout/svg/base/src/nsSVGGeometryFrame.h
layout/svg/base/src/nsSVGGlyphFrame.cpp
layout/svg/base/src/nsSVGGlyphFrame.h
layout/svg/base/src/nsSVGGradientFrame.cpp
layout/svg/base/src/nsSVGGradientFrame.h
layout/svg/base/src/nsSVGImageFrame.cpp
layout/svg/base/src/nsSVGInnerSVGFrame.cpp
layout/svg/base/src/nsSVGInnerSVGFrame.h
layout/svg/base/src/nsSVGIntegrationUtils.cpp
layout/svg/base/src/nsSVGIntegrationUtils.h
layout/svg/base/src/nsSVGMarkerFrame.cpp
layout/svg/base/src/nsSVGMarkerFrame.h
layout/svg/base/src/nsSVGMaskFrame.cpp
layout/svg/base/src/nsSVGMaskFrame.h
layout/svg/base/src/nsSVGOuterSVGFrame.cpp
layout/svg/base/src/nsSVGOuterSVGFrame.h
layout/svg/base/src/nsSVGPaintServerFrame.cpp
layout/svg/base/src/nsSVGPaintServerFrame.h
layout/svg/base/src/nsSVGPathGeometryFrame.cpp
layout/svg/base/src/nsSVGPathGeometryFrame.h
layout/svg/base/src/nsSVGPatternFrame.cpp
layout/svg/base/src/nsSVGPatternFrame.h
layout/svg/base/src/nsSVGStopFrame.cpp
layout/svg/base/src/nsSVGSwitchFrame.cpp
layout/svg/base/src/nsSVGTSpanFrame.cpp
layout/svg/base/src/nsSVGTSpanFrame.h
layout/svg/base/src/nsSVGTextContainerFrame.cpp
layout/svg/base/src/nsSVGTextContainerFrame.h
layout/svg/base/src/nsSVGTextFrame.cpp
layout/svg/base/src/nsSVGTextFrame.h
layout/svg/base/src/nsSVGTextPathFrame.cpp
layout/svg/base/src/nsSVGTextPathFrame.h
layout/svg/base/src/nsSVGUseFrame.cpp
layout/svg/base/src/nsSVGUtils.cpp
layout/svg/base/src/nsSVGUtils.h
layout/svg/base/src/resources/content/svgBindings.xml
layout/svg/base/src/svg.css
layout/svg/nsISVGChildFrame.h
layout/svg/nsISVGGlyphFragmentNode.h
layout/svg/nsISVGSVGFrame.h
layout/svg/nsSVGAFrame.cpp
layout/svg/nsSVGClipPathFrame.cpp
layout/svg/nsSVGClipPathFrame.h
layout/svg/nsSVGContainerFrame.cpp
layout/svg/nsSVGContainerFrame.h
layout/svg/nsSVGEffects.cpp
layout/svg/nsSVGEffects.h
layout/svg/nsSVGFilterFrame.cpp
layout/svg/nsSVGFilterFrame.h
layout/svg/nsSVGFilterInstance.cpp
layout/svg/nsSVGFilterInstance.h
layout/svg/nsSVGFilterPaintCallback.h
layout/svg/nsSVGForeignObjectFrame.cpp
layout/svg/nsSVGForeignObjectFrame.h
layout/svg/nsSVGGFrame.cpp
layout/svg/nsSVGGFrame.h
layout/svg/nsSVGGenericContainerFrame.cpp
layout/svg/nsSVGGenericContainerFrame.h
layout/svg/nsSVGGeometryFrame.cpp
layout/svg/nsSVGGeometryFrame.h
layout/svg/nsSVGGlyphFrame.cpp
layout/svg/nsSVGGlyphFrame.h
layout/svg/nsSVGGradientFrame.cpp
layout/svg/nsSVGGradientFrame.h
layout/svg/nsSVGImageFrame.cpp
layout/svg/nsSVGInnerSVGFrame.cpp
layout/svg/nsSVGInnerSVGFrame.h
layout/svg/nsSVGIntegrationUtils.cpp
layout/svg/nsSVGIntegrationUtils.h
layout/svg/nsSVGMarkerFrame.cpp
layout/svg/nsSVGMarkerFrame.h
layout/svg/nsSVGMaskFrame.cpp
layout/svg/nsSVGMaskFrame.h
layout/svg/nsSVGOuterSVGFrame.cpp
layout/svg/nsSVGOuterSVGFrame.h
layout/svg/nsSVGPaintServerFrame.cpp
layout/svg/nsSVGPaintServerFrame.h
layout/svg/nsSVGPathGeometryFrame.cpp
layout/svg/nsSVGPathGeometryFrame.h
layout/svg/nsSVGPatternFrame.cpp
layout/svg/nsSVGPatternFrame.h
layout/svg/nsSVGStopFrame.cpp
layout/svg/nsSVGSwitchFrame.cpp
layout/svg/nsSVGTSpanFrame.cpp
layout/svg/nsSVGTSpanFrame.h
layout/svg/nsSVGTextContainerFrame.cpp
layout/svg/nsSVGTextContainerFrame.h
layout/svg/nsSVGTextFrame.cpp
layout/svg/nsSVGTextFrame.h
layout/svg/nsSVGTextPathFrame.cpp
layout/svg/nsSVGTextPathFrame.h
layout/svg/nsSVGUseFrame.cpp
layout/svg/nsSVGUtils.cpp
layout/svg/nsSVGUtils.h
layout/svg/resources/content/svgBindings.xml
layout/svg/svg.css
toolkit/content/jar.mn
toolkit/toolkit-makefiles.sh
--- a/content/base/src/Makefile.in
+++ b/content/base/src/Makefile.in
@@ -177,17 +177,17 @@ LOCAL_INCLUDES += \
   -I$(topsrcdir)/content/xul/content/src \
   -I$(topsrcdir)/content/xul/document/src \
   -I$(topsrcdir)/dom/base \
   -I$(topsrcdir)/dom/ipc \
   -I$(topsrcdir)/image/src \
   -I$(topsrcdir)/js/xpconnect/src \
   -I$(topsrcdir)/layout/generic \
   -I$(topsrcdir)/layout/style \
-  -I$(topsrcdir)/layout/svg/base/src \
+  -I$(topsrcdir)/layout/svg \
   -I$(topsrcdir)/layout/xul/base/src \
   -I$(topsrcdir)/netwerk/base/src \
   $(NULL)
 
 DEFINES += -D_IMPL_NS_LAYOUT
 DEFINES += -DHB_DONT_DEFINE_STDINT
 
 # gcc requires -msse2 for this file since it uses SSE2 intrinsics.  (See bug
--- a/content/svg/content/src/Makefile.in
+++ b/content/svg/content/src/Makefile.in
@@ -146,17 +146,17 @@ EXPORTS =  			\
 include $(topsrcdir)/config/rules.mk
 
 INCLUDES += 	\
 		-I$(srcdir)/../../../xml/content/src \
 		-I$(srcdir)/../../../../dom \
 		-I$(srcdir)/../../../base/src \
 		-I$(srcdir)/../../../../layout/generic \
 		-I$(srcdir)/../../../../layout/xul/base/src \
-		-I$(srcdir)/../../../../layout/svg/base/src \
+		-I$(srcdir)/../../../../layout/svg \
 		-I$(srcdir)/../../../../layout/style \
 		-I$(srcdir)/../../../events/src \
 		-I$(srcdir)/../../../html/content/src \
 		-I$(topsrcdir)/content/xbl/src \
 		-I$(srcdir)/../../../smil \
 		$(NULL)
 
 DEFINES += -D_IMPL_NS_LAYOUT
--- a/image/src/Makefile.in
+++ b/image/src/Makefile.in
@@ -38,17 +38,17 @@ LOCAL_INCLUDES += -I$(topsrcdir)/image/d
 
 # Because SVGDocumentWrapper.cpp includes "nsSVGSVGElement.h"
 LOCAL_INCLUDES += \
 			-I$(topsrcdir)/content/svg/content/src \
 			-I$(topsrcdir)/content/base/src \
 			$(NULL)
 
 # Because VectorImage.cpp includes nsSVGUtils.h and nsSVGEffects.h
-LOCAL_INCLUDES += -I$(topsrcdir)/layout/svg/base/src
+LOCAL_INCLUDES += -I$(topsrcdir)/layout/svg
 
 include $(topsrcdir)/config/rules.mk
 include $(topsrcdir)/ipc/chromium/chromium-config.mk
 
 # Because imgFrame.cpp includes "cairo.h"
 CXXFLAGS += $(MOZ_CAIRO_CFLAGS) $(MOZ_PIXMAN_CFLAGS)
 
 
--- a/layout/Makefile.in
+++ b/layout/Makefile.in
@@ -13,17 +13,17 @@ include $(DEPTH)/config/autoconf.mk
 MODULE		= layout
 
 PARALLEL_DIRS = \
 		style \
 		base \
 		generic \
 		forms \
 		tables \
-		svg/base/src \
+		svg \
 		xul/base/public \
 		xul/base/src \
 		ipc \
 		mathml \
 		$(NULL)
 
 ifdef NS_PRINTING
 PARALLEL_DIRS += printing
--- a/layout/base/Makefile.in
+++ b/layout/base/Makefile.in
@@ -129,17 +129,17 @@ LOCAL_INCLUDES += \
 		-I$(srcdir)/../../content/base/src \
 		-I$(srcdir)/../../content/events/src \
 		-I$(srcdir)/../../content/xbl/src \
 		-I$(srcdir)/../../view/src \
 		-I$(srcdir)/../../dom/base \
 		-I$(srcdir)/../../content/html/content/src \
 		-I$(srcdir)/../../content/svg/content/src \
 		-I$(topsrcdir)/xpcom/ds \
-		-I$(srcdir)/../svg/base/src \
+		-I$(srcdir)/../svg \
 		-I$(srcdir)/../mathml \
 		$(NULL)
 
 CXXFLAGS += $(MOZ_CAIRO_CFLAGS) $(MOZ_PIXMAN_CFLAGS)
 
 DEFINES += -D_IMPL_NS_LAYOUT
 DEFINES += -DHB_DONT_DEFINE_STDINT
 
--- a/layout/build/Makefile.in
+++ b/layout/build/Makefile.in
@@ -205,17 +205,17 @@ SHARED_LIBRARY_LIBS += ../inspector/src/
 
 ifdef MOZ_XTF
 SHARED_LIBRARY_LIBS += \
 		$(DEPTH)/content/xtf/src/$(LIB_PREFIX)gkcontentxtf_s.$(LIB_SUFFIX) \
 		$(NULL)
 endif
 
 SHARED_LIBRARY_LIBS += \
-		../svg/base/src/$(LIB_PREFIX)gksvgbase_s.$(LIB_SUFFIX) \
+		../svg/$(LIB_PREFIX)gksvgbase_s.$(LIB_SUFFIX) \
 		$(DEPTH)/content/svg/document/src/$(LIB_PREFIX)gkconsvgdoc_s.$(LIB_SUFFIX) \
 		$(DEPTH)/content/svg/content/src/$(LIB_PREFIX)gkcontentsvg_s.$(LIB_SUFFIX) \
 		$(DEPTH)/content/smil/$(LIB_PREFIX)gkconsmil_s.$(LIB_SUFFIX) \
 		$(NULL)
 
 ifdef ENABLE_EDITOR_API_LOG
 DEFINES += -DENABLE_EDITOR_API_LOG
 endif
--- a/layout/generic/Makefile.in
+++ b/layout/generic/Makefile.in
@@ -130,17 +130,17 @@ LOCAL_INCLUDES += \
 		-I$(srcdir)/../style \
 		-I$(srcdir)/../tables \
 		-I$(srcdir)/../xul/base/src \
 		-I$(srcdir)/../../content/xul/content/src \
 		-I$(srcdir)/../../content/base/src \
 		-I$(srcdir)/../../content/html/content/src \
 		-I$(srcdir)/../../dom/base \
 		-I$(srcdir)/../../dom/plugins/base \
-		-I$(srcdir)/../svg/base/src \
+		-I$(srcdir)/../svg \
 		$(MOZ_CAIRO_CFLAGS) \
 		$(MOZ_PIXMAN_CFLAGS) \
 		$(NULL)
 
 ifdef MOZ_ENABLE_GTK2
 CXXFLAGS += $(MOZ_GTK2_CFLAGS)
 endif
 
rename from layout/svg/base/src/Makefile.in
rename to layout/svg/Makefile.in
--- a/layout/svg/base/src/Makefile.in
+++ b/layout/svg/Makefile.in
@@ -64,22 +64,22 @@ EXPORTS = \
 	nsSVGForeignObjectFrame.h \
 	nsSVGIntegrationUtils.h \
 	nsSVGUtils.h \
 	$(NULL)
 
 include $(topsrcdir)/config/rules.mk
 
 LOCAL_INCLUDES	= \
-		-I$(srcdir)/../../../base \
-		-I$(srcdir)/../../../generic \
-		-I$(srcdir)/../../../style \
-		-I$(srcdir)/../../../xul/base/src \
-		-I$(srcdir)/../../../../content/svg/content/src \
-		-I$(srcdir)/../../../../content/base/src \
+		-I$(srcdir)/../base \
+		-I$(srcdir)/../generic \
+		-I$(srcdir)/../style \
+		-I$(srcdir)/../xul/base/src \
+		-I$(srcdir)/../../content/svg/content/src \
+		-I$(srcdir)/../../content/base/src \
 		$(NULL)
 
 libs::
 	$(INSTALL) $(srcdir)/svg.css $(DIST)/bin/res
 
 install::
 	$(SYSINSTALL) $(IFLAGS1) $(srcdir)/svg.css $(DESTDIR)$(mozappdir)/res
 
rename from layout/svg/base/src/SVGFEContainerFrame.cpp
rename to layout/svg/SVGFEContainerFrame.cpp
rename from layout/svg/base/src/SVGFEImageFrame.cpp
rename to layout/svg/SVGFEImageFrame.cpp
rename from layout/svg/base/src/SVGFELeafFrame.cpp
rename to layout/svg/SVGFELeafFrame.cpp
rename from layout/svg/base/src/SVGFEUnstyledLeafFrame.cpp
rename to layout/svg/SVGFEUnstyledLeafFrame.cpp
rename from layout/svg/base/src/SVGViewFrame.cpp
rename to layout/svg/SVGViewFrame.cpp
rename from layout/svg/base/src/nsISVGChildFrame.h
rename to layout/svg/nsISVGChildFrame.h
rename from layout/svg/base/src/nsISVGGlyphFragmentNode.h
rename to layout/svg/nsISVGGlyphFragmentNode.h
rename from layout/svg/base/src/nsISVGSVGFrame.h
rename to layout/svg/nsISVGSVGFrame.h
rename from layout/svg/base/src/nsSVGAFrame.cpp
rename to layout/svg/nsSVGAFrame.cpp
rename from layout/svg/base/src/nsSVGClipPathFrame.cpp
rename to layout/svg/nsSVGClipPathFrame.cpp
rename from layout/svg/base/src/nsSVGClipPathFrame.h
rename to layout/svg/nsSVGClipPathFrame.h
rename from layout/svg/base/src/nsSVGContainerFrame.cpp
rename to layout/svg/nsSVGContainerFrame.cpp
rename from layout/svg/base/src/nsSVGContainerFrame.h
rename to layout/svg/nsSVGContainerFrame.h
rename from layout/svg/base/src/nsSVGEffects.cpp
rename to layout/svg/nsSVGEffects.cpp
rename from layout/svg/base/src/nsSVGEffects.h
rename to layout/svg/nsSVGEffects.h
rename from layout/svg/base/src/nsSVGFilterFrame.cpp
rename to layout/svg/nsSVGFilterFrame.cpp
rename from layout/svg/base/src/nsSVGFilterFrame.h
rename to layout/svg/nsSVGFilterFrame.h
rename from layout/svg/base/src/nsSVGFilterInstance.cpp
rename to layout/svg/nsSVGFilterInstance.cpp
rename from layout/svg/base/src/nsSVGFilterInstance.h
rename to layout/svg/nsSVGFilterInstance.h
rename from layout/svg/base/src/nsSVGFilterPaintCallback.h
rename to layout/svg/nsSVGFilterPaintCallback.h
rename from layout/svg/base/src/nsSVGForeignObjectFrame.cpp
rename to layout/svg/nsSVGForeignObjectFrame.cpp
rename from layout/svg/base/src/nsSVGForeignObjectFrame.h
rename to layout/svg/nsSVGForeignObjectFrame.h
rename from layout/svg/base/src/nsSVGGFrame.cpp
rename to layout/svg/nsSVGGFrame.cpp
rename from layout/svg/base/src/nsSVGGFrame.h
rename to layout/svg/nsSVGGFrame.h
rename from layout/svg/base/src/nsSVGGenericContainerFrame.cpp
rename to layout/svg/nsSVGGenericContainerFrame.cpp
rename from layout/svg/base/src/nsSVGGenericContainerFrame.h
rename to layout/svg/nsSVGGenericContainerFrame.h
rename from layout/svg/base/src/nsSVGGeometryFrame.cpp
rename to layout/svg/nsSVGGeometryFrame.cpp
rename from layout/svg/base/src/nsSVGGeometryFrame.h
rename to layout/svg/nsSVGGeometryFrame.h
rename from layout/svg/base/src/nsSVGGlyphFrame.cpp
rename to layout/svg/nsSVGGlyphFrame.cpp
rename from layout/svg/base/src/nsSVGGlyphFrame.h
rename to layout/svg/nsSVGGlyphFrame.h
rename from layout/svg/base/src/nsSVGGradientFrame.cpp
rename to layout/svg/nsSVGGradientFrame.cpp
rename from layout/svg/base/src/nsSVGGradientFrame.h
rename to layout/svg/nsSVGGradientFrame.h
rename from layout/svg/base/src/nsSVGImageFrame.cpp
rename to layout/svg/nsSVGImageFrame.cpp
rename from layout/svg/base/src/nsSVGInnerSVGFrame.cpp
rename to layout/svg/nsSVGInnerSVGFrame.cpp
rename from layout/svg/base/src/nsSVGInnerSVGFrame.h
rename to layout/svg/nsSVGInnerSVGFrame.h
rename from layout/svg/base/src/nsSVGIntegrationUtils.cpp
rename to layout/svg/nsSVGIntegrationUtils.cpp
rename from layout/svg/base/src/nsSVGIntegrationUtils.h
rename to layout/svg/nsSVGIntegrationUtils.h
rename from layout/svg/base/src/nsSVGMarkerFrame.cpp
rename to layout/svg/nsSVGMarkerFrame.cpp
rename from layout/svg/base/src/nsSVGMarkerFrame.h
rename to layout/svg/nsSVGMarkerFrame.h
rename from layout/svg/base/src/nsSVGMaskFrame.cpp
rename to layout/svg/nsSVGMaskFrame.cpp
rename from layout/svg/base/src/nsSVGMaskFrame.h
rename to layout/svg/nsSVGMaskFrame.h
rename from layout/svg/base/src/nsSVGOuterSVGFrame.cpp
rename to layout/svg/nsSVGOuterSVGFrame.cpp
rename from layout/svg/base/src/nsSVGOuterSVGFrame.h
rename to layout/svg/nsSVGOuterSVGFrame.h
rename from layout/svg/base/src/nsSVGPaintServerFrame.cpp
rename to layout/svg/nsSVGPaintServerFrame.cpp
rename from layout/svg/base/src/nsSVGPaintServerFrame.h
rename to layout/svg/nsSVGPaintServerFrame.h
rename from layout/svg/base/src/nsSVGPathGeometryFrame.cpp
rename to layout/svg/nsSVGPathGeometryFrame.cpp
rename from layout/svg/base/src/nsSVGPathGeometryFrame.h
rename to layout/svg/nsSVGPathGeometryFrame.h
rename from layout/svg/base/src/nsSVGPatternFrame.cpp
rename to layout/svg/nsSVGPatternFrame.cpp
rename from layout/svg/base/src/nsSVGPatternFrame.h
rename to layout/svg/nsSVGPatternFrame.h
rename from layout/svg/base/src/nsSVGStopFrame.cpp
rename to layout/svg/nsSVGStopFrame.cpp
rename from layout/svg/base/src/nsSVGSwitchFrame.cpp
rename to layout/svg/nsSVGSwitchFrame.cpp
rename from layout/svg/base/src/nsSVGTSpanFrame.cpp
rename to layout/svg/nsSVGTSpanFrame.cpp
rename from layout/svg/base/src/nsSVGTSpanFrame.h
rename to layout/svg/nsSVGTSpanFrame.h
rename from layout/svg/base/src/nsSVGTextContainerFrame.cpp
rename to layout/svg/nsSVGTextContainerFrame.cpp
rename from layout/svg/base/src/nsSVGTextContainerFrame.h
rename to layout/svg/nsSVGTextContainerFrame.h
rename from layout/svg/base/src/nsSVGTextFrame.cpp
rename to layout/svg/nsSVGTextFrame.cpp
rename from layout/svg/base/src/nsSVGTextFrame.h
rename to layout/svg/nsSVGTextFrame.h
rename from layout/svg/base/src/nsSVGTextPathFrame.cpp
rename to layout/svg/nsSVGTextPathFrame.cpp
rename from layout/svg/base/src/nsSVGTextPathFrame.h
rename to layout/svg/nsSVGTextPathFrame.h
rename from layout/svg/base/src/nsSVGUseFrame.cpp
rename to layout/svg/nsSVGUseFrame.cpp
rename from layout/svg/base/src/nsSVGUtils.cpp
rename to layout/svg/nsSVGUtils.cpp
rename from layout/svg/base/src/nsSVGUtils.h
rename to layout/svg/nsSVGUtils.h
rename from layout/svg/base/src/resources/content/svgBindings.xml
rename to layout/svg/resources/content/svgBindings.xml
rename from layout/svg/base/src/svg.css
rename to layout/svg/svg.css
--- a/toolkit/content/jar.mn
+++ b/toolkit/content/jar.mn
@@ -81,9 +81,9 @@ toolkit.jar:
    content/global/bindings/toolbarbutton.xml   (widgets/toolbarbutton.xml)
 *+ content/global/bindings/tree.xml            (widgets/tree.xml)
 *+ content/global/bindings/videocontrols.xml   (widgets/videocontrols.xml)
    content/global/bindings/videocontrols.css   (widgets/videocontrols.css)
 *+ content/global/bindings/wizard.xml          (widgets/wizard.xml)
 #ifdef XP_MACOSX
    content/global/macWindowMenu.js             (macWindowMenu.js)
 #endif
-   content/global/svg/svgBindings.xml          (/layout/svg/base/src/resources/content/svgBindings.xml)
+   content/global/svg/svgBindings.xml          (/layout/svg/resources/content/svgBindings.xml)
--- a/toolkit/toolkit-makefiles.sh
+++ b/toolkit/toolkit-makefiles.sh
@@ -250,17 +250,17 @@ MAKEFILES_layout="
   layout/generic/Makefile
   layout/ipc/Makefile
   layout/inspector/public/Makefile
   layout/inspector/src/Makefile
   layout/media/Makefile
   layout/style/Makefile
   layout/style/xbl-marquee/Makefile
   layout/tables/Makefile
-  layout/svg/base/src/Makefile
+  layout/svg/Makefile
   layout/xul/base/public/Makefile
   layout/xul/base/src/Makefile
 "
 
 MAKEFILES_libjar="
   modules/libjar/Makefile
 "