From 59adfb766caea2d2fdafabff1d966ebb438dc55e Mon Sep 17 00:00:00 2001
From: "rods%netscape.com" <rods%netscape.com>
Date: Sat, 1 Apr 2000 22:31:45 +0000
Subject: [PATCH] Initial checkin of SVG prototype code for Dean Jackson
 (ifdef'ed)

---
 layout/Makefile.in                 |  4 ++++
 layout/build/Makefile.in           |  7 +++++++
 layout/build/makefile.win          |  7 +++++++
 layout/build/nsLayoutModule.cpp    | 14 ++++++++++++++
 layout/html/style/src/Makefile.in  |  6 ++++++
 layout/html/style/src/makefile.win |  4 ++++
 layout/makefile.win                |  3 +++
 7 files changed, 45 insertions(+)

diff --git a/layout/Makefile.in b/layout/Makefile.in
index ea2ffd3a2d6f..d99ebede4213 100644
--- a/layout/Makefile.in
+++ b/layout/Makefile.in
@@ -32,6 +32,10 @@ ifdef MOZ_MATHML
 DIRS           += mathml
 endif
 
+ifdef MOZ_SVG
+DIRS           += svg
+endif
+
 DIRS           += events build
 
 ifdef ENABLE_TESTS
diff --git a/layout/build/Makefile.in b/layout/build/Makefile.in
index 1db8420ad249..97d1b7e6bb45 100644
--- a/layout/build/Makefile.in
+++ b/layout/build/Makefile.in
@@ -74,6 +74,13 @@ SHARED_LIBRARY_LIBS += \
                 $(NSNULL)
 endif
 
+ifdef MOZ_SVG
+SHARED_LIBRARY_LIBS += \
+                $(DIST)/lib/libraptorsvgcontent_s.a \
+                $(DIST)/lib/libraptorsvgbase_s.a \
+                $(NSNULL)
+endif
+
 EXTRA_DSO_LDOPTS = \
 		$(MKSHLIB_FORCE_ALL) \
 		$(SHARED_LIBRARY_LIBS) \
diff --git a/layout/build/makefile.win b/layout/build/makefile.win
index dd99f9a4e379..c80fe3c22826 100644
--- a/layout/build/makefile.win
+++ b/layout/build/makefile.win
@@ -54,6 +54,9 @@ LINCS=-I$(PUBLIC)\xpcom -I$(PUBLIC)\raptor -I$(PUBLIC)\dom \
 	-I..\xul\content\src \
 !ifdef MOZ_MATHML
 	-I..\mathml\content\src \
+!endif
+!ifdef MOZ_SVG
+	-I..\svg\content\src \
 !endif
         -I$(PUBLIC)\rdf
 
@@ -77,6 +80,10 @@ LLIBS=					\
 !ifdef MOZ_MATHML
  $(DIST)\lib\raptormathmlbase_s.lib \
  $(DIST)\lib\raptormathmlcontent_s.lib	\
+!endif
+!ifdef MOZ_SVG
+ $(DIST)\lib\raptorsvgbase_s.lib \
+ $(DIST)\lib\raptorsvgcontent_s.lib	\
 !endif
  $(DIST)\lib\raptorevents_s.lib		\
  $(DIST)\lib\xpcom.lib		\
diff --git a/layout/build/nsLayoutModule.cpp b/layout/build/nsLayoutModule.cpp
index a720350b3847..9c2f3453a125 100644
--- a/layout/build/nsLayoutModule.cpp
+++ b/layout/build/nsLayoutModule.cpp
@@ -54,6 +54,11 @@
 
 #include "nsIDocumentEncoder.h"
 
+// SVG
+#ifdef MOZ_SVG
+#include "nsSVGAtoms.h"
+#endif
+
 // XXX
 #include "nsIServiceManager.h"
 
@@ -202,6 +207,11 @@ nsLayoutModule::Initialize()
   nsMathMLAtoms::AddRefAtoms();
 #endif
 
+// SVG
+#ifdef MOZ_SVG
+  nsSVGAtoms::AddRefAtoms();
+#endif
+
   // XXX Initialize the script name set thingy-ma-jigger
   if (!gRegistry) {
     rv = nsServiceManager::GetService(kCScriptNameSetRegistryCID,
@@ -244,6 +254,10 @@ nsLayoutModule::Shutdown()
   nsMathMLOperators::ReleaseTable();
   nsMathMLAtoms::ReleaseAtoms();
 #endif
+// SVG
+#ifdef MOZ_SVG
+  nsSVGAtoms::ReleaseAtoms();
+#endif
 
   nsTextTransformer::Shutdown();
 
diff --git a/layout/html/style/src/Makefile.in b/layout/html/style/src/Makefile.in
index 83b051f05d97..3c3cef540fd6 100644
--- a/layout/html/style/src/Makefile.in
+++ b/layout/html/style/src/Makefile.in
@@ -101,3 +101,9 @@ INCLUDES += \
         -I$(srcdir)/../../../mathml/content/src \
         -I$(srcdir)/../../../mathml/base/src
 endif
+
+ifdef MOZ_SVG
+INCLUDES += \
+        -I$(srcdir)/../../../svg/content/src \
+        -I$(srcdir)/../../../svg/base/src
+endif
diff --git a/layout/html/style/src/makefile.win b/layout/html/style/src/makefile.win
index 2b1aedb00891..ceefd9bbc190 100644
--- a/layout/html/style/src/makefile.win
+++ b/layout/html/style/src/makefile.win
@@ -101,6 +101,10 @@ LINCS=-I$(PUBLIC)\xpcom -I$(PUBLIC)\raptor -I$(PUBLIC)\netlib \
 !ifdef MOZ_MATHML
   -I..\..\..\mathml\content\src \
   -I..\..\..\mathml\base\src \
+!endif
+!ifdef MOZ_SVG
+  -I..\..\..\svg\content\src \
+  -I..\..\..\svg\base\src \
 !endif
   -I..\..\forms\src \
   -I..\..\base\src -I..\..\table\src -I..\..\content\src -I$(PUBLIC)\js -I$(PUBLIC)\dom
diff --git a/layout/makefile.win b/layout/makefile.win
index 81d4a6057c52..7c291439ad6f 100644
--- a/layout/makefile.win
+++ b/layout/makefile.win
@@ -32,6 +32,9 @@ DIRS=                \
 !endif
 !ifdef MOZ_MATHML
         mathml       \
+!endif
+!ifdef MOZ_SVG
+        svg          \
 !endif
         events       \
         build        \