Bug 833879 - Move layout/xul/base/src/tree/ to layout/xul/tree, layout/xul/base/src/grid to layout/xul/grid. r=roc
authorAlex Vincent <ajvincent@gmail.com>
Mon, 04 Feb 2013 07:11:49 -0500
changeset 130616 bb45ceb51e820df6f631bb7bd7628d78eef2fad9
parent 130615 a14a65fe91d56c1b1974aadb75c7d377a9d4e3e7
child 130617 fbeec0d0afd761280d6340b2dce9d9dd49595799
push id1
push usersledru@mozilla.com
push dateThu, 04 Dec 2014 17:57:20 +0000
reviewersroc
bugs833879
milestone21.0a1
Bug 833879 - Move layout/xul/base/src/tree/ to layout/xul/tree, layout/xul/base/src/grid to layout/xul/grid. r=roc
content/events/src/Makefile.in
content/xul/templates/src/Makefile.in
dom/dom-config.mk
layout/Makefile.in
layout/base/Makefile.in
layout/build/Makefile.in
layout/reftests/reftest.list
layout/xul/base/src/Makefile.in
layout/xul/base/src/grid/Makefile.in
layout/xul/base/src/grid/crashtests/306911-crash.xul
layout/xul/base/src/grid/crashtests/306911-grid-testcases.xul
layout/xul/base/src/grid/crashtests/306911-grid-testcases2.xul
layout/xul/base/src/grid/crashtests/311710-1.xul
layout/xul/base/src/grid/crashtests/312784-1.xul
layout/xul/base/src/grid/crashtests/313173-1-inner.xul
layout/xul/base/src/grid/crashtests/313173-1.html
layout/xul/base/src/grid/crashtests/321066-1.xul
layout/xul/base/src/grid/crashtests/321073-1.xul
layout/xul/base/src/grid/crashtests/382750-1.xul
layout/xul/base/src/grid/crashtests/400790-1.xul
layout/xul/base/src/grid/crashtests/423802-crash.xul
layout/xul/base/src/grid/crashtests/crashtests.list
layout/xul/base/src/grid/examples/borderedcolumns.xul
layout/xul/base/src/grid/examples/borderedrowscolumns.xul
layout/xul/base/src/grid/examples/borderedrowscolumns2.xul
layout/xul/base/src/grid/examples/borderedrowscolumns3.xul
layout/xul/base/src/grid/examples/bordermargincolumns1.xul
layout/xul/base/src/grid/examples/collapsetest.xul
layout/xul/base/src/grid/examples/divcolumngrid.xul
layout/xul/base/src/grid/examples/divrowgrid.xul
layout/xul/base/src/grid/examples/dynamicgrid.xul
layout/xul/base/src/grid/examples/flexgroupgrid.xul
layout/xul/base/src/grid/examples/javascriptappend.xul
layout/xul/base/src/grid/examples/jumpygrid.xul
layout/xul/base/src/grid/examples/nestedrows.xul
layout/xul/base/src/grid/examples/rowspan.xul
layout/xul/base/src/grid/examples/scrollingcolumns.xul
layout/xul/base/src/grid/examples/scrollingrows.xul
layout/xul/base/src/grid/examples/splitter.xul
layout/xul/base/src/grid/nsGrid.cpp
layout/xul/base/src/grid/nsGrid.h
layout/xul/base/src/grid/nsGridCell.cpp
layout/xul/base/src/grid/nsGridCell.h
layout/xul/base/src/grid/nsGridLayout2.cpp
layout/xul/base/src/grid/nsGridLayout2.h
layout/xul/base/src/grid/nsGridRow.cpp
layout/xul/base/src/grid/nsGridRow.h
layout/xul/base/src/grid/nsGridRowGroupFrame.cpp
layout/xul/base/src/grid/nsGridRowGroupFrame.h
layout/xul/base/src/grid/nsGridRowGroupLayout.cpp
layout/xul/base/src/grid/nsGridRowGroupLayout.h
layout/xul/base/src/grid/nsGridRowLayout.cpp
layout/xul/base/src/grid/nsGridRowLayout.h
layout/xul/base/src/grid/nsGridRowLeafFrame.cpp
layout/xul/base/src/grid/nsGridRowLeafFrame.h
layout/xul/base/src/grid/nsGridRowLeafLayout.cpp
layout/xul/base/src/grid/nsGridRowLeafLayout.h
layout/xul/base/src/grid/nsIGridPart.h
layout/xul/base/src/grid/reftests/column-sizing-1-ref.xul
layout/xul/base/src/grid/reftests/column-sizing-1.xul
layout/xul/base/src/grid/reftests/not-full-basic-ref.xhtml
layout/xul/base/src/grid/reftests/not-full-basic.xul
layout/xul/base/src/grid/reftests/not-full-grid-pack-align.xul
layout/xul/base/src/grid/reftests/not-full-row-group-align-ref.xhtml
layout/xul/base/src/grid/reftests/not-full-row-group-align.xul
layout/xul/base/src/grid/reftests/not-full-row-group-direction-ref.xhtml
layout/xul/base/src/grid/reftests/not-full-row-group-direction.xul
layout/xul/base/src/grid/reftests/not-full-row-group-pack-ref.xhtml
layout/xul/base/src/grid/reftests/not-full-row-group-pack.xul
layout/xul/base/src/grid/reftests/not-full-row-leaf-align.xul
layout/xul/base/src/grid/reftests/not-full-row-leaf-direction.xul
layout/xul/base/src/grid/reftests/not-full-row-leaf-pack-ref.xhtml
layout/xul/base/src/grid/reftests/not-full-row-leaf-pack.xul
layout/xul/base/src/grid/reftests/reftest.list
layout/xul/base/src/grid/reftests/row-or-column-sizing-1.xul
layout/xul/base/src/grid/reftests/row-or-column-sizing-2.xul
layout/xul/base/src/grid/reftests/row-or-column-sizing-3.xul
layout/xul/base/src/grid/reftests/row-or-column-sizing-4.xul
layout/xul/base/src/grid/reftests/row-sizing-1-ref.xul
layout/xul/base/src/grid/reftests/row-sizing-1.xul
layout/xul/base/src/grid/reftests/scrollable-columns-ref.xhtml
layout/xul/base/src/grid/reftests/scrollable-columns.xul
layout/xul/base/src/grid/reftests/scrollable-rows-ref.xhtml
layout/xul/base/src/grid/reftests/scrollable-rows.xul
layout/xul/base/src/grid/reftests/sizing-2d-ref.xul
layout/xul/base/src/grid/reftests/sizing-2d.xul
layout/xul/base/src/grid/reftests/z-order-1-ref.xul
layout/xul/base/src/grid/reftests/z-order-1.xul
layout/xul/base/src/grid/reftests/z-order-2-ref.xul
layout/xul/base/src/grid/reftests/z-order-2.xul
layout/xul/base/src/tree/public/Makefile.in
layout/xul/base/src/tree/public/nsITreeBoxObject.idl
layout/xul/base/src/tree/public/nsITreeColumns.idl
layout/xul/base/src/tree/public/nsITreeContentView.idl
layout/xul/base/src/tree/public/nsITreeSelection.idl
layout/xul/base/src/tree/public/nsITreeView.idl
layout/xul/base/src/tree/src/Makefile.in
layout/xul/base/src/tree/src/crashtests/307298-1.xul
layout/xul/base/src/tree/src/crashtests/309732-1.xul
layout/xul/base/src/tree/src/crashtests/309732-2.xul
layout/xul/base/src/tree/src/crashtests/366583-1.xul
layout/xul/base/src/tree/src/crashtests/380217-1.xul
layout/xul/base/src/tree/src/crashtests/382444-1-inner.html
layout/xul/base/src/tree/src/crashtests/382444-1.html
layout/xul/base/src/tree/src/crashtests/391178-1.xhtml
layout/xul/base/src/tree/src/crashtests/391178-2.xul
layout/xul/base/src/tree/src/crashtests/393665-1.xul
layout/xul/base/src/tree/src/crashtests/399227-1.xul
layout/xul/base/src/tree/src/crashtests/399227-2.xul
layout/xul/base/src/tree/src/crashtests/399692-1.xhtml
layout/xul/base/src/tree/src/crashtests/399715-1.xhtml
layout/xul/base/src/tree/src/crashtests/409807-1.xul
layout/xul/base/src/tree/src/crashtests/414170-1.xul
layout/xul/base/src/tree/src/crashtests/430394-1.xul
layout/xul/base/src/tree/src/crashtests/454186-1.xul
layout/xul/base/src/tree/src/crashtests/479931-1.xhtml
layout/xul/base/src/tree/src/crashtests/509602-1-overlay.xul
layout/xul/base/src/tree/src/crashtests/509602-1.xul
layout/xul/base/src/tree/src/crashtests/601427.html
layout/xul/base/src/tree/src/crashtests/crashtests.list
layout/xul/base/src/tree/src/nsTreeBodyFrame.cpp
layout/xul/base/src/tree/src/nsTreeBodyFrame.h
layout/xul/base/src/tree/src/nsTreeBoxObject.cpp
layout/xul/base/src/tree/src/nsTreeBoxObject.h
layout/xul/base/src/tree/src/nsTreeColFrame.cpp
layout/xul/base/src/tree/src/nsTreeColFrame.h
layout/xul/base/src/tree/src/nsTreeColumns.cpp
layout/xul/base/src/tree/src/nsTreeColumns.h
layout/xul/base/src/tree/src/nsTreeContentView.cpp
layout/xul/base/src/tree/src/nsTreeContentView.h
layout/xul/base/src/tree/src/nsTreeImageListener.cpp
layout/xul/base/src/tree/src/nsTreeImageListener.h
layout/xul/base/src/tree/src/nsTreeSelection.cpp
layout/xul/base/src/tree/src/nsTreeSelection.h
layout/xul/base/src/tree/src/nsTreeStyleCache.cpp
layout/xul/base/src/tree/src/nsTreeStyleCache.h
layout/xul/base/src/tree/src/nsTreeUtils.cpp
layout/xul/base/src/tree/src/nsTreeUtils.h
layout/xul/grid/Makefile.in
layout/xul/grid/crashtests/306911-crash.xul
layout/xul/grid/crashtests/306911-grid-testcases.xul
layout/xul/grid/crashtests/306911-grid-testcases2.xul
layout/xul/grid/crashtests/311710-1.xul
layout/xul/grid/crashtests/312784-1.xul
layout/xul/grid/crashtests/313173-1-inner.xul
layout/xul/grid/crashtests/313173-1.html
layout/xul/grid/crashtests/321066-1.xul
layout/xul/grid/crashtests/321073-1.xul
layout/xul/grid/crashtests/382750-1.xul
layout/xul/grid/crashtests/400790-1.xul
layout/xul/grid/crashtests/423802-crash.xul
layout/xul/grid/crashtests/crashtests.list
layout/xul/grid/examples/borderedcolumns.xul
layout/xul/grid/examples/borderedrowscolumns.xul
layout/xul/grid/examples/borderedrowscolumns2.xul
layout/xul/grid/examples/borderedrowscolumns3.xul
layout/xul/grid/examples/bordermargincolumns1.xul
layout/xul/grid/examples/collapsetest.xul
layout/xul/grid/examples/divcolumngrid.xul
layout/xul/grid/examples/divrowgrid.xul
layout/xul/grid/examples/dynamicgrid.xul
layout/xul/grid/examples/flexgroupgrid.xul
layout/xul/grid/examples/javascriptappend.xul
layout/xul/grid/examples/jumpygrid.xul
layout/xul/grid/examples/nestedrows.xul
layout/xul/grid/examples/rowspan.xul
layout/xul/grid/examples/scrollingcolumns.xul
layout/xul/grid/examples/scrollingrows.xul
layout/xul/grid/examples/splitter.xul
layout/xul/grid/nsGrid.cpp
layout/xul/grid/nsGrid.h
layout/xul/grid/nsGridCell.cpp
layout/xul/grid/nsGridCell.h
layout/xul/grid/nsGridLayout2.cpp
layout/xul/grid/nsGridLayout2.h
layout/xul/grid/nsGridRow.cpp
layout/xul/grid/nsGridRow.h
layout/xul/grid/nsGridRowGroupFrame.cpp
layout/xul/grid/nsGridRowGroupFrame.h
layout/xul/grid/nsGridRowGroupLayout.cpp
layout/xul/grid/nsGridRowGroupLayout.h
layout/xul/grid/nsGridRowLayout.cpp
layout/xul/grid/nsGridRowLayout.h
layout/xul/grid/nsGridRowLeafFrame.cpp
layout/xul/grid/nsGridRowLeafFrame.h
layout/xul/grid/nsGridRowLeafLayout.cpp
layout/xul/grid/nsGridRowLeafLayout.h
layout/xul/grid/nsIGridPart.h
layout/xul/grid/reftests/column-sizing-1-ref.xul
layout/xul/grid/reftests/column-sizing-1.xul
layout/xul/grid/reftests/not-full-basic-ref.xhtml
layout/xul/grid/reftests/not-full-basic.xul
layout/xul/grid/reftests/not-full-grid-pack-align.xul
layout/xul/grid/reftests/not-full-row-group-align-ref.xhtml
layout/xul/grid/reftests/not-full-row-group-align.xul
layout/xul/grid/reftests/not-full-row-group-direction-ref.xhtml
layout/xul/grid/reftests/not-full-row-group-direction.xul
layout/xul/grid/reftests/not-full-row-group-pack-ref.xhtml
layout/xul/grid/reftests/not-full-row-group-pack.xul
layout/xul/grid/reftests/not-full-row-leaf-align.xul
layout/xul/grid/reftests/not-full-row-leaf-direction.xul
layout/xul/grid/reftests/not-full-row-leaf-pack-ref.xhtml
layout/xul/grid/reftests/not-full-row-leaf-pack.xul
layout/xul/grid/reftests/reftest.list
layout/xul/grid/reftests/row-or-column-sizing-1.xul
layout/xul/grid/reftests/row-or-column-sizing-2.xul
layout/xul/grid/reftests/row-or-column-sizing-3.xul
layout/xul/grid/reftests/row-or-column-sizing-4.xul
layout/xul/grid/reftests/row-sizing-1-ref.xul
layout/xul/grid/reftests/row-sizing-1.xul
layout/xul/grid/reftests/scrollable-columns-ref.xhtml
layout/xul/grid/reftests/scrollable-columns.xul
layout/xul/grid/reftests/scrollable-rows-ref.xhtml
layout/xul/grid/reftests/scrollable-rows.xul
layout/xul/grid/reftests/sizing-2d-ref.xul
layout/xul/grid/reftests/sizing-2d.xul
layout/xul/grid/reftests/z-order-1-ref.xul
layout/xul/grid/reftests/z-order-1.xul
layout/xul/grid/reftests/z-order-2-ref.xul
layout/xul/grid/reftests/z-order-2.xul
layout/xul/tree/Makefile.in
layout/xul/tree/crashtests/307298-1.xul
layout/xul/tree/crashtests/309732-1.xul
layout/xul/tree/crashtests/309732-2.xul
layout/xul/tree/crashtests/366583-1.xul
layout/xul/tree/crashtests/380217-1.xul
layout/xul/tree/crashtests/382444-1-inner.html
layout/xul/tree/crashtests/382444-1.html
layout/xul/tree/crashtests/391178-1.xhtml
layout/xul/tree/crashtests/391178-2.xul
layout/xul/tree/crashtests/393665-1.xul
layout/xul/tree/crashtests/399227-1.xul
layout/xul/tree/crashtests/399227-2.xul
layout/xul/tree/crashtests/399692-1.xhtml
layout/xul/tree/crashtests/399715-1.xhtml
layout/xul/tree/crashtests/409807-1.xul
layout/xul/tree/crashtests/414170-1.xul
layout/xul/tree/crashtests/430394-1.xul
layout/xul/tree/crashtests/454186-1.xul
layout/xul/tree/crashtests/479931-1.xhtml
layout/xul/tree/crashtests/509602-1-overlay.xul
layout/xul/tree/crashtests/509602-1.xul
layout/xul/tree/crashtests/601427.html
layout/xul/tree/crashtests/crashtests.list
layout/xul/tree/nsITreeBoxObject.idl
layout/xul/tree/nsITreeColumns.idl
layout/xul/tree/nsITreeContentView.idl
layout/xul/tree/nsITreeSelection.idl
layout/xul/tree/nsITreeView.idl
layout/xul/tree/nsTreeBodyFrame.cpp
layout/xul/tree/nsTreeBodyFrame.h
layout/xul/tree/nsTreeBoxObject.cpp
layout/xul/tree/nsTreeBoxObject.h
layout/xul/tree/nsTreeColFrame.cpp
layout/xul/tree/nsTreeColFrame.h
layout/xul/tree/nsTreeColumns.cpp
layout/xul/tree/nsTreeColumns.h
layout/xul/tree/nsTreeContentView.cpp
layout/xul/tree/nsTreeContentView.h
layout/xul/tree/nsTreeImageListener.cpp
layout/xul/tree/nsTreeImageListener.h
layout/xul/tree/nsTreeSelection.cpp
layout/xul/tree/nsTreeSelection.h
layout/xul/tree/nsTreeStyleCache.cpp
layout/xul/tree/nsTreeStyleCache.h
layout/xul/tree/nsTreeUtils.cpp
layout/xul/tree/nsTreeUtils.h
testing/crashtest/crashtests.list
toolkit/toolkit-makefiles.sh
--- a/content/events/src/Makefile.in
+++ b/content/events/src/Makefile.in
@@ -76,17 +76,17 @@ LOCAL_INCLUDES	+= \
              -I$(srcdir)/../../html/content/src \
              -I$(srcdir)/../../xul/content/src \
              -I$(srcdir)/../../xml/content/src \
              -I$(srcdir)/../../../dom/base \
              -I$(srcdir)/../../../dom/settings \
              -I$(srcdir)/../../../dom/src/storage \
              -I$(srcdir)/../../../layout/generic \
              -I$(srcdir)/../../../layout/xul/base/src \
