bug153718 remove nsTableBorderCollapse.cpp from build r=karnaze sr=waterson

layout/html/table/src/Makefile.in

@@ -52,7 +52,6 @@ CPPSRCS		= \
 		nsTableOuterFrame.cpp \
 		nsTableRowFrame.cpp \
 		nsTableRowGroupFrame.cpp \
-		nsTableBorderCollapser.cpp \
 		$(NULL)
 
 # we don't want the shared lib, but we want to force the creation of a static lib.
@@ -60,7 +59,7 @@ FORCE_STATIC_LIB = 1
 
 include $(topsrcdir)/config/rules.mk
 
-DEFINES         += -D_IMPL_NS_HTML -DDEBUG_TABLE_REFLOW_TIMING_off
+DEFINES         += -D_IMPL_NS_HTML -DDEBUG_TABLE_REFLOW_TIMING_off -DDEBUG_TABLE_STRATEGY_off
 
 ifeq ($(OS_ARCH),WINNT)
 DEFINES		+= -DWIN32_LEAN_AND_MEAN

layout/html/table/src/makefile.win

@@ -52,7 +52,6 @@ CPP_OBJS= .\$(OBJDIR)\nsCellMap.obj \
     .\$(OBJDIR)\nsTableRowGroupFrame.obj \
     .\$(OBJDIR)\BasicTableLayoutStrategy.obj \
     .\$(OBJDIR)\FixedTableLayoutStrategy.obj \
-    .\$(OBJDIR)\nsTableBorderCollapser.obj \
     $(NULL)
 
 LINCS=-I..\..\base\src -I..\..\style\src -I..\..\content\src \

layout/macbuild/layout.xml

@@ -1620,13 +1620,6 @@
                     <FILEKIND>Library</FILEKIND>
                     <FILEFLAGS>Debug</FILEFLAGS>
                 </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>nsTableBorderCollapser.cpp</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Text</FILEKIND>
-                    <FILEFLAGS>Debug</FILEFLAGS>
-                </FILE>
                 <FILE>
                     <PATHTYPE>Name</PATHTYPE>
                     <PATH>nsPresState.cpp</PATH>
@@ -2612,11 +2605,6 @@
                     <PATH>libutil.shlb</PATH>
                     <PATHFORMAT>MacOS</PATHFORMAT>
                 </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>nsTableBorderCollapser.cpp</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
                 <FILEREF>
                     <PATHTYPE>Name</PATHTYPE>
                     <PATH>nsPresState.cpp</PATH>
@@ -4531,13 +4519,6 @@
                     <FILEKIND>Library</FILEKIND>
                     <FILEFLAGS>Debug</FILEFLAGS>
                 </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>nsTableBorderCollapser.cpp</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Text</FILEKIND>
-                    <FILEFLAGS>Debug</FILEFLAGS>
-                </FILE>
                 <FILE>
                     <PATHTYPE>Name</PATHTYPE>
                     <PATH>nsPresState.cpp</PATH>
@@ -5523,11 +5504,6 @@
                     <PATH>libutilDebug.shlb</PATH>
                     <PATHFORMAT>MacOS</PATHFORMAT>
                 </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>nsTableBorderCollapser.cpp</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
                 <FILEREF>
                     <PATHTYPE>Name</PATHTYPE>
                     <PATH>nsPresState.cpp</PATH>
@@ -6420,12 +6396,6 @@
                 <PATH>nsCellMap.cpp</PATH>
                 <PATHFORMAT>MacOS</PATHFORMAT>
             </FILEREF>
-            <FILEREF>
-                <TARGETNAME>layout.shlb</TARGETNAME>
-                <PATHTYPE>Name</PATHTYPE>
-                <PATH>nsTableBorderCollapser.cpp</PATH>
-                <PATHFORMAT>MacOS</PATHFORMAT>
-            </FILEREF>
             <FILEREF>
                 <TARGETNAME>layout.shlb</TARGETNAME>
                 <PATHTYPE>Name</PATHTYPE>