turning on grid

-r bryner -sr hyatt


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

mozilla/layout/base/nsCSSFrameConstructor.cpp

@@ -36,7 +36,7 @@
  *
  * ***** END LICENSE BLOCK ***** */
 
-//#define MOZ_GRID2 1
+#define MOZ_GRID2 1
 
 #include "nsCSSFrameConstructor.h"
 #include "nsIArena.h"

mozilla/layout/build/Makefile.in

@@ -63,8 +63,14 @@ SHARED_LIBRARY_LIBS = \
 		$(DIST)/lib/libgkbase_s.$(LIB_SUFFIX) \
 		$(DIST)/lib/libgkconshared_s.$(LIB_SUFFIX) \
 		$(DIST)/lib/libgkxuloutliner_s.$(LIB_SUFFIX) \
+		$(DIST)/lib/libgkxulgrid_s.$(LIB_SUFFIX) \
 		$(NULL)
 
+ifdef MOZ_GRID2
+SHARED_LIBRARY_LIBS += $(DIST)/lib/libgkxulgrid_s.$(LIB_SUFFIX) \
+        $(NULL)
+endif
+
 ifdef MOZ_PERF_METRICS
 SHARED_LIBRARY_LIBS += \
 		$(DIST)/lib/libmozutil_s.$(LIB_SUFFIX) \

mozilla/layout/build/makefile.win

@@ -74,9 +74,7 @@ SUB_LIBRARIES=                          \
  $(DIST)\lib\layoutxulbase_s.lib        \
  $(DIST)\lib\contentshared_s.lib	\
  $(DIST)\lib\raptorxuloutliner_s.lib	\
-!ifdef MOZ_GRID2
  $(DIST)\lib\raptorxulgrid_s.lib	\
-!endif
 !ifdef MOZ_MATHML
  $(DIST)\lib\layoutmathmlbase_s.lib     \
  $(DIST)\lib\layoutmathmlcontent_s.lib	\

mozilla/layout/html/style/src/nsCSSFrameConstructor.cpp

@@ -36,7 +36,7 @@
  *
  * ***** END LICENSE BLOCK ***** */
 
-//#define MOZ_GRID2 1
+#define MOZ_GRID2 1
 
 #include "nsCSSFrameConstructor.h"
 #include "nsIArena.h"

mozilla/layout/xul/base/src/Makefile.in

@@ -24,7 +24,8 @@ topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
-DIRS		= outliner
+DIRS		= outliner \
+                  grid
 
 include $(DEPTH)/config/autoconf.mk
 
@@ -67,10 +68,6 @@ CPPSRCS		= \
        nsTreeBoxObject.cpp \
        nsPopupBoxObject.cpp \
        nsBoxObject.cpp \
-       nsGridLayout.cpp \
-       nsObeliskLayout.cpp \
-       nsTempleLayout.cpp \
-       nsMonumentLayout.cpp \
        nsImageBoxFrame.cpp \
        nsRootBoxFrame.cpp \
        nsDocElementBoxFrame.cpp \