-             -I$(srcdir)/../../../layout/xul/base/src/tree/src \
+             -I$(srcdir)/../../../layout/xul/tree/ \
              $(NULL)
 
 ifdef MOZ_B2G_RIL
 LOCAL_INCLUDES += \
               -I$(srcdir)/../../../dom/wifi \
               $(NULL)
 endif
 
--- a/content/xul/templates/src/Makefile.in
+++ b/content/xul/templates/src/Makefile.in
@@ -46,12 +46,12 @@ CPPSRCS		= \
 
 # we don't want the shared lib, but we want to force the creation of a static lib.
 FORCE_STATIC_LIB = 1
 
 include $(topsrcdir)/config/rules.mk
 
 LOCAL_INCLUDES	= -I$(srcdir)/../../../base/src \
 		  -I$(srcdir)/../../content/src \
-		  -I$(srcdir)/../../../../layout/xul/base/src/tree/src \
+		  -I$(srcdir)/../../../../layout/xul/tree/ \
 		  $(NULL)
 
 DEFINES += -D_IMPL_NS_LAYOUT
--- a/dom/dom-config.mk
+++ b/dom/dom-config.mk
@@ -30,17 +30,17 @@ DOM_SRCDIRS = \
   content/base/src \
   content/html/content/src \
   content/html/document/src \
   content/media/webaudio \
   content/svg/content/src \
   layout/generic \
   layout/style \
   layout/xul/base/src \
