Adding remaining MathML hooks

git-svn-id: svn://10.0.0.236/trunk@49663 18797224-902f-48f8-a5cc-f745e15eee43

mozilla/layout/build/Makefile.in

@@ -76,5 +76,9 @@ DEFINES		+= -D_IMPL_NS_HTML
 INCLUDES	+= -I$(srcdir)/../html/base/src \
 		   -I$(srcdir)/../xul/content/src
 
+ifdef MOZ_MATHML
+INCLUDES += -I$(srcdir)/../mathml/content/src
+endif
+
 $(LIBRARY) $(SHARED_LIBRARY): $(SHARED_LIBRARY_LIBS) Makefile
 

mozilla/layout/build/makefile.win

@@ -48,6 +48,9 @@ LCFLAGS = \
 LINCS=-I$(PUBLIC)\xpcom -I$(PUBLIC)\raptor -I$(PUBLIC)\dom \
 	-I$(PUBLIC)\js -I..\..\style\src -I..\html\base\src -I..\base\src \
 	-I..\xul\content\src \
+!ifdef MOZ_MATHML
+	-I..\mathml\content\src \
+!endif
 !ifdef NECKO
 	-I$(PUBLIC)\necko \
 !else
@@ -71,6 +74,10 @@ LLIBS=					\
 !endif
  $(DIST)\lib\raptorxulbase_s.lib \
  $(DIST)\lib\raptorxulcontent_s.lib	\
+!ifdef MOZ_MATHML
+ $(DIST)\lib\raptormathmlbase_s.lib \
+ $(DIST)\lib\raptormathmlcontent_s.lib	\
+!endif
  $(DIST)\lib\raptorevents_s.lib		\
  $(DIST)\lib\xpcom.lib		\
  $(DIST)\lib\raptorgfxwin.lib		\

mozilla/layout/build/nsLayoutModule.cpp

@@ -31,6 +31,11 @@
 #ifdef INCLUDE_XUL
 #include "nsXULAtoms.h"
 #endif
+//MathML Mod - RBS
+#ifdef MOZ_MATHML
+#include "nsMathMLAtoms.h"
+#include "nsMathMLOperators.h"
+#endif
 #include "nsLayoutAtoms.h"
 #include "nsDOMCID.h"
 #include "nsIScriptContext.h"
@@ -189,6 +194,11 @@ nsLayoutModule::Initialize()
 #ifdef INCLUDE_XUL
   nsXULAtoms::AddRefAtoms();
 #endif
+//MathML Mod - RBS
+#ifdef MOZ_MATHML
+  nsMathMLOperators::AddRefTable();
+  nsMathMLAtoms::AddRefAtoms();
+#endif
 
   // Load the UA style sheet
   nsCOMPtr<nsIURI> uaURL;
@@ -237,6 +247,11 @@ nsLayoutModule::Shutdown()
 #ifdef INCLUDE_XUL
   nsXULAtoms::ReleaseAtoms();
 #endif
+//MathML Mod - RBS
+#ifdef MOZ_MATHML
+  nsMathMLOperators::ReleaseTable();
+  nsMathMLAtoms::ReleaseAtoms();
+#endif
 
   NS_IF_RELEASE(gRegistry);
   NS_IF_RELEASE(gUAStyleSheet);