Bug 946065. Part 2: Move content/xslt to dom/xslt and flatten away 'public' and 'src'. r=ms2ger
authorRobert O'Callahan <robert@ocallahan.org>
Fri, 03 Jan 2014 14:48:12 +1300
changeset 178352 67ff9392766b53c51bb876b5f74e5e6602347668
parent 178351 3c354b68a0cad21b266314c6d1f0f947f579963e
child 178353 215f5bc6284dfc1778d01ae0fe52a9ea96d6bf2a
push id3343
push userffxbld
push dateMon, 17 Mar 2014 21:55:32 +0000
treeherdermozilla-beta@2f7d3415f79f [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersms2ger
bugs946065
milestone29.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 946065. Part 2: Move content/xslt to dom/xslt and flatten away 'public' and 'src'. r=ms2ger
content/base/src/moz.build
content/moz.build
content/xslt/crashtests/111994.xml
content/xslt/crashtests/111994.xsl
content/xslt/crashtests/182460-select.xml
content/xslt/crashtests/182460-selects.xsl
content/xslt/crashtests/182460-table.xhtml
content/xslt/crashtests/226425.xml
content/xslt/crashtests/226425.xsl
content/xslt/crashtests/406106-1.html
content/xslt/crashtests/483444.xml
content/xslt/crashtests/485217.xml
content/xslt/crashtests/485217.xsl
content/xslt/crashtests/485286.xml
content/xslt/crashtests/528300.xml
content/xslt/crashtests/528488.xml
content/xslt/crashtests/528963.xml
content/xslt/crashtests/545927.html
content/xslt/crashtests/601543.html
content/xslt/crashtests/602115.html
content/xslt/crashtests/603844.html
content/xslt/crashtests/667315.xml
content/xslt/crashtests/91332.xml
content/xslt/crashtests/91332.xsl
content/xslt/crashtests/crashtests.list
content/xslt/moz.build
content/xslt/public/moz.build
content/xslt/public/nsIDocumentTransformer.h
content/xslt/public/nsIXSLTException.idl
content/xslt/public/nsIXSLTProcessor.idl
content/xslt/public/nsIXSLTProcessorPrivate.idl
content/xslt/public/txIEXSLTRegExFunctions.idl
content/xslt/public/txIFunctionEvaluationContext.idl
content/xslt/public/txINodeSet.idl
content/xslt/public/txIXPathObject.idl
content/xslt/src/base/moz.build
content/xslt/src/base/txCore.h
content/xslt/src/base/txDouble.cpp
content/xslt/src/base/txErrorObserver.h
content/xslt/src/base/txExpandedNameMap.cpp
content/xslt/src/base/txExpandedNameMap.h
content/xslt/src/base/txList.cpp
content/xslt/src/base/txList.h
content/xslt/src/base/txLog.h
content/xslt/src/base/txNamespaceMap.cpp
content/xslt/src/base/txNamespaceMap.h
content/xslt/src/base/txOwningArray.h
content/xslt/src/base/txStack.h
content/xslt/src/base/txStringUtils.h
content/xslt/src/base/txURIUtils.cpp
content/xslt/src/base/txURIUtils.h
content/xslt/src/moz.build
content/xslt/src/xml/moz.build
content/xslt/src/xml/txXMLParser.cpp
content/xslt/src/xml/txXMLParser.h
content/xslt/src/xml/txXMLUtils.cpp
content/xslt/src/xml/txXMLUtils.h
content/xslt/src/xpath/XPathEvaluator.cpp
content/xslt/src/xpath/XPathEvaluator.h
content/xslt/src/xpath/moz.build
content/xslt/src/xpath/nsXPathExpression.cpp
content/xslt/src/xpath/nsXPathExpression.h
content/xslt/src/xpath/nsXPathNSResolver.cpp
content/xslt/src/xpath/nsXPathNSResolver.h
content/xslt/src/xpath/nsXPathResult.cpp
content/xslt/src/xpath/nsXPathResult.h
content/xslt/src/xpath/txBooleanExpr.cpp
content/xslt/src/xpath/txBooleanResult.cpp
content/xslt/src/xpath/txCoreFunctionCall.cpp
content/xslt/src/xpath/txErrorExpr.cpp
content/xslt/src/xpath/txExpr.cpp
content/xslt/src/xpath/txExpr.h
content/xslt/src/xpath/txExprLexer.cpp
content/xslt/src/xpath/txExprLexer.h
content/xslt/src/xpath/txExprParser.cpp
content/xslt/src/xpath/txExprParser.h
content/xslt/src/xpath/txExprResult.h
content/xslt/src/xpath/txFilterExpr.cpp
content/xslt/src/xpath/txForwardContext.cpp
content/xslt/src/xpath/txForwardContext.h
content/xslt/src/xpath/txFunctionCall.cpp
content/xslt/src/xpath/txIXPathContext.h
content/xslt/src/xpath/txLiteralExpr.cpp
content/xslt/src/xpath/txLocationStep.cpp
content/xslt/src/xpath/txMozillaXPathTreeWalker.cpp
content/xslt/src/xpath/txNameTest.cpp
content/xslt/src/xpath/txNamedAttributeStep.cpp
content/xslt/src/xpath/txNodeSet.cpp
content/xslt/src/xpath/txNodeSet.h
content/xslt/src/xpath/txNodeSetAdaptor.cpp
content/xslt/src/xpath/txNodeSetAdaptor.h
content/xslt/src/xpath/txNodeSetContext.cpp
content/xslt/src/xpath/txNodeSetContext.h
content/xslt/src/xpath/txNodeTypeTest.cpp
content/xslt/src/xpath/txNumberExpr.cpp
content/xslt/src/xpath/txNumberResult.cpp
content/xslt/src/xpath/txPathExpr.cpp
content/xslt/src/xpath/txPredicateList.cpp
content/xslt/src/xpath/txPredicatedNodeTest.cpp
content/xslt/src/xpath/txRelationalExpr.cpp
content/xslt/src/xpath/txResultRecycler.cpp
content/xslt/src/xpath/txResultRecycler.h
content/xslt/src/xpath/txRootExpr.cpp
content/xslt/src/xpath/txSingleNodeContext.h
content/xslt/src/xpath/txStringResult.cpp
content/xslt/src/xpath/txUnaryExpr.cpp
content/xslt/src/xpath/txUnionExpr.cpp
content/xslt/src/xpath/txUnionNodeTest.cpp
content/xslt/src/xpath/txVariableRefExpr.cpp
content/xslt/src/xpath/txXPCOMExtensionFunction.cpp
content/xslt/src/xpath/txXPathNode.h
content/xslt/src/xpath/txXPathObjectAdaptor.h
content/xslt/src/xpath/txXPathOptimizer.cpp
content/xslt/src/xpath/txXPathOptimizer.h
content/xslt/src/xpath/txXPathTreeWalker.h
content/xslt/src/xslt/moz.build
content/xslt/src/xslt/txBufferingHandler.cpp
content/xslt/src/xslt/txBufferingHandler.h
content/xslt/src/xslt/txCurrentFunctionCall.cpp
content/xslt/src/xslt/txDocumentFunctionCall.cpp
content/xslt/src/xslt/txEXSLTFunctions.cpp
content/xslt/src/xslt/txEXSLTRegExFunctions.js
content/xslt/src/xslt/txEXSLTRegExFunctions.manifest
content/xslt/src/xslt/txExecutionState.cpp
content/xslt/src/xslt/txExecutionState.h
content/xslt/src/xslt/txFormatNumberFunctionCall.cpp
content/xslt/src/xslt/txGenerateIdFunctionCall.cpp
content/xslt/src/xslt/txInstructions.cpp
content/xslt/src/xslt/txInstructions.h
content/xslt/src/xslt/txKey.h
content/xslt/src/xslt/txKeyFunctionCall.cpp
content/xslt/src/xslt/txMozillaStylesheetCompiler.cpp
content/xslt/src/xslt/txMozillaTextOutput.cpp
content/xslt/src/xslt/txMozillaTextOutput.h
content/xslt/src/xslt/txMozillaXMLOutput.cpp
content/xslt/src/xslt/txMozillaXMLOutput.h
content/xslt/src/xslt/txMozillaXSLTProcessor.cpp
content/xslt/src/xslt/txMozillaXSLTProcessor.h
content/xslt/src/xslt/txNodeSorter.cpp
content/xslt/src/xslt/txNodeSorter.h
content/xslt/src/xslt/txOutputFormat.cpp
content/xslt/src/xslt/txOutputFormat.h
content/xslt/src/xslt/txPatternOptimizer.cpp
content/xslt/src/xslt/txPatternOptimizer.h
content/xslt/src/xslt/txPatternParser.cpp
content/xslt/src/xslt/txPatternParser.h
content/xslt/src/xslt/txRtfHandler.cpp
content/xslt/src/xslt/txRtfHandler.h
content/xslt/src/xslt/txStylesheet.cpp
content/xslt/src/xslt/txStylesheet.h
content/xslt/src/xslt/txStylesheetCompileHandlers.cpp
content/xslt/src/xslt/txStylesheetCompileHandlers.h
content/xslt/src/xslt/txStylesheetCompiler.cpp
content/xslt/src/xslt/txStylesheetCompiler.h
content/xslt/src/xslt/txTextHandler.cpp
content/xslt/src/xslt/txTextHandler.h
content/xslt/src/xslt/txToplevelItems.cpp
content/xslt/src/xslt/txToplevelItems.h
content/xslt/src/xslt/txUnknownHandler.cpp
content/xslt/src/xslt/txUnknownHandler.h
content/xslt/src/xslt/txVariableMap.h
content/xslt/src/xslt/txXMLEventHandler.h
content/xslt/src/xslt/txXPathResultComparator.cpp
content/xslt/src/xslt/txXPathResultComparator.h
content/xslt/src/xslt/txXSLTEnvironmentFunctionCall.cpp
content/xslt/src/xslt/txXSLTFunctions.h
content/xslt/src/xslt/txXSLTNumber.cpp
content/xslt/src/xslt/txXSLTNumber.h
content/xslt/src/xslt/txXSLTNumberCounters.cpp
content/xslt/src/xslt/txXSLTPatterns.cpp
content/xslt/src/xslt/txXSLTPatterns.h
content/xslt/src/xslt/txXSLTProcessor.cpp
content/xslt/src/xslt/txXSLTProcessor.h
content/xslt/tests/XSLTMark/XSLTMark-static.js
content/xslt/tests/XSLTMark/XSLTMark-test.js
content/xslt/tests/XSLTMark/XSLTMark-view.js
content/xslt/tests/XSLTMark/XSLTMark.css
content/xslt/tests/XSLTMark/XSLTMark.xul
content/xslt/tests/buster/DiffDOM.js
content/xslt/tests/buster/DumpDOM.js
content/xslt/tests/buster/ReadMe
content/xslt/tests/buster/buster-files.js
content/xslt/tests/buster/buster-handlers.js
content/xslt/tests/buster/buster-statics.js
content/xslt/tests/buster/buster-test.js
content/xslt/tests/buster/buster-view.js
content/xslt/tests/buster/buster.css
content/xslt/tests/buster/buster.xul
content/xslt/tests/buster/helper/generate-rdf.pl
content/xslt/tests/buster/install.js
content/xslt/tests/buster/jar.mn
content/xslt/tests/buster/moz.build
content/xslt/tests/buster/result-inspector.xul
content/xslt/tests/buster/result-view.css
content/xslt/tests/buster/result-view.js
content/xslt/tests/buster/result-view.xul
content/xslt/tests/buster/xslt-qa-overlay.js
content/xslt/tests/buster/xslt-qa-overlay.xul
content/xslt/tests/mochitest/mochitest.ini
content/xslt/tests/mochitest/moz.build
content/xslt/tests/mochitest/test_bug319374.xhtml
content/xslt/tests/mochitest/test_bug427060.html
content/xslt/tests/mochitest/test_bug440974.html
content/xslt/tests/mochitest/test_bug453441.html
content/xslt/tests/mochitest/test_bug468208.html
content/xslt/tests/mochitest/test_bug511487.html
content/xslt/tests/mochitest/test_bug551412.html
content/xslt/tests/mochitest/test_bug551654.html
content/xslt/tests/mochitest/test_bug566629.html
content/xslt/tests/mochitest/test_bug566629.xhtml
content/xslt/tests/mochitest/test_bug603159.html
content/xslt/tests/mochitest/test_bug616774.html
content/xslt/tests/mochitest/test_bug667315.html
content/xslt/tests/mochitest/test_exslt_regex.html
dom/bindings/moz.build
dom/moz.build
dom/xslt/base/moz.build
dom/xslt/base/txCore.h
dom/xslt/base/txDouble.cpp
dom/xslt/base/txErrorObserver.h
dom/xslt/base/txExpandedNameMap.cpp
dom/xslt/base/txExpandedNameMap.h
dom/xslt/base/txList.cpp
dom/xslt/base/txList.h
dom/xslt/base/txLog.h
dom/xslt/base/txNamespaceMap.cpp
dom/xslt/base/txNamespaceMap.h
dom/xslt/base/txOwningArray.h
dom/xslt/base/txStack.h
dom/xslt/base/txStringUtils.h
dom/xslt/base/txURIUtils.cpp
dom/xslt/base/txURIUtils.h
dom/xslt/crashtests/111994.xml
dom/xslt/crashtests/111994.xsl
dom/xslt/crashtests/182460-select.xml
dom/xslt/crashtests/182460-selects.xsl
dom/xslt/crashtests/182460-table.xhtml
dom/xslt/crashtests/226425.xml
dom/xslt/crashtests/226425.xsl
dom/xslt/crashtests/406106-1.html
dom/xslt/crashtests/483444.xml
dom/xslt/crashtests/485217.xml
dom/xslt/crashtests/485217.xsl
dom/xslt/crashtests/485286.xml
dom/xslt/crashtests/528300.xml
dom/xslt/crashtests/528488.xml
dom/xslt/crashtests/528963.xml
dom/xslt/crashtests/545927.html
dom/xslt/crashtests/601543.html
dom/xslt/crashtests/602115.html
dom/xslt/crashtests/603844.html
dom/xslt/crashtests/667315.xml
dom/xslt/crashtests/91332.xml
dom/xslt/crashtests/91332.xsl
dom/xslt/crashtests/crashtests.list
dom/xslt/moz.build
dom/xslt/nsIDocumentTransformer.h
dom/xslt/nsIXSLTException.idl
dom/xslt/nsIXSLTProcessor.idl
dom/xslt/nsIXSLTProcessorPrivate.idl
dom/xslt/tests/XSLTMark/XSLTMark-static.js
dom/xslt/tests/XSLTMark/XSLTMark-test.js
dom/xslt/tests/XSLTMark/XSLTMark-view.js
dom/xslt/tests/XSLTMark/XSLTMark.css
dom/xslt/tests/XSLTMark/XSLTMark.xul
dom/xslt/tests/buster/DiffDOM.js
dom/xslt/tests/buster/DumpDOM.js
dom/xslt/tests/buster/ReadMe
dom/xslt/tests/buster/buster-files.js
dom/xslt/tests/buster/buster-handlers.js
dom/xslt/tests/buster/buster-statics.js
dom/xslt/tests/buster/buster-test.js
dom/xslt/tests/buster/buster-view.js
dom/xslt/tests/buster/buster.css
dom/xslt/tests/buster/buster.xul
dom/xslt/tests/buster/helper/generate-rdf.pl
dom/xslt/tests/buster/install.js
dom/xslt/tests/buster/jar.mn
dom/xslt/tests/buster/moz.build
dom/xslt/tests/buster/result-inspector.xul
dom/xslt/tests/buster/result-view.css
dom/xslt/tests/buster/result-view.js
dom/xslt/tests/buster/result-view.xul
dom/xslt/tests/buster/xslt-qa-overlay.js
dom/xslt/tests/buster/xslt-qa-overlay.xul
dom/xslt/tests/mochitest/mochitest.ini
dom/xslt/tests/mochitest/moz.build
dom/xslt/tests/mochitest/test_bug319374.xhtml
dom/xslt/tests/mochitest/test_bug427060.html
dom/xslt/tests/mochitest/test_bug440974.html
dom/xslt/tests/mochitest/test_bug453441.html
dom/xslt/tests/mochitest/test_bug468208.html
dom/xslt/tests/mochitest/test_bug511487.html
dom/xslt/tests/mochitest/test_bug551412.html
dom/xslt/tests/mochitest/test_bug551654.html
dom/xslt/tests/mochitest/test_bug566629.html
dom/xslt/tests/mochitest/test_bug566629.xhtml
dom/xslt/tests/mochitest/test_bug603159.html
dom/xslt/tests/mochitest/test_bug616774.html
dom/xslt/tests/mochitest/test_bug667315.html
dom/xslt/tests/mochitest/test_exslt_regex.html
dom/xslt/txIEXSLTRegExFunctions.idl
dom/xslt/txIFunctionEvaluationContext.idl
dom/xslt/txINodeSet.idl
dom/xslt/txIXPathObject.idl
dom/xslt/xml/moz.build
dom/xslt/xml/txXMLParser.cpp
dom/xslt/xml/txXMLParser.h
dom/xslt/xml/txXMLUtils.cpp
dom/xslt/xml/txXMLUtils.h
dom/xslt/xpath/XPathEvaluator.cpp
dom/xslt/xpath/XPathEvaluator.h
dom/xslt/xpath/moz.build
dom/xslt/xpath/nsXPathExpression.cpp
dom/xslt/xpath/nsXPathExpression.h
dom/xslt/xpath/nsXPathNSResolver.cpp
dom/xslt/xpath/nsXPathNSResolver.h
dom/xslt/xpath/nsXPathResult.cpp
dom/xslt/xpath/nsXPathResult.h
dom/xslt/xpath/txBooleanExpr.cpp
dom/xslt/xpath/txBooleanResult.cpp
dom/xslt/xpath/txCoreFunctionCall.cpp
dom/xslt/xpath/txErrorExpr.cpp
dom/xslt/xpath/txExpr.cpp
dom/xslt/xpath/txExpr.h
dom/xslt/xpath/txExprLexer.cpp
dom/xslt/xpath/txExprLexer.h
dom/xslt/xpath/txExprParser.cpp
dom/xslt/xpath/txExprParser.h
dom/xslt/xpath/txExprResult.h
dom/xslt/xpath/txFilterExpr.cpp
dom/xslt/xpath/txForwardContext.cpp
dom/xslt/xpath/txForwardContext.h
dom/xslt/xpath/txFunctionCall.cpp
dom/xslt/xpath/txIXPathContext.h
dom/xslt/xpath/txLiteralExpr.cpp
dom/xslt/xpath/txLocationStep.cpp
dom/xslt/xpath/txMozillaXPathTreeWalker.cpp
dom/xslt/xpath/txNameTest.cpp
dom/xslt/xpath/txNamedAttributeStep.cpp
dom/xslt/xpath/txNodeSet.cpp
dom/xslt/xpath/txNodeSet.h
dom/xslt/xpath/txNodeSetAdaptor.cpp
dom/xslt/xpath/txNodeSetAdaptor.h
dom/xslt/xpath/txNodeSetContext.cpp
dom/xslt/xpath/txNodeSetContext.h
dom/xslt/xpath/txNodeTypeTest.cpp
dom/xslt/xpath/txNumberExpr.cpp
dom/xslt/xpath/txNumberResult.cpp
dom/xslt/xpath/txPathExpr.cpp
dom/xslt/xpath/txPredicateList.cpp
dom/xslt/xpath/txPredicatedNodeTest.cpp
dom/xslt/xpath/txRelationalExpr.cpp
dom/xslt/xpath/txResultRecycler.cpp
dom/xslt/xpath/txResultRecycler.h
dom/xslt/xpath/txRootExpr.cpp
dom/xslt/xpath/txSingleNodeContext.h
dom/xslt/xpath/txStringResult.cpp
dom/xslt/xpath/txUnaryExpr.cpp
dom/xslt/xpath/txUnionExpr.cpp
dom/xslt/xpath/txUnionNodeTest.cpp
dom/xslt/xpath/txVariableRefExpr.cpp
dom/xslt/xpath/txXPCOMExtensionFunction.cpp
dom/xslt/xpath/txXPathNode.h
dom/xslt/xpath/txXPathObjectAdaptor.h
dom/xslt/xpath/txXPathOptimizer.cpp
dom/xslt/xpath/txXPathOptimizer.h
dom/xslt/xpath/txXPathTreeWalker.h
dom/xslt/xslt/moz.build
dom/xslt/xslt/txBufferingHandler.cpp
dom/xslt/xslt/txBufferingHandler.h
dom/xslt/xslt/txCurrentFunctionCall.cpp
dom/xslt/xslt/txDocumentFunctionCall.cpp
dom/xslt/xslt/txEXSLTFunctions.cpp
dom/xslt/xslt/txEXSLTRegExFunctions.js
dom/xslt/xslt/txEXSLTRegExFunctions.manifest
dom/xslt/xslt/txExecutionState.cpp
dom/xslt/xslt/txExecutionState.h
dom/xslt/xslt/txFormatNumberFunctionCall.cpp
dom/xslt/xslt/txGenerateIdFunctionCall.cpp
dom/xslt/xslt/txInstructions.cpp
dom/xslt/xslt/txInstructions.h
dom/xslt/xslt/txKey.h
dom/xslt/xslt/txKeyFunctionCall.cpp
dom/xslt/xslt/txMozillaStylesheetCompiler.cpp
dom/xslt/xslt/txMozillaTextOutput.cpp
dom/xslt/xslt/txMozillaTextOutput.h
dom/xslt/xslt/txMozillaXMLOutput.cpp
dom/xslt/xslt/txMozillaXMLOutput.h
dom/xslt/xslt/txMozillaXSLTProcessor.cpp
dom/xslt/xslt/txMozillaXSLTProcessor.h
dom/xslt/xslt/txNodeSorter.cpp
dom/xslt/xslt/txNodeSorter.h
dom/xslt/xslt/txOutputFormat.cpp
dom/xslt/xslt/txOutputFormat.h
dom/xslt/xslt/txPatternOptimizer.cpp
dom/xslt/xslt/txPatternOptimizer.h
dom/xslt/xslt/txPatternParser.cpp
dom/xslt/xslt/txPatternParser.h
dom/xslt/xslt/txRtfHandler.cpp
dom/xslt/xslt/txRtfHandler.h
dom/xslt/xslt/txStylesheet.cpp
dom/xslt/xslt/txStylesheet.h
dom/xslt/xslt/txStylesheetCompileHandlers.cpp
dom/xslt/xslt/txStylesheetCompileHandlers.h
dom/xslt/xslt/txStylesheetCompiler.cpp
dom/xslt/xslt/txStylesheetCompiler.h
dom/xslt/xslt/txTextHandler.cpp
dom/xslt/xslt/txTextHandler.h
dom/xslt/xslt/txToplevelItems.cpp
dom/xslt/xslt/txToplevelItems.h
dom/xslt/xslt/txUnknownHandler.cpp
dom/xslt/xslt/txUnknownHandler.h
dom/xslt/xslt/txVariableMap.h
dom/xslt/xslt/txXMLEventHandler.h
dom/xslt/xslt/txXPathResultComparator.cpp
dom/xslt/xslt/txXPathResultComparator.h
dom/xslt/xslt/txXSLTEnvironmentFunctionCall.cpp
dom/xslt/xslt/txXSLTFunctions.h
dom/xslt/xslt/txXSLTNumber.cpp
dom/xslt/xslt/txXSLTNumber.h
dom/xslt/xslt/txXSLTNumberCounters.cpp
dom/xslt/xslt/txXSLTPatterns.cpp
dom/xslt/xslt/txXSLTPatterns.h
dom/xslt/xslt/txXSLTProcessor.cpp
dom/xslt/xslt/txXSLTProcessor.h
layout/build/moz.build
testing/crashtest/crashtests.list
--- a/content/base/src/moz.build
+++ b/content/base/src/moz.build
@@ -195,23 +195,23 @@ FINAL_LIBRARY = 'gklayout'
 LOCAL_INCLUDES += [
     '/caps/include',
     '/content/events/src',
     '/content/html/content/src',
     '/content/html/document/src',
     '/content/xbl/src',
     '/content/xml/content/src',
     '/content/xml/document/src',
-    '/content/xslt/src/xpath',
     '/content/xul/content/src',
     '/content/xul/document/src',
     '/docshell/base',
     '/dom/base',
     '/dom/ipc',
     '/dom/workers',
+    '/dom/xslt/xpath',
     '/image/src',
     '/js/ipc',
     '/js/xpconnect/src',
     '/js/xpconnect/wrappers',
     '/layout/base',
     '/layout/generic',
     '/layout/style',
     '/layout/svg',
--- a/content/moz.build
+++ b/content/moz.build
@@ -11,13 +11,12 @@ PARALLEL_DIRS += [
     'html',
     'mathml/content/src',
     'media',
     'smil',
     'svg',
     'xml',
     'xul',
     'xbl',
-    'xslt',
 ]
 
 TEST_TOOL_DIRS += ['test']
 
deleted file mode 100644
--- a/content/xslt/moz.build
+++ /dev/null
@@ -1,8 +0,0 @@
-# -*- Mode: python; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 40 -*-
-# vim: set filetype=python:
-# 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/.
-
-PARALLEL_DIRS += ['public', 'src']
-TEST_DIRS += ['tests/buster', 'tests/mochitest']
deleted file mode 100644
--- a/content/xslt/src/moz.build
+++ /dev/null
@@ -1,7 +0,0 @@
-# -*- Mode: python; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 40 -*-
-# vim: set filetype=python:
-# 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/.
-
-PARALLEL_DIRS += ['base', 'xml', 'xpath', 'xslt']
--- a/dom/bindings/moz.build
+++ b/dom/bindings/moz.build
@@ -43,28 +43,28 @@ LOCAL_INCLUDES += [
     '/content/events/src',
     '/content/html/content/src',
     '/content/html/document/src',
     '/content/media/webaudio',
     '/content/media/webspeech/recognition',
     '/content/svg/content/src',
     '/content/xbl/src',
     '/content/xml/content/src',
-    '/content/xslt/src/base',
-    '/content/xslt/src/xpath',
     '/content/xul/content/src',
     '/content/xul/document/src',
     '/dom/base',
     '/dom/battery',
     '/dom/bluetooth',
     '/dom/camera',
     '/dom/file',
     '/dom/indexedDB',
     '/dom/src/geolocation',
     '/dom/workers',
+    '/dom/xslt/base',
+    '/dom/xslt/xpath',
     '/js/ipc',
     '/js/xpconnect/src',
     '/js/xpconnect/wrappers',
     '/layout/style',
     '/layout/xul/tree',
     '/media/mtransport',
     '/media/webrtc/signaling/src/common/time_profiling',
     '/media/webrtc/signaling/src/peerconnection',
--- a/dom/moz.build
+++ b/dom/moz.build
@@ -71,16 +71,17 @@ PARALLEL_DIRS += [
     'identity',
     'workers',
     'camera',
     'audiochannel',
     'promise',
     'telephony',
     'inputmethod',
     'webidl',
+    'xslt',
 ]
 
 if CONFIG['OS_ARCH'] == 'WINNT':
     PARALLEL_DIRS += ['plugins/ipc/hangui']
 
 if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gonk':
     PARALLEL_DIRS += [
         'speakermanager',
rename from content/xslt/src/base/moz.build
rename to dom/xslt/base/moz.build
--- a/content/xslt/src/base/moz.build
+++ b/dom/xslt/base/moz.build
@@ -10,15 +10,15 @@ UNIFIED_SOURCES += [
     'txList.cpp',
     'txNamespaceMap.cpp',
     'txURIUtils.cpp',
 ]
 
 FAIL_ON_WARNINGS = True
 
 LOCAL_INCLUDES += [
-    '../../public',
+    '..',
     '../xml',
     '../xpath',
     '../xslt',
 ]
 
 FINAL_LIBRARY = 'gklayout'
rename from content/xslt/src/base/txCore.h
rename to dom/xslt/base/txCore.h
rename from content/xslt/src/base/txDouble.cpp
rename to dom/xslt/base/txDouble.cpp
rename from content/xslt/src/base/txErrorObserver.h
rename to dom/xslt/base/txErrorObserver.h
rename from content/xslt/src/base/txExpandedNameMap.cpp
rename to dom/xslt/base/txExpandedNameMap.cpp
rename from content/xslt/src/base/txExpandedNameMap.h
rename to dom/xslt/base/txExpandedNameMap.h
rename from content/xslt/src/base/txList.cpp
rename to dom/xslt/base/txList.cpp
rename from content/xslt/src/base/txList.h
rename to dom/xslt/base/txList.h
rename from content/xslt/src/base/txLog.h
rename to dom/xslt/base/txLog.h
rename from content/xslt/src/base/txNamespaceMap.cpp
rename to dom/xslt/base/txNamespaceMap.cpp
rename from content/xslt/src/base/txNamespaceMap.h
rename to dom/xslt/base/txNamespaceMap.h
rename from content/xslt/src/base/txOwningArray.h
rename to dom/xslt/base/txOwningArray.h
rename from content/xslt/src/base/txStack.h
rename to dom/xslt/base/txStack.h
rename from content/xslt/src/base/txStringUtils.h
rename to dom/xslt/base/txStringUtils.h
rename from content/xslt/src/base/txURIUtils.cpp
rename to dom/xslt/base/txURIUtils.cpp
rename from content/xslt/src/base/txURIUtils.h
rename to dom/xslt/base/txURIUtils.h
rename from content/xslt/crashtests/111994.xml
rename to dom/xslt/crashtests/111994.xml
rename from content/xslt/crashtests/111994.xsl
rename to dom/xslt/crashtests/111994.xsl
rename from content/xslt/crashtests/182460-select.xml
rename to dom/xslt/crashtests/182460-select.xml
rename from content/xslt/crashtests/182460-selects.xsl
rename to dom/xslt/crashtests/182460-selects.xsl
rename from content/xslt/crashtests/182460-table.xhtml
rename to dom/xslt/crashtests/182460-table.xhtml
rename from content/xslt/crashtests/226425.xml
rename to dom/xslt/crashtests/226425.xml
rename from content/xslt/crashtests/226425.xsl
rename to dom/xslt/crashtests/226425.xsl
rename from content/xslt/crashtests/406106-1.html
rename to dom/xslt/crashtests/406106-1.html
rename from content/xslt/crashtests/483444.xml
rename to dom/xslt/crashtests/483444.xml
rename from content/xslt/crashtests/485217.xml
rename to dom/xslt/crashtests/485217.xml
rename from content/xslt/crashtests/485217.xsl
rename to dom/xslt/crashtests/485217.xsl
rename from content/xslt/crashtests/485286.xml
rename to dom/xslt/crashtests/485286.xml
rename from content/xslt/crashtests/528300.xml
rename to dom/xslt/crashtests/528300.xml
rename from content/xslt/crashtests/528488.xml
rename to dom/xslt/crashtests/528488.xml
rename from content/xslt/crashtests/528963.xml
rename to dom/xslt/crashtests/528963.xml
rename from content/xslt/crashtests/545927.html
rename to dom/xslt/crashtests/545927.html
rename from content/xslt/crashtests/601543.html
rename to dom/xslt/crashtests/601543.html
rename from content/xslt/crashtests/602115.html
rename to dom/xslt/crashtests/602115.html
rename from content/xslt/crashtests/603844.html
rename to dom/xslt/crashtests/603844.html
rename from content/xslt/crashtests/667315.xml
rename to dom/xslt/crashtests/667315.xml
rename from content/xslt/crashtests/91332.xml
rename to dom/xslt/crashtests/91332.xml
rename from content/xslt/crashtests/91332.xsl
rename to dom/xslt/crashtests/91332.xsl
rename from content/xslt/crashtests/crashtests.list
rename to dom/xslt/crashtests/crashtests.list
rename from content/xslt/public/moz.build
rename to dom/xslt/moz.build
--- a/content/xslt/public/moz.build
+++ b/dom/xslt/moz.build
@@ -15,8 +15,19 @@ XPIDL_SOURCES += [
 ]
 
 XPIDL_MODULE = 'content_xslt'
 
 EXPORTS += [
     'nsIDocumentTransformer.h',
 ]
 
+PARALLEL_DIRS += [
+    'base',
+    'xml',
+    'xpath',
+    'xslt',
+]
+
+TEST_DIRS += [
+    'tests/buster',
+    'tests/mochitest',
+]
rename from content/xslt/public/nsIDocumentTransformer.h
rename to dom/xslt/nsIDocumentTransformer.h
rename from content/xslt/public/nsIXSLTException.idl
rename to dom/xslt/nsIXSLTException.idl
rename from content/xslt/public/nsIXSLTProcessor.idl
rename to dom/xslt/nsIXSLTProcessor.idl
rename from content/xslt/public/nsIXSLTProcessorPrivate.idl
rename to dom/xslt/nsIXSLTProcessorPrivate.idl
rename from content/xslt/tests/XSLTMark/XSLTMark-static.js
rename to dom/xslt/tests/XSLTMark/XSLTMark-static.js
rename from content/xslt/tests/XSLTMark/XSLTMark-test.js
rename to dom/xslt/tests/XSLTMark/XSLTMark-test.js
rename from content/xslt/tests/XSLTMark/XSLTMark-view.js
rename to dom/xslt/tests/XSLTMark/XSLTMark-view.js
rename from content/xslt/tests/XSLTMark/XSLTMark.css
rename to dom/xslt/tests/XSLTMark/XSLTMark.css
rename from content/xslt/tests/XSLTMark/XSLTMark.xul
rename to dom/xslt/tests/XSLTMark/XSLTMark.xul
rename from content/xslt/tests/buster/DiffDOM.js
rename to dom/xslt/tests/buster/DiffDOM.js
rename from content/xslt/tests/buster/DumpDOM.js
rename to dom/xslt/tests/buster/DumpDOM.js
rename from content/xslt/tests/buster/ReadMe
rename to dom/xslt/tests/buster/ReadMe
rename from content/xslt/tests/buster/buster-files.js
rename to dom/xslt/tests/buster/buster-files.js
rename from content/xslt/tests/buster/buster-handlers.js
rename to dom/xslt/tests/buster/buster-handlers.js
rename from content/xslt/tests/buster/buster-statics.js
rename to dom/xslt/tests/buster/buster-statics.js
rename from content/xslt/tests/buster/buster-test.js
rename to dom/xslt/tests/buster/buster-test.js
rename from content/xslt/tests/buster/buster-view.js
rename to dom/xslt/tests/buster/buster-view.js
rename from content/xslt/tests/buster/buster.css
rename to dom/xslt/tests/buster/buster.css
rename from content/xslt/tests/buster/buster.xul
rename to dom/xslt/tests/buster/buster.xul
rename from content/xslt/tests/buster/helper/generate-rdf.pl
rename to dom/xslt/tests/buster/helper/generate-rdf.pl
rename from content/xslt/tests/buster/install.js
rename to dom/xslt/tests/buster/install.js
rename from content/xslt/tests/buster/jar.mn
rename to dom/xslt/tests/buster/jar.mn
rename from content/xslt/tests/buster/moz.build
rename to dom/xslt/tests/buster/moz.build
rename from content/xslt/tests/buster/result-inspector.xul
rename to dom/xslt/tests/buster/result-inspector.xul
rename from content/xslt/tests/buster/result-view.css
rename to dom/xslt/tests/buster/result-view.css
rename from content/xslt/tests/buster/result-view.js
rename to dom/xslt/tests/buster/result-view.js
rename from content/xslt/tests/buster/result-view.xul
rename to dom/xslt/tests/buster/result-view.xul
rename from content/xslt/tests/buster/xslt-qa-overlay.js
rename to dom/xslt/tests/buster/xslt-qa-overlay.js
rename from content/xslt/tests/buster/xslt-qa-overlay.xul
rename to dom/xslt/tests/buster/xslt-qa-overlay.xul
rename from content/xslt/tests/mochitest/mochitest.ini
rename to dom/xslt/tests/mochitest/mochitest.ini
rename from content/xslt/tests/mochitest/moz.build
rename to dom/xslt/tests/mochitest/moz.build
rename from content/xslt/tests/mochitest/test_bug319374.xhtml
rename to dom/xslt/tests/mochitest/test_bug319374.xhtml
rename from content/xslt/tests/mochitest/test_bug427060.html
rename to dom/xslt/tests/mochitest/test_bug427060.html
rename from content/xslt/tests/mochitest/test_bug440974.html
rename to dom/xslt/tests/mochitest/test_bug440974.html
rename from content/xslt/tests/mochitest/test_bug453441.html
rename to dom/xslt/tests/mochitest/test_bug453441.html
rename from content/xslt/tests/mochitest/test_bug468208.html
rename to dom/xslt/tests/mochitest/test_bug468208.html
rename from content/xslt/tests/mochitest/test_bug511487.html
rename to dom/xslt/tests/mochitest/test_bug511487.html
rename from content/xslt/tests/mochitest/test_bug551412.html
rename to dom/xslt/tests/mochitest/test_bug551412.html
rename from content/xslt/tests/mochitest/test_bug551654.html
rename to dom/xslt/tests/mochitest/test_bug551654.html
rename from content/xslt/tests/mochitest/test_bug566629.html
rename to dom/xslt/tests/mochitest/test_bug566629.html
rename from content/xslt/tests/mochitest/test_bug566629.xhtml
rename to dom/xslt/tests/mochitest/test_bug566629.xhtml
rename from content/xslt/tests/mochitest/test_bug603159.html
rename to dom/xslt/tests/mochitest/test_bug603159.html
rename from content/xslt/tests/mochitest/test_bug616774.html
rename to dom/xslt/tests/mochitest/test_bug616774.html
rename from content/xslt/tests/mochitest/test_bug667315.html
rename to dom/xslt/tests/mochitest/test_bug667315.html
rename from content/xslt/tests/mochitest/test_exslt_regex.html
rename to dom/xslt/tests/mochitest/test_exslt_regex.html
rename from content/xslt/public/txIEXSLTRegExFunctions.idl
rename to dom/xslt/txIEXSLTRegExFunctions.idl
rename from content/xslt/public/txIFunctionEvaluationContext.idl
rename to dom/xslt/txIFunctionEvaluationContext.idl
rename from content/xslt/public/txINodeSet.idl
rename to dom/xslt/txINodeSet.idl
rename from content/xslt/public/txIXPathObject.idl
rename to dom/xslt/txIXPathObject.idl
rename from content/xslt/src/xml/moz.build
rename to dom/xslt/xml/moz.build
rename from content/xslt/src/xml/txXMLParser.cpp
rename to dom/xslt/xml/txXMLParser.cpp
rename from content/xslt/src/xml/txXMLParser.h
rename to dom/xslt/xml/txXMLParser.h
rename from content/xslt/src/xml/txXMLUtils.cpp
rename to dom/xslt/xml/txXMLUtils.cpp
rename from content/xslt/src/xml/txXMLUtils.h
rename to dom/xslt/xml/txXMLUtils.h
rename from content/xslt/src/xpath/XPathEvaluator.cpp
rename to dom/xslt/xpath/XPathEvaluator.cpp
rename from content/xslt/src/xpath/XPathEvaluator.h
rename to dom/xslt/xpath/XPathEvaluator.h
rename from content/xslt/src/xpath/moz.build
rename to dom/xslt/xpath/moz.build
rename from content/xslt/src/xpath/nsXPathExpression.cpp
rename to dom/xslt/xpath/nsXPathExpression.cpp
rename from content/xslt/src/xpath/nsXPathExpression.h
rename to dom/xslt/xpath/nsXPathExpression.h
rename from content/xslt/src/xpath/nsXPathNSResolver.cpp
rename to dom/xslt/xpath/nsXPathNSResolver.cpp
rename from content/xslt/src/xpath/nsXPathNSResolver.h
rename to dom/xslt/xpath/nsXPathNSResolver.h
rename from content/xslt/src/xpath/nsXPathResult.cpp
rename to dom/xslt/xpath/nsXPathResult.cpp
rename from content/xslt/src/xpath/nsXPathResult.h
rename to dom/xslt/xpath/nsXPathResult.h
rename from content/xslt/src/xpath/txBooleanExpr.cpp
rename to dom/xslt/xpath/txBooleanExpr.cpp
rename from content/xslt/src/xpath/txBooleanResult.cpp
rename to dom/xslt/xpath/txBooleanResult.cpp
rename from content/xslt/src/xpath/txCoreFunctionCall.cpp
rename to dom/xslt/xpath/txCoreFunctionCall.cpp
rename from content/xslt/src/xpath/txErrorExpr.cpp
rename to dom/xslt/xpath/txErrorExpr.cpp
rename from content/xslt/src/xpath/txExpr.cpp
rename to dom/xslt/xpath/txExpr.cpp
rename from content/xslt/src/xpath/txExpr.h
rename to dom/xslt/xpath/txExpr.h
rename from content/xslt/src/xpath/txExprLexer.cpp
rename to dom/xslt/xpath/txExprLexer.cpp
rename from content/xslt/src/xpath/txExprLexer.h
rename to dom/xslt/xpath/txExprLexer.h
rename from content/xslt/src/xpath/txExprParser.cpp
rename to dom/xslt/xpath/txExprParser.cpp
rename from content/xslt/src/xpath/txExprParser.h
rename to dom/xslt/xpath/txExprParser.h
rename from content/xslt/src/xpath/txExprResult.h
rename to dom/xslt/xpath/txExprResult.h
rename from content/xslt/src/xpath/txFilterExpr.cpp
rename to dom/xslt/xpath/txFilterExpr.cpp
rename from content/xslt/src/xpath/txForwardContext.cpp
rename to dom/xslt/xpath/txForwardContext.cpp
rename from content/xslt/src/xpath/txForwardContext.h
rename to dom/xslt/xpath/txForwardContext.h
rename from content/xslt/src/xpath/txFunctionCall.cpp
rename to dom/xslt/xpath/txFunctionCall.cpp
rename from content/xslt/src/xpath/txIXPathContext.h
rename to dom/xslt/xpath/txIXPathContext.h
rename from content/xslt/src/xpath/txLiteralExpr.cpp
rename to dom/xslt/xpath/txLiteralExpr.cpp
rename from content/xslt/src/xpath/txLocationStep.cpp
rename to dom/xslt/xpath/txLocationStep.cpp
rename from content/xslt/src/xpath/txMozillaXPathTreeWalker.cpp
rename to dom/xslt/xpath/txMozillaXPathTreeWalker.cpp
rename from content/xslt/src/xpath/txNameTest.cpp
rename to dom/xslt/xpath/txNameTest.cpp
rename from content/xslt/src/xpath/txNamedAttributeStep.cpp
rename to dom/xslt/xpath/txNamedAttributeStep.cpp
rename from content/xslt/src/xpath/txNodeSet.cpp
rename to dom/xslt/xpath/txNodeSet.cpp
rename from content/xslt/src/xpath/txNodeSet.h
rename to dom/xslt/xpath/txNodeSet.h
rename from content/xslt/src/xpath/txNodeSetAdaptor.cpp
rename to dom/xslt/xpath/txNodeSetAdaptor.cpp
rename from content/xslt/src/xpath/txNodeSetAdaptor.h
rename to dom/xslt/xpath/txNodeSetAdaptor.h
rename from content/xslt/src/xpath/txNodeSetContext.cpp
rename to dom/xslt/xpath/txNodeSetContext.cpp
rename from content/xslt/src/xpath/txNodeSetContext.h
rename to dom/xslt/xpath/txNodeSetContext.h
rename from content/xslt/src/xpath/txNodeTypeTest.cpp
rename to dom/xslt/xpath/txNodeTypeTest.cpp
rename from content/xslt/src/xpath/txNumberExpr.cpp
rename to dom/xslt/xpath/txNumberExpr.cpp
rename from content/xslt/src/xpath/txNumberResult.cpp
rename to dom/xslt/xpath/txNumberResult.cpp
rename from content/xslt/src/xpath/txPathExpr.cpp
rename to dom/xslt/xpath/txPathExpr.cpp
rename from content/xslt/src/xpath/txPredicateList.cpp
rename to dom/xslt/xpath/txPredicateList.cpp
rename from content/xslt/src/xpath/txPredicatedNodeTest.cpp
rename to dom/xslt/xpath/txPredicatedNodeTest.cpp
rename from content/xslt/src/xpath/txRelationalExpr.cpp
rename to dom/xslt/xpath/txRelationalExpr.cpp
rename from content/xslt/src/xpath/txResultRecycler.cpp
rename to dom/xslt/xpath/txResultRecycler.cpp
rename from content/xslt/src/xpath/txResultRecycler.h
rename to dom/xslt/xpath/txResultRecycler.h
rename from content/xslt/src/xpath/txRootExpr.cpp
rename to dom/xslt/xpath/txRootExpr.cpp
rename from content/xslt/src/xpath/txSingleNodeContext.h
rename to dom/xslt/xpath/txSingleNodeContext.h
rename from content/xslt/src/xpath/txStringResult.cpp
rename to dom/xslt/xpath/txStringResult.cpp
rename from content/xslt/src/xpath/txUnaryExpr.cpp
rename to dom/xslt/xpath/txUnaryExpr.cpp
rename from content/xslt/src/xpath/txUnionExpr.cpp
rename to dom/xslt/xpath/txUnionExpr.cpp
rename from content/xslt/src/xpath/txUnionNodeTest.cpp
rename to dom/xslt/xpath/txUnionNodeTest.cpp
rename from content/xslt/src/xpath/txVariableRefExpr.cpp
rename to dom/xslt/xpath/txVariableRefExpr.cpp
rename from content/xslt/src/xpath/txXPCOMExtensionFunction.cpp
rename to dom/xslt/xpath/txXPCOMExtensionFunction.cpp
rename from content/xslt/src/xpath/txXPathNode.h
rename to dom/xslt/xpath/txXPathNode.h
rename from content/xslt/src/xpath/txXPathObjectAdaptor.h
rename to dom/xslt/xpath/txXPathObjectAdaptor.h
rename from content/xslt/src/xpath/txXPathOptimizer.cpp
rename to dom/xslt/xpath/txXPathOptimizer.cpp
rename from content/xslt/src/xpath/txXPathOptimizer.h
rename to dom/xslt/xpath/txXPathOptimizer.h
rename from content/xslt/src/xpath/txXPathTreeWalker.h
rename to dom/xslt/xpath/txXPathTreeWalker.h
rename from content/xslt/src/xslt/moz.build
rename to dom/xslt/xslt/moz.build
rename from content/xslt/src/xslt/txBufferingHandler.cpp
rename to dom/xslt/xslt/txBufferingHandler.cpp
rename from content/xslt/src/xslt/txBufferingHandler.h
rename to dom/xslt/xslt/txBufferingHandler.h
rename from content/xslt/src/xslt/txCurrentFunctionCall.cpp
rename to dom/xslt/xslt/txCurrentFunctionCall.cpp
rename from content/xslt/src/xslt/txDocumentFunctionCall.cpp
rename to dom/xslt/xslt/txDocumentFunctionCall.cpp
rename from content/xslt/src/xslt/txEXSLTFunctions.cpp
rename to dom/xslt/xslt/txEXSLTFunctions.cpp
rename from content/xslt/src/xslt/txEXSLTRegExFunctions.js
rename to dom/xslt/xslt/txEXSLTRegExFunctions.js
rename from content/xslt/src/xslt/txEXSLTRegExFunctions.manifest
rename to dom/xslt/xslt/txEXSLTRegExFunctions.manifest
rename from content/xslt/src/xslt/txExecutionState.cpp
rename to dom/xslt/xslt/txExecutionState.cpp
rename from content/xslt/src/xslt/txExecutionState.h
rename to dom/xslt/xslt/txExecutionState.h
rename from content/xslt/src/xslt/txFormatNumberFunctionCall.cpp
rename to dom/xslt/xslt/txFormatNumberFunctionCall.cpp
rename from content/xslt/src/xslt/txGenerateIdFunctionCall.cpp
rename to dom/xslt/xslt/txGenerateIdFunctionCall.cpp
rename from content/xslt/src/xslt/txInstructions.cpp
rename to dom/xslt/xslt/txInstructions.cpp
rename from content/xslt/src/xslt/txInstructions.h
rename to dom/xslt/xslt/txInstructions.h
rename from content/xslt/src/xslt/txKey.h
rename to dom/xslt/xslt/txKey.h
rename from content/xslt/src/xslt/txKeyFunctionCall.cpp
rename to dom/xslt/xslt/txKeyFunctionCall.cpp
rename from content/xslt/src/xslt/txMozillaStylesheetCompiler.cpp
rename to dom/xslt/xslt/txMozillaStylesheetCompiler.cpp
rename from content/xslt/src/xslt/txMozillaTextOutput.cpp
rename to dom/xslt/xslt/txMozillaTextOutput.cpp
rename from content/xslt/src/xslt/txMozillaTextOutput.h
rename to dom/xslt/xslt/txMozillaTextOutput.h
rename from content/xslt/src/xslt/txMozillaXMLOutput.cpp
rename to dom/xslt/xslt/txMozillaXMLOutput.cpp
rename from content/xslt/src/xslt/txMozillaXMLOutput.h
rename to dom/xslt/xslt/txMozillaXMLOutput.h
rename from content/xslt/src/xslt/txMozillaXSLTProcessor.cpp
rename to dom/xslt/xslt/txMozillaXSLTProcessor.cpp
rename from content/xslt/src/xslt/txMozillaXSLTProcessor.h
rename to dom/xslt/xslt/txMozillaXSLTProcessor.h
rename from content/xslt/src/xslt/txNodeSorter.cpp
rename to dom/xslt/xslt/txNodeSorter.cpp
rename from content/xslt/src/xslt/txNodeSorter.h
rename to dom/xslt/xslt/txNodeSorter.h
rename from content/xslt/src/xslt/txOutputFormat.cpp
rename to dom/xslt/xslt/txOutputFormat.cpp
rename from content/xslt/src/xslt/txOutputFormat.h
rename to dom/xslt/xslt/txOutputFormat.h
rename from content/xslt/src/xslt/txPatternOptimizer.cpp
rename to dom/xslt/xslt/txPatternOptimizer.cpp
rename from content/xslt/src/xslt/txPatternOptimizer.h
rename to dom/xslt/xslt/txPatternOptimizer.h
rename from content/xslt/src/xslt/txPatternParser.cpp
rename to dom/xslt/xslt/txPatternParser.cpp
rename from content/xslt/src/xslt/txPatternParser.h
rename to dom/xslt/xslt/txPatternParser.h
rename from content/xslt/src/xslt/txRtfHandler.cpp
rename to dom/xslt/xslt/txRtfHandler.cpp
rename from content/xslt/src/xslt/txRtfHandler.h
rename to dom/xslt/xslt/txRtfHandler.h
rename from content/xslt/src/xslt/txStylesheet.cpp
rename to dom/xslt/xslt/txStylesheet.cpp
rename from content/xslt/src/xslt/txStylesheet.h
rename to dom/xslt/xslt/txStylesheet.h
rename from content/xslt/src/xslt/txStylesheetCompileHandlers.cpp
rename to dom/xslt/xslt/txStylesheetCompileHandlers.cpp
rename from content/xslt/src/xslt/txStylesheetCompileHandlers.h
rename to dom/xslt/xslt/txStylesheetCompileHandlers.h
rename from content/xslt/src/xslt/txStylesheetCompiler.cpp
rename to dom/xslt/xslt/txStylesheetCompiler.cpp
rename from content/xslt/src/xslt/txStylesheetCompiler.h
rename to dom/xslt/xslt/txStylesheetCompiler.h
rename from content/xslt/src/xslt/txTextHandler.cpp
rename to dom/xslt/xslt/txTextHandler.cpp
rename from content/xslt/src/xslt/txTextHandler.h
rename to dom/xslt/xslt/txTextHandler.h
rename from content/xslt/src/xslt/txToplevelItems.cpp
rename to dom/xslt/xslt/txToplevelItems.cpp
rename from content/xslt/src/xslt/txToplevelItems.h
rename to dom/xslt/xslt/txToplevelItems.h
rename from content/xslt/src/xslt/txUnknownHandler.cpp
rename to dom/xslt/xslt/txUnknownHandler.cpp
rename from content/xslt/src/xslt/txUnknownHandler.h
rename to dom/xslt/xslt/txUnknownHandler.h
rename from content/xslt/src/xslt/txVariableMap.h
rename to dom/xslt/xslt/txVariableMap.h
rename from content/xslt/src/xslt/txXMLEventHandler.h
rename to dom/xslt/xslt/txXMLEventHandler.h
rename from content/xslt/src/xslt/txXPathResultComparator.cpp
rename to dom/xslt/xslt/txXPathResultComparator.cpp
rename from content/xslt/src/xslt/txXPathResultComparator.h
rename to dom/xslt/xslt/txXPathResultComparator.h
rename from content/xslt/src/xslt/txXSLTEnvironmentFunctionCall.cpp
rename to dom/xslt/xslt/txXSLTEnvironmentFunctionCall.cpp
rename from content/xslt/src/xslt/txXSLTFunctions.h
rename to dom/xslt/xslt/txXSLTFunctions.h
rename from content/xslt/src/xslt/txXSLTNumber.cpp
rename to dom/xslt/xslt/txXSLTNumber.cpp
rename from content/xslt/src/xslt/txXSLTNumber.h
rename to dom/xslt/xslt/txXSLTNumber.h
rename from content/xslt/src/xslt/txXSLTNumberCounters.cpp
rename to dom/xslt/xslt/txXSLTNumberCounters.cpp
rename from content/xslt/src/xslt/txXSLTPatterns.cpp
rename to dom/xslt/xslt/txXSLTPatterns.cpp
rename from content/xslt/src/xslt/txXSLTPatterns.h
rename to dom/xslt/xslt/txXSLTPatterns.h
rename from content/xslt/src/xslt/txXSLTProcessor.cpp
rename to dom/xslt/xslt/txXSLTProcessor.cpp
rename from content/xslt/src/xslt/txXSLTProcessor.h
rename to dom/xslt/xslt/txXSLTProcessor.h
--- a/layout/build/moz.build
+++ b/layout/build/moz.build
@@ -41,36 +41,36 @@ LOCAL_INCLUDES += [
     '/caps/include',
     '/content/base/src',
     '/content/canvas/src',
     '/content/events/src',
     '/content/html/content/src',
     '/content/html/document/src',
     '/content/svg/content/src',
     '/content/xbl/src',
-    '/content/xslt/src/base',
-    '/content/xslt/src/xml',
-    '/content/xslt/src/xpath',
-    '/content/xslt/src/xslt',
     '/content/xul/content/src',
     '/content/xul/document/src',
     '/content/xul/templates/src',
     '/docshell/base',
     '/dom/audiochannel',
     '/dom/base',
     '/dom/camera',
     '/dom/file',
     '/dom/media',
     '/dom/speakermanager',
     '/dom/src/geolocation',
     '/dom/src/json',
     '/dom/src/jsurl',
     '/dom/src/offline',
     '/dom/src/storage',
     '/dom/telephony',
+    '/dom/xslt/base',
+    '/dom/xslt/xml',
+    '/dom/xslt/xpath',
+    '/dom/xslt/xslt',
     '/editor/composer/src',
     '/editor/libeditor/base',
     '/editor/libeditor/html',
     '/editor/libeditor/text',
     '/editor/txmgr/src',
     '/editor/txtsvc/src',
     '/extensions/cookie',
     '/js/xpconnect/loader',
--- a/testing/crashtest/crashtests.list
+++ b/testing/crashtest/crashtests.list
@@ -10,30 +10,30 @@ include ../../content/canvas/crashtests/
 include ../../content/events/crashtests/crashtests.list
 include ../../content/html/document/crashtests/crashtests.list
 include ../../content/html/content/crashtests/crashtests.list
 include ../../content/smil/crashtests/crashtests.list
 include ../../content/svg/content/src/crashtests/crashtests.list
 include ../../content/xml/content/crashtest/crashtests.list
 include ../../content/xml/document/crashtests/crashtests.list
 include ../../content/xbl/crashtests/crashtests.list
-include ../../content/xslt/crashtests/crashtests.list
 include ../../content/xul/content/crashtests/crashtests.list
 include ../../content/xul/document/crashtests/crashtests.list
 include ../../content/xul/templates/src/crashtests/crashtests.list
 include ../../content/mathml/content/crashtests/crashtests.list
 
 # Bug 868152 - webaudio crash on tegra platform
 skip-if(Android) include ../../content/media/test/crashtests/crashtests.list
 
 include ../../docshell/base/crashtests/crashtests.list
 
 include ../../dom/base/crashtests/crashtests.list
 include ../../dom/bindings/crashtests/crashtests.list
 include ../../dom/indexedDB/crashtests/crashtests.list
+include ../../dom/xslt/crashtests/crashtests.list
 
 # Bug 811873 - mozRTCPeerConnection doesn't support remote browser yet
 skip-if(B2G||browserIsRemote) include ../../dom/media/tests/crashtests/crashtests.list
 
 include ../../dom/src/offline/crashtests/crashtests.list
 include ../../dom/src/jsurl/crashtests/crashtests.list
 
 include ../../editor/crashtests.list