-  layout/xul/base/src/tree/src \
+  layout/xul/tree \
   dom/camera \
   $(NULL)
 
 ifdef MOZ_B2G_RIL
 DOM_SRCDIRS += \
   dom/system/gonk \
   dom/telephony \
   dom/wifi \
--- a/layout/Makefile.in
+++ b/layout/Makefile.in
@@ -24,16 +24,20 @@ PARALLEL_DIRS = \
 		ipc \
 		mathml \
 		$(NULL)
 
 ifdef NS_PRINTING
 PARALLEL_DIRS += printing
 endif
 
+ifdef MOZ_XUL
+PARALLEL_DIRS += xul/tree xul/grid
+endif
+
 PARALLEL_DIRS += inspector/public inspector/src
 ifdef ENABLE_TESTS
 PARALLEL_DIRS += inspector/tests inspector/tests/chrome
 endif
 
 DIRS           += build
 DIRS           += media
 
--- a/layout/base/Makefile.in
+++ b/layout/base/Makefile.in
@@ -133,17 +133,17 @@ include $(topsrcdir)/ipc/chromium/chromi
 LOCAL_INCLUDES += \
 		-I$(srcdir) \
 		-I$(srcdir)/../style \
 		-I$(srcdir)/../generic \
 		-I$(srcdir)/../forms \
 		-I$(srcdir)/../tables \
 		-I$(srcdir)/../printing \
 		-I$(srcdir)/../xul/base/src \
-		-I$(srcdir)/../xul/base/src/tree/src \
+		-I$(srcdir)/../xul/tree/ \
 		-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 \
--- a/layout/build/Makefile.in
+++ b/layout/build/Makefile.in
@@ -231,18 +231,18 @@ endif
 ifdef NS_PRINTING
 SHARED_LIBRARY_LIBS += \
 		../printing/$(LIB_PREFIX)gkprinting_s.$(LIB_SUFFIX) \
 		$(NULL)
 endif
 
 ifdef MOZ_XUL
 SHARED_LIBRARY_LIBS += \
-		../xul/base/src/tree/src/$(LIB_PREFIX)gkxultree_s.$(LIB_SUFFIX) \
-		../xul/base/src/grid/$(LIB_PREFIX)gkxulgrid_s.$(LIB_SUFFIX) \
+		../xul/tree/$(LIB_PREFIX)gkxultree_s.$(LIB_SUFFIX) \
+		../xul/grid/$(LIB_PREFIX)gkxulgrid_s.$(LIB_SUFFIX) \
 		$(DEPTH)/content/xul/content/src/$(LIB_PREFIX)gkconxulcon_s.$(LIB_SUFFIX) \
 		$(DEPTH)/content/xul/templates/src/$(LIB_PREFIX)gkconxultmpl_s.$(LIB_SUFFIX) \
 		$(NULL)
 endif
 
 LOCAL_INCLUDES  += \
       -I$(srcdir)/../inspector/src \
       $(NULL)
--- a/layout/reftests/reftest.list
+++ b/layout/reftests/reftest.list
@@ -308,17 +308,17 @@ skip-if(B2G) include xul-document-load/r
 
 # xul/
 skip-if(B2G) include xul/reftest.list
 
 # xul
 skip-if(B2G) include ../xul/base/reftest/reftest.list
 
 # xul grid
-skip-if(B2G) include ../xul/base/src/grid/reftests/reftest.list
+skip-if(B2G) include ../xul/grid/reftests/reftest.list
 
 # z-index/
 skip-if(B2G) include z-index/reftest.list
 
 # reftest(s) to verify content bugfixes
 skip-if(B2G) include ../../content/html/document/reftests/reftests.list
 skip-if(B2G) include ../../content/html/content/reftests/reftest.list
 
--- a/layout/xul/base/src/Makefile.in
+++ b/layout/xul/base/src/Makefile.in
@@ -12,21 +12,16 @@ include $(DEPTH)/config/autoconf.mk
 
 MODULE		= layout
 LIBRARY_NAME	= gkxulbase_s
 LIBXUL_LIBRARY	= 1
 ifndef _MSC_VER
 FAIL_ON_WARNINGS = 1
 endif # !_MSC_VER
 
-
-ifdef MOZ_XUL
-PARALLEL_DIRS = tree/public tree/src grid
-endif
-
 CPPSRCS		= \
 		nsScrollBoxFrame.cpp \
 		nsRootBoxFrame.cpp \
 		nsBox.cpp \
 		nsBoxFrame.cpp \
 		nsBoxLayoutState.cpp \
 		nsSprocketLayout.cpp \
 		nsStackFrame.cpp \
deleted file mode 100644
--- a/layout/xul/base/src/tree/public/Makefile.in
+++ /dev/null
@@ -1,26 +0,0 @@
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
-MODULE		= layout
-XPIDL_MODULE	= layout_xul_tree
-
-XPIDLSRCS=	nsITreeColumns.idl \
-		nsITreeView.idl \
-                nsITreeSelection.idl \
-                nsITreeBoxObject.idl \
-                nsITreeContentView.idl \
-                $(NULL)
-
-EXPORTS		:= $(addprefix $(srcdir)/, $(EXPORTS))
-
-include $(topsrcdir)/config/rules.mk
-
rename from layout/xul/base/src/grid/Makefile.in
rename to layout/xul/grid/Makefile.in
--- a/layout/xul/base/src/grid/Makefile.in
+++ b/layout/xul/grid/Makefile.in
@@ -36,20 +36,20 @@ EXPORTS = \
           nsIGridPart.h \
           nsGrid.h \
           nsGridRow.h \
           nsGridCell.h \
           $(NULL)
 
 LOCAL_INCLUDES	= \
 		-I$(srcdir) \
-		-I$(srcdir)/../../../base/src \
-		-I$(srcdir)/../../../../generic \
-		-I$(srcdir)/../../../../style \
-		-I$(srcdir)/../../../../forms \
+		-I$(srcdir)/../base/src \
+		-I$(srcdir)/../../generic \
+		-I$(srcdir)/../../style \
+		-I$(srcdir)/../../forms \
 		$(NULL)
 
 # we don't want the shared lib, but we want to force the creation of a static lib.
 FORCE_STATIC_LIB = 1
 
 include $(topsrcdir)/config/rules.mk
 
 DEFINES += -D_IMPL_NS_LAYOUT
rename from layout/xul/base/src/grid/crashtests/306911-crash.xul
rename to layout/xul/grid/crashtests/306911-crash.xul
rename from layout/xul/base/src/grid/crashtests/306911-grid-testcases.xul
rename to layout/xul/grid/crashtests/306911-grid-testcases.xul
rename from layout/xul/base/src/grid/crashtests/306911-grid-testcases2.xul
rename to layout/xul/grid/crashtests/306911-grid-testcases2.xul
rename from layout/xul/base/src/grid/crashtests/311710-1.xul
rename to layout/xul/grid/crashtests/311710-1.xul
rename from layout/xul/base/src/grid/crashtests/312784-1.xul
rename to layout/xul/grid/crashtests/312784-1.xul
rename from layout/xul/base/src/grid/crashtests/313173-1-inner.xul
rename to layout/xul/grid/crashtests/313173-1-inner.xul
rename from layout/xul/base/src/grid/crashtests/313173-1.html
rename to layout/xul/grid/crashtests/313173-1.html
rename from layout/xul/base/src/grid/crashtests/321066-1.xul
rename to layout/xul/grid/crashtests/321066-1.xul
rename from layout/xul/base/src/grid/crashtests/321073-1.xul
rename to layout/xul/grid/crashtests/321073-1.xul
rename from layout/xul/base/src/grid/crashtests/382750-1.xul
rename to layout/xul/grid/crashtests/382750-1.xul
rename from layout/xul/base/src/grid/crashtests/400790-1.xul
rename to layout/xul/grid/crashtests/400790-1.xul
rename from layout/xul/base/src/grid/crashtests/423802-crash.xul
rename to layout/xul/grid/crashtests/423802-crash.xul
rename from layout/xul/base/src/grid/crashtests/crashtests.list
rename to layout/xul/grid/crashtests/crashtests.list
rename from layout/xul/base/src/grid/examples/borderedcolumns.xul
rename to layout/xul/grid/examples/borderedcolumns.xul
rename from layout/xul/base/src/grid/examples/borderedrowscolumns.xul
rename to layout/xul/grid/examples/borderedrowscolumns.xul
rename from layout/xul/base/src/grid/examples/borderedrowscolumns2.xul
rename to layout/xul/grid/examples/borderedrowscolumns2.xul
rename from layout/xul/base/src/grid/examples/borderedrowscolumns3.xul
rename to layout/xul/grid/examples/borderedrowscolumns3.xul
rename from layout/xul/base/src/grid/examples/bordermargincolumns1.xul
rename to layout/xul/grid/examples/bordermargincolumns1.xul
rename from layout/xul/base/src/grid/examples/collapsetest.xul
rename to layout/xul/grid/examples/collapsetest.xul
rename from layout/xul/base/src/grid/examples/divcolumngrid.xul
rename to layout/xul/grid/examples/divcolumngrid.xul
rename from layout/xul/base/src/grid/examples/divrowgrid.xul
rename to layout/xul/grid/examples/divrowgrid.xul
rename from layout/xul/base/src/grid/examples/dynamicgrid.xul
rename to layout/xul/grid/examples/dynamicgrid.xul
rename from layout/xul/base/src/grid/examples/flexgroupgrid.xul
rename to layout/xul/grid/examples/flexgroupgrid.xul
rename from layout/xul/base/src/grid/examples/javascriptappend.xul
rename to layout/xul/grid/examples/javascriptappend.xul
rename from layout/xul/base/src/grid/examples/jumpygrid.xul
rename to layout/xul/grid/examples/jumpygrid.xul
rename from layout/xul/base/src/grid/examples/nestedrows.xul
rename to layout/xul/grid/examples/nestedrows.xul
rename from layout/xul/base/src/grid/examples/rowspan.xul
rename to layout/xul/grid/examples/rowspan.xul
rename from layout/xul/base/src/grid/examples/scrollingcolumns.xul
rename to layout/xul/grid/examples/scrollingcolumns.xul
rename from layout/xul/base/src/grid/examples/scrollingrows.xul
rename to layout/xul/grid/examples/scrollingrows.xul
rename from layout/xul/base/src/grid/examples/splitter.xul
rename to layout/xul/grid/examples/splitter.xul
rename from layout/xul/base/src/grid/nsGrid.cpp
rename to layout/xul/grid/nsGrid.cpp
rename from layout/xul/base/src/grid/nsGrid.h
rename to layout/xul/grid/nsGrid.h
rename from layout/xul/base/src/grid/nsGridCell.cpp
rename to layout/xul/grid/nsGridCell.cpp
rename from layout/xul/base/src/grid/nsGridCell.h
rename to layout/xul/grid/nsGridCell.h
rename from layout/xul/base/src/grid/nsGridLayout2.cpp
rename to layout/xul/grid/nsGridLayout2.cpp
rename from layout/xul/base/src/grid/nsGridLayout2.h
rename to layout/xul/grid/nsGridLayout2.h
rename from layout/xul/base/src/grid/nsGridRow.cpp
rename to layout/xul/grid/nsGridRow.cpp
rename from layout/xul/base/src/grid/nsGridRow.h
rename to layout/xul/grid/nsGridRow.h
rename from layout/xul/base/src/grid/nsGridRowGroupFrame.cpp
rename to layout/xul/grid/nsGridRowGroupFrame.cpp
rename from layout/xul/base/src/grid/nsGridRowGroupFrame.h
rename to layout/xul/grid/nsGridRowGroupFrame.h
rename from layout/xul/base/src/grid/nsGridRowGroupLayout.cpp
rename to layout/xul/grid/nsGridRowGroupLayout.cpp
rename from layout/xul/base/src/grid/nsGridRowGroupLayout.h
rename to layout/xul/grid/nsGridRowGroupLayout.h
rename from layout/xul/base/src/grid/nsGridRowLayout.cpp
rename to layout/xul/grid/nsGridRowLayout.cpp
rename from layout/xul/base/src/grid/nsGridRowLayout.h
rename to layout/xul/grid/nsGridRowLayout.h
rename from layout/xul/base/src/grid/nsGridRowLeafFrame.cpp
rename to layout/xul/grid/nsGridRowLeafFrame.cpp
rename from layout/xul/base/src/grid/nsGridRowLeafFrame.h
rename to layout/xul/grid/nsGridRowLeafFrame.h
rename from layout/xul/base/src/grid/nsGridRowLeafLayout.cpp
rename to layout/xul/grid/nsGridRowLeafLayout.cpp
rename from layout/xul/base/src/grid/nsGridRowLeafLayout.h
rename to layout/xul/grid/nsGridRowLeafLayout.h
rename from layout/xul/base/src/grid/nsIGridPart.h
rename to layout/xul/grid/nsIGridPart.h
rename from layout/xul/base/src/grid/reftests/column-sizing-1-ref.xul
rename to layout/xul/grid/reftests/column-sizing-1-ref.xul
rename from layout/xul/base/src/grid/reftests/column-sizing-1.xul
rename to layout/xul/grid/reftests/column-sizing-1.xul
rename from layout/xul/base/src/grid/reftests/not-full-basic-ref.xhtml
rename to layout/xul/grid/reftests/not-full-basic-ref.xhtml
rename from layout/xul/base/src/grid/reftests/not-full-basic.xul
rename to layout/xul/grid/reftests/not-full-basic.xul
rename from layout/xul/base/src/grid/reftests/not-full-grid-pack-align.xul
rename to layout/xul/grid/reftests/not-full-grid-pack-align.xul
rename from layout/xul/base/src/grid/reftests/not-full-row-group-align-ref.xhtml
rename to layout/xul/grid/reftests/not-full-row-group-align-ref.xhtml
rename from layout/xul/base/src/grid/reftests/not-full-row-group-align.xul
rename to layout/xul/grid/reftests/not-full-row-group-align.xul
rename from layout/xul/base/src/grid/reftests/not-full-row-group-direction-ref.xhtml
rename to layout/xul/grid/reftests/not-full-row-group-direction-ref.xhtml
rename from layout/xul/base/src/grid/reftests/not-full-row-group-direction.xul
rename to layout/xul/grid/reftests/not-full-row-group-direction.xul
rename from layout/xul/base/src/grid/reftests/not-full-row-group-pack-ref.xhtml
rename to layout/xul/grid/reftests/not-full-row-group-pack-ref.xhtml
rename from layout/xul/base/src/grid/reftests/not-full-row-group-pack.xul
rename to layout/xul/grid/reftests/not-full-row-group-pack.xul
rename from layout/xul/base/src/grid/reftests/not-full-row-leaf-align.xul
rename to layout/xul/grid/reftests/not-full-row-leaf-align.xul
rename from layout/xul/base/src/grid/reftests/not-full-row-leaf-direction.xul
rename to layout/xul/grid/reftests/not-full-row-leaf-direction.xul
rename from layout/xul/base/src/grid/reftests/not-full-row-leaf-pack-ref.xhtml
rename to layout/xul/grid/reftests/not-full-row-leaf-pack-ref.xhtml
rename from layout/xul/base/src/grid/reftests/not-full-row-leaf-pack.xul
rename to layout/xul/grid/reftests/not-full-row-leaf-pack.xul
rename from layout/xul/base/src/grid/reftests/reftest.list
rename to layout/xul/grid/reftests/reftest.list
rename from layout/xul/base/src/grid/reftests/row-or-column-sizing-1.xul
rename to layout/xul/grid/reftests/row-or-column-sizing-1.xul
rename from layout/xul/base/src/grid/reftests/row-or-column-sizing-2.xul
rename to layout/xul/grid/reftests/row-or-column-sizing-2.xul
rename from layout/xul/base/src/grid/reftests/row-or-column-sizing-3.xul
rename to layout/xul/grid/reftests/row-or-column-sizing-3.xul
rename from layout/xul/base/src/grid/reftests/row-or-column-sizing-4.xul
rename to layout/xul/grid/reftests/row-or-column-sizing-4.xul
rename from layout/xul/base/src/grid/reftests/row-sizing-1-ref.xul
rename to layout/xul/grid/reftests/row-sizing-1-ref.xul
rename from layout/xul/base/src/grid/reftests/row-sizing-1.xul
rename to layout/xul/grid/reftests/row-sizing-1.xul
rename from layout/xul/base/src/grid/reftests/scrollable-columns-ref.xhtml
rename to layout/xul/grid/reftests/scrollable-columns-ref.xhtml
rename from layout/xul/base/src/grid/reftests/scrollable-columns.xul
rename to layout/xul/grid/reftests/scrollable-columns.xul
rename from layout/xul/base/src/grid/reftests/scrollable-rows-ref.xhtml
rename to layout/xul/grid/reftests/scrollable-rows-ref.xhtml
rename from layout/xul/base/src/grid/reftests/scrollable-rows.xul
rename to layout/xul/grid/reftests/scrollable-rows.xul
rename from layout/xul/base/src/grid/reftests/sizing-2d-ref.xul
rename to layout/xul/grid/reftests/sizing-2d-ref.xul
rename from layout/xul/base/src/grid/reftests/sizing-2d.xul
rename to layout/xul/grid/reftests/sizing-2d.xul
rename from layout/xul/base/src/grid/reftests/z-order-1-ref.xul
rename to layout/xul/grid/reftests/z-order-1-ref.xul
rename from layout/xul/base/src/grid/reftests/z-order-1.xul
rename to layout/xul/grid/reftests/z-order-1.xul
rename from layout/xul/base/src/grid/reftests/z-order-2-ref.xul
rename to layout/xul/grid/reftests/z-order-2-ref.xul
rename from layout/xul/base/src/grid/reftests/z-order-2.xul
rename to layout/xul/grid/reftests/z-order-2.xul
rename from layout/xul/base/src/tree/src/Makefile.in
rename to layout/xul/tree/Makefile.in
--- a/layout/xul/base/src/tree/src/Makefile.in
+++ b/layout/xul/tree/Makefile.in
@@ -6,20 +6,29 @@
 DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 MODULE		= layout
+XPIDL_MODULE	= layout_xul_tree
 LIBRARY_NAME	= gkxultree_s
 LIBXUL_LIBRARY  = 1
 FAIL_ON_WARNINGS = 1
 
+XPIDLSRCS	= \
+		nsITreeColumns.idl \
+		nsITreeView.idl \
+		nsITreeSelection.idl \
+		nsITreeBoxObject.idl \
+		nsITreeContentView.idl \
+		$(NULL)
+
 CPPSRCS		= \
 		nsTreeBodyFrame.cpp \
 		nsTreeBoxObject.cpp \
 		nsTreeColFrame.cpp \
 		nsTreeColumns.cpp \
 		nsTreeContentView.cpp \
 		nsTreeImageListener.cpp \
 		nsTreeSelection.cpp \
@@ -29,22 +38,22 @@ CPPSRCS		= \
 
 EXPORTS		= \
 		nsTreeColFrame.h \
 		nsTreeUtils.h \
 		$(NULL)
 
 LOCAL_INCLUDES	= \
 		-I$(srcdir) \
-		-I$(srcdir)/../../../../../../content/events/src \
-		-I$(srcdir)/../../../../base/src \
-		-I$(srcdir)/../../../../../base \
-		-I$(srcdir)/../../../../../generic \
-		-I$(srcdir)/../../../../../style \
-		-I$(srcdir)/../../../../../forms \
+		-I$(topsrcdir)/content/events/src \
+		-I$(srcdir)/../base/src \
+		-I$(srcdir)/../../base \
+		-I$(srcdir)/../../generic \
+		-I$(srcdir)/../../style \
+		-I$(srcdir)/../../forms \
 		$(NULL)
 
 # we don't want the shared lib, but we want to force the creation of a static lib.
 FORCE_STATIC_LIB = 1
 
 include $(topsrcdir)/config/rules.mk
 
 DEFINES += -D_IMPL_NS_LAYOUT
rename from layout/xul/base/src/tree/src/crashtests/307298-1.xul
rename to layout/xul/tree/crashtests/307298-1.xul
rename from layout/xul/base/src/tree/src/crashtests/309732-1.xul
rename to layout/xul/tree/crashtests/309732-1.xul
rename from layout/xul/base/src/tree/src/crashtests/309732-2.xul
rename to layout/xul/tree/crashtests/309732-2.xul
rename from layout/xul/base/src/tree/src/crashtests/366583-1.xul
rename to layout/xul/tree/crashtests/366583-1.xul
rename from layout/xul/base/src/tree/src/crashtests/380217-1.xul
rename to layout/xul/tree/crashtests/380217-1.xul
rename from layout/xul/base/src/tree/src/crashtests/382444-1-inner.html
rename to layout/xul/tree/crashtests/382444-1-inner.html
rename from layout/xul/base/src/tree/src/crashtests/382444-1.html
rename to layout/xul/tree/crashtests/382444-1.html
rename from layout/xul/base/src/tree/src/crashtests/391178-1.xhtml
rename to layout/xul/tree/crashtests/391178-1.xhtml
rename from layout/xul/base/src/tree/src/crashtests/391178-2.xul
rename to layout/xul/tree/crashtests/391178-2.xul
rename from layout/xul/base/src/tree/src/crashtests/393665-1.xul
rename to layout/xul/tree/crashtests/393665-1.xul
rename from layout/xul/base/src/tree/src/crashtests/399227-1.xul
rename to layout/xul/tree/crashtests/399227-1.xul
rename from layout/xul/base/src/tree/src/crashtests/399227-2.xul
rename to layout/xul/tree/crashtests/399227-2.xul
rename from layout/xul/base/src/tree/src/crashtests/399692-1.xhtml
rename to layout/xul/tree/crashtests/399692-1.xhtml
rename from layout/xul/base/src/tree/src/crashtests/399715-1.xhtml
rename to layout/xul/tree/crashtests/399715-1.xhtml
rename from layout/xul/base/src/tree/src/crashtests/409807-1.xul
rename to layout/xul/tree/crashtests/409807-1.xul
rename from layout/xul/base/src/tree/src/crashtests/414170-1.xul
rename to layout/xul/tree/crashtests/414170-1.xul
rename from layout/xul/base/src/tree/src/crashtests/430394-1.xul
rename to layout/xul/tree/crashtests/430394-1.xul
rename from layout/xul/base/src/tree/src/crashtests/454186-1.xul
rename to layout/xul/tree/crashtests/454186-1.xul
rename from layout/xul/base/src/tree/src/crashtests/479931-1.xhtml
rename to layout/xul/tree/crashtests/479931-1.xhtml
rename from layout/xul/base/src/tree/src/crashtests/509602-1-overlay.xul
rename to layout/xul/tree/crashtests/509602-1-overlay.xul
rename from layout/xul/base/src/tree/src/crashtests/509602-1.xul
rename to layout/xul/tree/crashtests/509602-1.xul
rename from layout/xul/base/src/tree/src/crashtests/601427.html
rename to layout/xul/tree/crashtests/601427.html
rename from layout/xul/base/src/tree/src/crashtests/crashtests.list
rename to layout/xul/tree/crashtests/crashtests.list
rename from layout/xul/base/src/tree/public/nsITreeBoxObject.idl
rename to layout/xul/tree/nsITreeBoxObject.idl
rename from layout/xul/base/src/tree/public/nsITreeColumns.idl
rename to layout/xul/tree/nsITreeColumns.idl
rename from layout/xul/base/src/tree/public/nsITreeContentView.idl
rename to layout/xul/tree/nsITreeContentView.idl
rename from layout/xul/base/src/tree/public/nsITreeSelection.idl
rename to layout/xul/tree/nsITreeSelection.idl
rename from layout/xul/base/src/tree/public/nsITreeView.idl
rename to layout/xul/tree/nsITreeView.idl
rename from layout/xul/base/src/tree/src/nsTreeBodyFrame.cpp
rename to layout/xul/tree/nsTreeBodyFrame.cpp
rename from layout/xul/base/src/tree/src/nsTreeBodyFrame.h
rename to layout/xul/tree/nsTreeBodyFrame.h
rename from layout/xul/base/src/tree/src/nsTreeBoxObject.cpp
rename to layout/xul/tree/nsTreeBoxObject.cpp
rename from layout/xul/base/src/tree/src/nsTreeBoxObject.h
rename to layout/xul/tree/nsTreeBoxObject.h
rename from layout/xul/base/src/tree/src/nsTreeColFrame.cpp
rename to layout/xul/tree/nsTreeColFrame.cpp
rename from layout/xul/base/src/tree/src/nsTreeColFrame.h
rename to layout/xul/tree/nsTreeColFrame.h
rename from layout/xul/base/src/tree/src/nsTreeColumns.cpp
rename to layout/xul/tree/nsTreeColumns.cpp
rename from layout/xul/base/src/tree/src/nsTreeColumns.h
rename to layout/xul/tree/nsTreeColumns.h
rename from layout/xul/base/src/tree/src/nsTreeContentView.cpp
rename to layout/xul/tree/nsTreeContentView.cpp
rename from layout/xul/base/src/tree/src/nsTreeContentView.h
rename to layout/xul/tree/nsTreeContentView.h
rename from layout/xul/base/src/tree/src/nsTreeImageListener.cpp
rename to layout/xul/tree/nsTreeImageListener.cpp
rename from layout/xul/base/src/tree/src/nsTreeImageListener.h
rename to layout/xul/tree/nsTreeImageListener.h
rename from layout/xul/base/src/tree/src/nsTreeSelection.cpp
rename to layout/xul/tree/nsTreeSelection.cpp
rename from layout/xul/base/src/tree/src/nsTreeSelection.h
rename to layout/xul/tree/nsTreeSelection.h
rename from layout/xul/base/src/tree/src/nsTreeStyleCache.cpp
rename to layout/xul/tree/nsTreeStyleCache.cpp
rename from layout/xul/base/src/tree/src/nsTreeStyleCache.h
rename to layout/xul/tree/nsTreeStyleCache.h
rename from layout/xul/base/src/tree/src/nsTreeUtils.cpp
rename to layout/xul/tree/nsTreeUtils.cpp
rename from layout/xul/base/src/tree/src/nsTreeUtils.h
rename to layout/xul/tree/nsTreeUtils.h
--- a/testing/crashtest/crashtests.list
+++ b/testing/crashtest/crashtests.list
@@ -43,18 +43,18 @@ include ../../js/xpconnect/crashtests/cr
 include ../../layout/base/crashtests/crashtests.list
 include ../../layout/forms/crashtests/crashtests.list
 include ../../layout/generic/crashtests/crashtests.list
 include ../../layout/mathml/crashtests/crashtests.list
 include ../../layout/style/crashtests/crashtests.list
 include ../../layout/svg/crashtests/crashtests.list
 include ../../layout/tables/crashtests/crashtests.list
 include ../../layout/xul/base/src/crashtests/crashtests.list
-include ../../layout/xul/base/src/grid/crashtests/crashtests.list
-include ../../layout/xul/base/src/tree/src/crashtests/crashtests.list
+include ../../layout/xul/grid/crashtests/crashtests.list
+include ../../layout/xul/tree/crashtests/crashtests.list
 
 include ../../gfx/tests/crashtests/crashtests.list
 
 include ../../image/test/crashtests/crashtests.list
 include ../../dom/plugins/test/crashtests/crashtests.list
 
 include ../../parser/htmlparser/tests/crashtests/crashtests.list
 
--- a/toolkit/toolkit-makefiles.sh
+++ b/toolkit/toolkit-makefiles.sh
@@ -1456,19 +1456,18 @@ if [ "$MOZ_X11" ]; then
   fi
 fi
 
 if [ "$MOZ_XUL" ]; then
   add_makefiles "
     content/xul/templates/Makefile
     content/xul/templates/public/Makefile
     content/xul/templates/src/Makefile
-    layout/xul/base/src/grid/Makefile
-    layout/xul/base/src/tree/public/Makefile
-    layout/xul/base/src/tree/src/Makefile
+    layout/xul/grid/Makefile
+    layout/xul/tree/Makefile
     toolkit/components/autocomplete/Makefile
     toolkit/components/satchel/Makefile
   "
 fi
 
 if [ "$NECKO_WIFI" ]; then
   add_makefiles "
     netwerk/wifi/Makefile