diff --git a/content/base/src/moz.build b/content/base/src/moz.build index da356a949d4..a2d346bf075 100644 --- a/content/base/src/moz.build +++ b/content/base/src/moz.build @@ -200,13 +200,13 @@ LOCAL_INCLUDES += [ '/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', diff --git a/content/moz.build b/content/moz.build index 3d80a388e07..f309f0d44f4 100644 --- a/content/moz.build +++ b/content/moz.build @@ -16,7 +16,6 @@ PARALLEL_DIRS += [ 'xml', 'xul', 'xbl', - 'xslt', ] TEST_TOOL_DIRS += ['test'] diff --git a/content/xslt/moz.build b/content/xslt/moz.build deleted file mode 100644 index 66b7e5b95c5..00000000000 --- 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'] diff --git a/content/xslt/src/moz.build b/content/xslt/src/moz.build deleted file mode 100644 index aafa2b75619..00000000000 --- 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'] diff --git a/dom/bindings/moz.build b/dom/bindings/moz.build index acb65bedc69..86fd49caa49 100644 --- a/dom/bindings/moz.build +++ b/dom/bindings/moz.build @@ -48,8 +48,6 @@ LOCAL_INCLUDES += [ '/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', @@ -60,6 +58,8 @@ LOCAL_INCLUDES += [ '/dom/indexedDB', '/dom/src/geolocation', '/dom/workers', + '/dom/xslt/base', + '/dom/xslt/xpath', '/js/ipc', '/js/xpconnect/src', '/js/xpconnect/wrappers', diff --git a/dom/moz.build b/dom/moz.build index 60aa95f2991..c5c8e229452 100644 --- a/dom/moz.build +++ b/dom/moz.build @@ -76,6 +76,7 @@ PARALLEL_DIRS += [ 'telephony', 'inputmethod', 'webidl', + 'xslt', ] if CONFIG['OS_ARCH'] == 'WINNT': diff --git a/content/xslt/src/base/moz.build b/dom/xslt/base/moz.build similarity index 96% rename from content/xslt/src/base/moz.build rename to dom/xslt/base/moz.build index 80f398f9952..edd0a754733 100644 --- a/content/xslt/src/base/moz.build +++ b/dom/xslt/base/moz.build @@ -15,7 +15,7 @@ UNIFIED_SOURCES += [ FAIL_ON_WARNINGS = True LOCAL_INCLUDES += [ - '../../public', + '..', '../xml', '../xpath', '../xslt', diff --git a/content/xslt/src/base/txCore.h b/dom/xslt/base/txCore.h similarity index 100% rename from content/xslt/src/base/txCore.h rename to dom/xslt/base/txCore.h diff --git a/content/xslt/src/base/txDouble.cpp b/dom/xslt/base/txDouble.cpp similarity index 100% rename from content/xslt/src/base/txDouble.cpp rename to dom/xslt/base/txDouble.cpp diff --git a/content/xslt/src/base/txErrorObserver.h b/dom/xslt/base/txErrorObserver.h similarity index 100% rename from content/xslt/src/base/txErrorObserver.h rename to dom/xslt/base/txErrorObserver.h diff --git a/content/xslt/src/base/txExpandedNameMap.cpp b/dom/xslt/base/txExpandedNameMap.cpp similarity index 100% rename from content/xslt/src/base/txExpandedNameMap.cpp rename to dom/xslt/base/txExpandedNameMap.cpp diff --git a/content/xslt/src/base/txExpandedNameMap.h b/dom/xslt/base/txExpandedNameMap.h similarity index 100% rename from content/xslt/src/base/txExpandedNameMap.h rename to dom/xslt/base/txExpandedNameMap.h diff --git a/content/xslt/src/base/txList.cpp b/dom/xslt/base/txList.cpp similarity index 100% rename from content/xslt/src/base/txList.cpp rename to dom/xslt/base/txList.cpp diff --git a/content/xslt/src/base/txList.h b/dom/xslt/base/txList.h similarity index 100% rename from content/xslt/src/base/txList.h rename to dom/xslt/base/txList.h diff --git a/content/xslt/src/base/txLog.h b/dom/xslt/base/txLog.h similarity index 100% rename from content/xslt/src/base/txLog.h rename to dom/xslt/base/txLog.h diff --git a/content/xslt/src/base/txNamespaceMap.cpp b/dom/xslt/base/txNamespaceMap.cpp similarity index 100% rename from content/xslt/src/base/txNamespaceMap.cpp rename to dom/xslt/base/txNamespaceMap.cpp diff --git a/content/xslt/src/base/txNamespaceMap.h b/dom/xslt/base/txNamespaceMap.h similarity index 100% rename from content/xslt/src/base/txNamespaceMap.h rename to dom/xslt/base/txNamespaceMap.h diff --git a/content/xslt/src/base/txOwningArray.h b/dom/xslt/base/txOwningArray.h similarity index 100% rename from content/xslt/src/base/txOwningArray.h rename to dom/xslt/base/txOwningArray.h diff --git a/content/xslt/src/base/txStack.h b/dom/xslt/base/txStack.h similarity index 100% rename from content/xslt/src/base/txStack.h rename to dom/xslt/base/txStack.h diff --git a/content/xslt/src/base/txStringUtils.h b/dom/xslt/base/txStringUtils.h similarity index 100% rename from content/xslt/src/base/txStringUtils.h rename to dom/xslt/base/txStringUtils.h diff --git a/content/xslt/src/base/txURIUtils.cpp b/dom/xslt/base/txURIUtils.cpp similarity index 100% rename from content/xslt/src/base/txURIUtils.cpp rename to dom/xslt/base/txURIUtils.cpp diff --git a/content/xslt/src/base/txURIUtils.h b/dom/xslt/base/txURIUtils.h similarity index 100% rename from content/xslt/src/base/txURIUtils.h rename to dom/xslt/base/txURIUtils.h diff --git a/content/xslt/crashtests/111994.xml b/dom/xslt/crashtests/111994.xml similarity index 100% rename from content/xslt/crashtests/111994.xml rename to dom/xslt/crashtests/111994.xml diff --git a/content/xslt/crashtests/111994.xsl b/dom/xslt/crashtests/111994.xsl similarity index 100% rename from content/xslt/crashtests/111994.xsl rename to dom/xslt/crashtests/111994.xsl diff --git a/content/xslt/crashtests/182460-select.xml b/dom/xslt/crashtests/182460-select.xml similarity index 100% rename from content/xslt/crashtests/182460-select.xml rename to dom/xslt/crashtests/182460-select.xml diff --git a/content/xslt/crashtests/182460-selects.xsl b/dom/xslt/crashtests/182460-selects.xsl similarity index 100% rename from content/xslt/crashtests/182460-selects.xsl rename to dom/xslt/crashtests/182460-selects.xsl diff --git a/content/xslt/crashtests/182460-table.xhtml b/dom/xslt/crashtests/182460-table.xhtml similarity index 100% rename from content/xslt/crashtests/182460-table.xhtml rename to dom/xslt/crashtests/182460-table.xhtml diff --git a/content/xslt/crashtests/226425.xml b/dom/xslt/crashtests/226425.xml similarity index 100% rename from content/xslt/crashtests/226425.xml rename to dom/xslt/crashtests/226425.xml diff --git a/content/xslt/crashtests/226425.xsl b/dom/xslt/crashtests/226425.xsl similarity index 100% rename from content/xslt/crashtests/226425.xsl rename to dom/xslt/crashtests/226425.xsl diff --git a/content/xslt/crashtests/406106-1.html b/dom/xslt/crashtests/406106-1.html similarity index 100% rename from content/xslt/crashtests/406106-1.html rename to dom/xslt/crashtests/406106-1.html diff --git a/content/xslt/crashtests/483444.xml b/dom/xslt/crashtests/483444.xml similarity index 100% rename from content/xslt/crashtests/483444.xml rename to dom/xslt/crashtests/483444.xml diff --git a/content/xslt/crashtests/485217.xml b/dom/xslt/crashtests/485217.xml similarity index 100% rename from content/xslt/crashtests/485217.xml rename to dom/xslt/crashtests/485217.xml diff --git a/content/xslt/crashtests/485217.xsl b/dom/xslt/crashtests/485217.xsl similarity index 100% rename from content/xslt/crashtests/485217.xsl rename to dom/xslt/crashtests/485217.xsl diff --git a/content/xslt/crashtests/485286.xml b/dom/xslt/crashtests/485286.xml similarity index 100% rename from content/xslt/crashtests/485286.xml rename to dom/xslt/crashtests/485286.xml diff --git a/content/xslt/crashtests/528300.xml b/dom/xslt/crashtests/528300.xml similarity index 100% rename from content/xslt/crashtests/528300.xml rename to dom/xslt/crashtests/528300.xml diff --git a/content/xslt/crashtests/528488.xml b/dom/xslt/crashtests/528488.xml similarity index 100% rename from content/xslt/crashtests/528488.xml rename to dom/xslt/crashtests/528488.xml diff --git a/content/xslt/crashtests/528963.xml b/dom/xslt/crashtests/528963.xml similarity index 100% rename from content/xslt/crashtests/528963.xml rename to dom/xslt/crashtests/528963.xml diff --git a/content/xslt/crashtests/545927.html b/dom/xslt/crashtests/545927.html similarity index 100% rename from content/xslt/crashtests/545927.html rename to dom/xslt/crashtests/545927.html diff --git a/content/xslt/crashtests/601543.html b/dom/xslt/crashtests/601543.html similarity index 100% rename from content/xslt/crashtests/601543.html rename to dom/xslt/crashtests/601543.html diff --git a/content/xslt/crashtests/602115.html b/dom/xslt/crashtests/602115.html similarity index 100% rename from content/xslt/crashtests/602115.html rename to dom/xslt/crashtests/602115.html diff --git a/content/xslt/crashtests/603844.html b/dom/xslt/crashtests/603844.html similarity index 100% rename from content/xslt/crashtests/603844.html rename to dom/xslt/crashtests/603844.html diff --git a/content/xslt/crashtests/667315.xml b/dom/xslt/crashtests/667315.xml similarity index 100% rename from content/xslt/crashtests/667315.xml rename to dom/xslt/crashtests/667315.xml diff --git a/content/xslt/crashtests/91332.xml b/dom/xslt/crashtests/91332.xml similarity index 100% rename from content/xslt/crashtests/91332.xml rename to dom/xslt/crashtests/91332.xml diff --git a/content/xslt/crashtests/91332.xsl b/dom/xslt/crashtests/91332.xsl similarity index 100% rename from content/xslt/crashtests/91332.xsl rename to dom/xslt/crashtests/91332.xsl diff --git a/content/xslt/crashtests/crashtests.list b/dom/xslt/crashtests/crashtests.list similarity index 100% rename from content/xslt/crashtests/crashtests.list rename to dom/xslt/crashtests/crashtests.list diff --git a/content/xslt/public/moz.build b/dom/xslt/moz.build similarity index 82% rename from content/xslt/public/moz.build rename to dom/xslt/moz.build index b8093c78ec1..a9ea0a9196c 100644 --- a/content/xslt/public/moz.build +++ b/dom/xslt/moz.build @@ -20,3 +20,14 @@ EXPORTS += [ 'nsIDocumentTransformer.h', ] +PARALLEL_DIRS += [ + 'base', + 'xml', + 'xpath', + 'xslt', +] + +TEST_DIRS += [ + 'tests/buster', + 'tests/mochitest', +] diff --git a/content/xslt/public/nsIDocumentTransformer.h b/dom/xslt/nsIDocumentTransformer.h similarity index 100% rename from content/xslt/public/nsIDocumentTransformer.h rename to dom/xslt/nsIDocumentTransformer.h diff --git a/content/xslt/public/nsIXSLTException.idl b/dom/xslt/nsIXSLTException.idl similarity index 100% rename from content/xslt/public/nsIXSLTException.idl rename to dom/xslt/nsIXSLTException.idl diff --git a/content/xslt/public/nsIXSLTProcessor.idl b/dom/xslt/nsIXSLTProcessor.idl similarity index 100% rename from content/xslt/public/nsIXSLTProcessor.idl rename to dom/xslt/nsIXSLTProcessor.idl diff --git a/content/xslt/public/nsIXSLTProcessorPrivate.idl b/dom/xslt/nsIXSLTProcessorPrivate.idl similarity index 100% rename from content/xslt/public/nsIXSLTProcessorPrivate.idl rename to dom/xslt/nsIXSLTProcessorPrivate.idl diff --git a/content/xslt/tests/XSLTMark/XSLTMark-static.js b/dom/xslt/tests/XSLTMark/XSLTMark-static.js similarity index 100% rename from content/xslt/tests/XSLTMark/XSLTMark-static.js rename to dom/xslt/tests/XSLTMark/XSLTMark-static.js diff --git a/content/xslt/tests/XSLTMark/XSLTMark-test.js b/dom/xslt/tests/XSLTMark/XSLTMark-test.js similarity index 100% rename from content/xslt/tests/XSLTMark/XSLTMark-test.js rename to dom/xslt/tests/XSLTMark/XSLTMark-test.js diff --git a/content/xslt/tests/XSLTMark/XSLTMark-view.js b/dom/xslt/tests/XSLTMark/XSLTMark-view.js similarity index 100% rename from content/xslt/tests/XSLTMark/XSLTMark-view.js rename to dom/xslt/tests/XSLTMark/XSLTMark-view.js diff --git a/content/xslt/tests/XSLTMark/XSLTMark.css b/dom/xslt/tests/XSLTMark/XSLTMark.css similarity index 100% rename from content/xslt/tests/XSLTMark/XSLTMark.css rename to dom/xslt/tests/XSLTMark/XSLTMark.css diff --git a/content/xslt/tests/XSLTMark/XSLTMark.xul b/dom/xslt/tests/XSLTMark/XSLTMark.xul similarity index 100% rename from content/xslt/tests/XSLTMark/XSLTMark.xul rename to dom/xslt/tests/XSLTMark/XSLTMark.xul diff --git a/content/xslt/tests/buster/DiffDOM.js b/dom/xslt/tests/buster/DiffDOM.js similarity index 100% rename from content/xslt/tests/buster/DiffDOM.js rename to dom/xslt/tests/buster/DiffDOM.js diff --git a/content/xslt/tests/buster/DumpDOM.js b/dom/xslt/tests/buster/DumpDOM.js similarity index 100% rename from content/xslt/tests/buster/DumpDOM.js rename to dom/xslt/tests/buster/DumpDOM.js diff --git a/content/xslt/tests/buster/ReadMe b/dom/xslt/tests/buster/ReadMe similarity index 100% rename from content/xslt/tests/buster/ReadMe rename to dom/xslt/tests/buster/ReadMe diff --git a/content/xslt/tests/buster/buster-files.js b/dom/xslt/tests/buster/buster-files.js similarity index 100% rename from content/xslt/tests/buster/buster-files.js rename to dom/xslt/tests/buster/buster-files.js diff --git a/content/xslt/tests/buster/buster-handlers.js b/dom/xslt/tests/buster/buster-handlers.js similarity index 100% rename from content/xslt/tests/buster/buster-handlers.js rename to dom/xslt/tests/buster/buster-handlers.js diff --git a/content/xslt/tests/buster/buster-statics.js b/dom/xslt/tests/buster/buster-statics.js similarity index 100% rename from content/xslt/tests/buster/buster-statics.js rename to dom/xslt/tests/buster/buster-statics.js diff --git a/content/xslt/tests/buster/buster-test.js b/dom/xslt/tests/buster/buster-test.js similarity index 100% rename from content/xslt/tests/buster/buster-test.js rename to dom/xslt/tests/buster/buster-test.js diff --git a/content/xslt/tests/buster/buster-view.js b/dom/xslt/tests/buster/buster-view.js similarity index 100% rename from content/xslt/tests/buster/buster-view.js rename to dom/xslt/tests/buster/buster-view.js diff --git a/content/xslt/tests/buster/buster.css b/dom/xslt/tests/buster/buster.css similarity index 100% rename from content/xslt/tests/buster/buster.css rename to dom/xslt/tests/buster/buster.css diff --git a/content/xslt/tests/buster/buster.xul b/dom/xslt/tests/buster/buster.xul similarity index 100% rename from content/xslt/tests/buster/buster.xul rename to dom/xslt/tests/buster/buster.xul diff --git a/content/xslt/tests/buster/helper/generate-rdf.pl b/dom/xslt/tests/buster/helper/generate-rdf.pl similarity index 100% rename from content/xslt/tests/buster/helper/generate-rdf.pl rename to dom/xslt/tests/buster/helper/generate-rdf.pl diff --git a/content/xslt/tests/buster/install.js b/dom/xslt/tests/buster/install.js similarity index 100% rename from content/xslt/tests/buster/install.js rename to dom/xslt/tests/buster/install.js diff --git a/content/xslt/tests/buster/jar.mn b/dom/xslt/tests/buster/jar.mn similarity index 100% rename from content/xslt/tests/buster/jar.mn rename to dom/xslt/tests/buster/jar.mn diff --git a/content/xslt/tests/buster/moz.build b/dom/xslt/tests/buster/moz.build similarity index 100% rename from content/xslt/tests/buster/moz.build rename to dom/xslt/tests/buster/moz.build diff --git a/content/xslt/tests/buster/result-inspector.xul b/dom/xslt/tests/buster/result-inspector.xul similarity index 100% rename from content/xslt/tests/buster/result-inspector.xul rename to dom/xslt/tests/buster/result-inspector.xul diff --git a/content/xslt/tests/buster/result-view.css b/dom/xslt/tests/buster/result-view.css similarity index 100% rename from content/xslt/tests/buster/result-view.css rename to dom/xslt/tests/buster/result-view.css diff --git a/content/xslt/tests/buster/result-view.js b/dom/xslt/tests/buster/result-view.js similarity index 100% rename from content/xslt/tests/buster/result-view.js rename to dom/xslt/tests/buster/result-view.js diff --git a/content/xslt/tests/buster/result-view.xul b/dom/xslt/tests/buster/result-view.xul similarity index 100% rename from content/xslt/tests/buster/result-view.xul rename to dom/xslt/tests/buster/result-view.xul diff --git a/content/xslt/tests/buster/xslt-qa-overlay.js b/dom/xslt/tests/buster/xslt-qa-overlay.js similarity index 100% rename from content/xslt/tests/buster/xslt-qa-overlay.js rename to dom/xslt/tests/buster/xslt-qa-overlay.js diff --git a/content/xslt/tests/buster/xslt-qa-overlay.xul b/dom/xslt/tests/buster/xslt-qa-overlay.xul similarity index 100% rename from content/xslt/tests/buster/xslt-qa-overlay.xul rename to dom/xslt/tests/buster/xslt-qa-overlay.xul diff --git a/content/xslt/tests/mochitest/mochitest.ini b/dom/xslt/tests/mochitest/mochitest.ini similarity index 100% rename from content/xslt/tests/mochitest/mochitest.ini rename to dom/xslt/tests/mochitest/mochitest.ini diff --git a/content/xslt/tests/mochitest/moz.build b/dom/xslt/tests/mochitest/moz.build similarity index 100% rename from content/xslt/tests/mochitest/moz.build rename to dom/xslt/tests/mochitest/moz.build diff --git a/content/xslt/tests/mochitest/test_bug319374.xhtml b/dom/xslt/tests/mochitest/test_bug319374.xhtml similarity index 100% rename from content/xslt/tests/mochitest/test_bug319374.xhtml rename to dom/xslt/tests/mochitest/test_bug319374.xhtml diff --git a/content/xslt/tests/mochitest/test_bug427060.html b/dom/xslt/tests/mochitest/test_bug427060.html similarity index 100% rename from content/xslt/tests/mochitest/test_bug427060.html rename to dom/xslt/tests/mochitest/test_bug427060.html diff --git a/content/xslt/tests/mochitest/test_bug440974.html b/dom/xslt/tests/mochitest/test_bug440974.html similarity index 100% rename from content/xslt/tests/mochitest/test_bug440974.html rename to dom/xslt/tests/mochitest/test_bug440974.html diff --git a/content/xslt/tests/mochitest/test_bug453441.html b/dom/xslt/tests/mochitest/test_bug453441.html similarity index 100% rename from content/xslt/tests/mochitest/test_bug453441.html rename to dom/xslt/tests/mochitest/test_bug453441.html diff --git a/content/xslt/tests/mochitest/test_bug468208.html b/dom/xslt/tests/mochitest/test_bug468208.html similarity index 100% rename from content/xslt/tests/mochitest/test_bug468208.html rename to dom/xslt/tests/mochitest/test_bug468208.html diff --git a/content/xslt/tests/mochitest/test_bug511487.html b/dom/xslt/tests/mochitest/test_bug511487.html similarity index 100% rename from content/xslt/tests/mochitest/test_bug511487.html rename to dom/xslt/tests/mochitest/test_bug511487.html diff --git a/content/xslt/tests/mochitest/test_bug551412.html b/dom/xslt/tests/mochitest/test_bug551412.html similarity index 100% rename from content/xslt/tests/mochitest/test_bug551412.html rename to dom/xslt/tests/mochitest/test_bug551412.html diff --git a/content/xslt/tests/mochitest/test_bug551654.html b/dom/xslt/tests/mochitest/test_bug551654.html similarity index 100% rename from content/xslt/tests/mochitest/test_bug551654.html rename to dom/xslt/tests/mochitest/test_bug551654.html diff --git a/content/xslt/tests/mochitest/test_bug566629.html b/dom/xslt/tests/mochitest/test_bug566629.html similarity index 100% rename from content/xslt/tests/mochitest/test_bug566629.html rename to dom/xslt/tests/mochitest/test_bug566629.html diff --git a/content/xslt/tests/mochitest/test_bug566629.xhtml b/dom/xslt/tests/mochitest/test_bug566629.xhtml similarity index 100% rename from content/xslt/tests/mochitest/test_bug566629.xhtml rename to dom/xslt/tests/mochitest/test_bug566629.xhtml diff --git a/content/xslt/tests/mochitest/test_bug603159.html b/dom/xslt/tests/mochitest/test_bug603159.html similarity index 100% rename from content/xslt/tests/mochitest/test_bug603159.html rename to dom/xslt/tests/mochitest/test_bug603159.html diff --git a/content/xslt/tests/mochitest/test_bug616774.html b/dom/xslt/tests/mochitest/test_bug616774.html similarity index 100% rename from content/xslt/tests/mochitest/test_bug616774.html rename to dom/xslt/tests/mochitest/test_bug616774.html diff --git a/content/xslt/tests/mochitest/test_bug667315.html b/dom/xslt/tests/mochitest/test_bug667315.html similarity index 100% rename from content/xslt/tests/mochitest/test_bug667315.html rename to dom/xslt/tests/mochitest/test_bug667315.html diff --git a/content/xslt/tests/mochitest/test_exslt_regex.html b/dom/xslt/tests/mochitest/test_exslt_regex.html similarity index 100% rename from content/xslt/tests/mochitest/test_exslt_regex.html rename to dom/xslt/tests/mochitest/test_exslt_regex.html diff --git a/content/xslt/public/txIEXSLTRegExFunctions.idl b/dom/xslt/txIEXSLTRegExFunctions.idl similarity index 100% rename from content/xslt/public/txIEXSLTRegExFunctions.idl rename to dom/xslt/txIEXSLTRegExFunctions.idl diff --git a/content/xslt/public/txIFunctionEvaluationContext.idl b/dom/xslt/txIFunctionEvaluationContext.idl similarity index 100% rename from content/xslt/public/txIFunctionEvaluationContext.idl rename to dom/xslt/txIFunctionEvaluationContext.idl diff --git a/content/xslt/public/txINodeSet.idl b/dom/xslt/txINodeSet.idl similarity index 100% rename from content/xslt/public/txINodeSet.idl rename to dom/xslt/txINodeSet.idl diff --git a/content/xslt/public/txIXPathObject.idl b/dom/xslt/txIXPathObject.idl similarity index 100% rename from content/xslt/public/txIXPathObject.idl rename to dom/xslt/txIXPathObject.idl diff --git a/content/xslt/src/xml/moz.build b/dom/xslt/xml/moz.build similarity index 100% rename from content/xslt/src/xml/moz.build rename to dom/xslt/xml/moz.build diff --git a/content/xslt/src/xml/txXMLParser.cpp b/dom/xslt/xml/txXMLParser.cpp similarity index 100% rename from content/xslt/src/xml/txXMLParser.cpp rename to dom/xslt/xml/txXMLParser.cpp diff --git a/content/xslt/src/xml/txXMLParser.h b/dom/xslt/xml/txXMLParser.h similarity index 100% rename from content/xslt/src/xml/txXMLParser.h rename to dom/xslt/xml/txXMLParser.h diff --git a/content/xslt/src/xml/txXMLUtils.cpp b/dom/xslt/xml/txXMLUtils.cpp similarity index 100% rename from content/xslt/src/xml/txXMLUtils.cpp rename to dom/xslt/xml/txXMLUtils.cpp diff --git a/content/xslt/src/xml/txXMLUtils.h b/dom/xslt/xml/txXMLUtils.h similarity index 100% rename from content/xslt/src/xml/txXMLUtils.h rename to dom/xslt/xml/txXMLUtils.h diff --git a/content/xslt/src/xpath/XPathEvaluator.cpp b/dom/xslt/xpath/XPathEvaluator.cpp similarity index 100% rename from content/xslt/src/xpath/XPathEvaluator.cpp rename to dom/xslt/xpath/XPathEvaluator.cpp diff --git a/content/xslt/src/xpath/XPathEvaluator.h b/dom/xslt/xpath/XPathEvaluator.h similarity index 100% rename from content/xslt/src/xpath/XPathEvaluator.h rename to dom/xslt/xpath/XPathEvaluator.h diff --git a/content/xslt/src/xpath/moz.build b/dom/xslt/xpath/moz.build similarity index 100% rename from content/xslt/src/xpath/moz.build rename to dom/xslt/xpath/moz.build diff --git a/content/xslt/src/xpath/nsXPathExpression.cpp b/dom/xslt/xpath/nsXPathExpression.cpp similarity index 100% rename from content/xslt/src/xpath/nsXPathExpression.cpp rename to dom/xslt/xpath/nsXPathExpression.cpp diff --git a/content/xslt/src/xpath/nsXPathExpression.h b/dom/xslt/xpath/nsXPathExpression.h similarity index 100% rename from content/xslt/src/xpath/nsXPathExpression.h rename to dom/xslt/xpath/nsXPathExpression.h diff --git a/content/xslt/src/xpath/nsXPathNSResolver.cpp b/dom/xslt/xpath/nsXPathNSResolver.cpp similarity index 100% rename from content/xslt/src/xpath/nsXPathNSResolver.cpp rename to dom/xslt/xpath/nsXPathNSResolver.cpp diff --git a/content/xslt/src/xpath/nsXPathNSResolver.h b/dom/xslt/xpath/nsXPathNSResolver.h similarity index 100% rename from content/xslt/src/xpath/nsXPathNSResolver.h rename to dom/xslt/xpath/nsXPathNSResolver.h diff --git a/content/xslt/src/xpath/nsXPathResult.cpp b/dom/xslt/xpath/nsXPathResult.cpp similarity index 100% rename from content/xslt/src/xpath/nsXPathResult.cpp rename to dom/xslt/xpath/nsXPathResult.cpp diff --git a/content/xslt/src/xpath/nsXPathResult.h b/dom/xslt/xpath/nsXPathResult.h similarity index 100% rename from content/xslt/src/xpath/nsXPathResult.h rename to dom/xslt/xpath/nsXPathResult.h diff --git a/content/xslt/src/xpath/txBooleanExpr.cpp b/dom/xslt/xpath/txBooleanExpr.cpp similarity index 100% rename from content/xslt/src/xpath/txBooleanExpr.cpp rename to dom/xslt/xpath/txBooleanExpr.cpp diff --git a/content/xslt/src/xpath/txBooleanResult.cpp b/dom/xslt/xpath/txBooleanResult.cpp similarity index 100% rename from content/xslt/src/xpath/txBooleanResult.cpp rename to dom/xslt/xpath/txBooleanResult.cpp diff --git a/content/xslt/src/xpath/txCoreFunctionCall.cpp b/dom/xslt/xpath/txCoreFunctionCall.cpp similarity index 100% rename from content/xslt/src/xpath/txCoreFunctionCall.cpp rename to dom/xslt/xpath/txCoreFunctionCall.cpp diff --git a/content/xslt/src/xpath/txErrorExpr.cpp b/dom/xslt/xpath/txErrorExpr.cpp similarity index 100% rename from content/xslt/src/xpath/txErrorExpr.cpp rename to dom/xslt/xpath/txErrorExpr.cpp diff --git a/content/xslt/src/xpath/txExpr.cpp b/dom/xslt/xpath/txExpr.cpp similarity index 100% rename from content/xslt/src/xpath/txExpr.cpp rename to dom/xslt/xpath/txExpr.cpp diff --git a/content/xslt/src/xpath/txExpr.h b/dom/xslt/xpath/txExpr.h similarity index 100% rename from content/xslt/src/xpath/txExpr.h rename to dom/xslt/xpath/txExpr.h diff --git a/content/xslt/src/xpath/txExprLexer.cpp b/dom/xslt/xpath/txExprLexer.cpp similarity index 100% rename from content/xslt/src/xpath/txExprLexer.cpp rename to dom/xslt/xpath/txExprLexer.cpp diff --git a/content/xslt/src/xpath/txExprLexer.h b/dom/xslt/xpath/txExprLexer.h similarity index 100% rename from content/xslt/src/xpath/txExprLexer.h rename to dom/xslt/xpath/txExprLexer.h diff --git a/content/xslt/src/xpath/txExprParser.cpp b/dom/xslt/xpath/txExprParser.cpp similarity index 100% rename from content/xslt/src/xpath/txExprParser.cpp rename to dom/xslt/xpath/txExprParser.cpp diff --git a/content/xslt/src/xpath/txExprParser.h b/dom/xslt/xpath/txExprParser.h similarity index 100% rename from content/xslt/src/xpath/txExprParser.h rename to dom/xslt/xpath/txExprParser.h diff --git a/content/xslt/src/xpath/txExprResult.h b/dom/xslt/xpath/txExprResult.h similarity index 100% rename from content/xslt/src/xpath/txExprResult.h rename to dom/xslt/xpath/txExprResult.h diff --git a/content/xslt/src/xpath/txFilterExpr.cpp b/dom/xslt/xpath/txFilterExpr.cpp similarity index 100% rename from content/xslt/src/xpath/txFilterExpr.cpp rename to dom/xslt/xpath/txFilterExpr.cpp diff --git a/content/xslt/src/xpath/txForwardContext.cpp b/dom/xslt/xpath/txForwardContext.cpp similarity index 100% rename from content/xslt/src/xpath/txForwardContext.cpp rename to dom/xslt/xpath/txForwardContext.cpp diff --git a/content/xslt/src/xpath/txForwardContext.h b/dom/xslt/xpath/txForwardContext.h similarity index 100% rename from content/xslt/src/xpath/txForwardContext.h rename to dom/xslt/xpath/txForwardContext.h diff --git a/content/xslt/src/xpath/txFunctionCall.cpp b/dom/xslt/xpath/txFunctionCall.cpp similarity index 100% rename from content/xslt/src/xpath/txFunctionCall.cpp rename to dom/xslt/xpath/txFunctionCall.cpp diff --git a/content/xslt/src/xpath/txIXPathContext.h b/dom/xslt/xpath/txIXPathContext.h similarity index 100% rename from content/xslt/src/xpath/txIXPathContext.h rename to dom/xslt/xpath/txIXPathContext.h diff --git a/content/xslt/src/xpath/txLiteralExpr.cpp b/dom/xslt/xpath/txLiteralExpr.cpp similarity index 100% rename from content/xslt/src/xpath/txLiteralExpr.cpp rename to dom/xslt/xpath/txLiteralExpr.cpp diff --git a/content/xslt/src/xpath/txLocationStep.cpp b/dom/xslt/xpath/txLocationStep.cpp similarity index 100% rename from content/xslt/src/xpath/txLocationStep.cpp rename to dom/xslt/xpath/txLocationStep.cpp diff --git a/content/xslt/src/xpath/txMozillaXPathTreeWalker.cpp b/dom/xslt/xpath/txMozillaXPathTreeWalker.cpp similarity index 100% rename from content/xslt/src/xpath/txMozillaXPathTreeWalker.cpp rename to dom/xslt/xpath/txMozillaXPathTreeWalker.cpp diff --git a/content/xslt/src/xpath/txNameTest.cpp b/dom/xslt/xpath/txNameTest.cpp similarity index 100% rename from content/xslt/src/xpath/txNameTest.cpp rename to dom/xslt/xpath/txNameTest.cpp diff --git a/content/xslt/src/xpath/txNamedAttributeStep.cpp b/dom/xslt/xpath/txNamedAttributeStep.cpp similarity index 100% rename from content/xslt/src/xpath/txNamedAttributeStep.cpp rename to dom/xslt/xpath/txNamedAttributeStep.cpp diff --git a/content/xslt/src/xpath/txNodeSet.cpp b/dom/xslt/xpath/txNodeSet.cpp similarity index 100% rename from content/xslt/src/xpath/txNodeSet.cpp rename to dom/xslt/xpath/txNodeSet.cpp diff --git a/content/xslt/src/xpath/txNodeSet.h b/dom/xslt/xpath/txNodeSet.h similarity index 100% rename from content/xslt/src/xpath/txNodeSet.h rename to dom/xslt/xpath/txNodeSet.h diff --git a/content/xslt/src/xpath/txNodeSetAdaptor.cpp b/dom/xslt/xpath/txNodeSetAdaptor.cpp similarity index 100% rename from content/xslt/src/xpath/txNodeSetAdaptor.cpp rename to dom/xslt/xpath/txNodeSetAdaptor.cpp diff --git a/content/xslt/src/xpath/txNodeSetAdaptor.h b/dom/xslt/xpath/txNodeSetAdaptor.h similarity index 100% rename from content/xslt/src/xpath/txNodeSetAdaptor.h rename to dom/xslt/xpath/txNodeSetAdaptor.h diff --git a/content/xslt/src/xpath/txNodeSetContext.cpp b/dom/xslt/xpath/txNodeSetContext.cpp similarity index 100% rename from content/xslt/src/xpath/txNodeSetContext.cpp rename to dom/xslt/xpath/txNodeSetContext.cpp diff --git a/content/xslt/src/xpath/txNodeSetContext.h b/dom/xslt/xpath/txNodeSetContext.h similarity index 100% rename from content/xslt/src/xpath/txNodeSetContext.h rename to dom/xslt/xpath/txNodeSetContext.h diff --git a/content/xslt/src/xpath/txNodeTypeTest.cpp b/dom/xslt/xpath/txNodeTypeTest.cpp similarity index 100% rename from content/xslt/src/xpath/txNodeTypeTest.cpp rename to dom/xslt/xpath/txNodeTypeTest.cpp diff --git a/content/xslt/src/xpath/txNumberExpr.cpp b/dom/xslt/xpath/txNumberExpr.cpp similarity index 100% rename from content/xslt/src/xpath/txNumberExpr.cpp rename to dom/xslt/xpath/txNumberExpr.cpp diff --git a/content/xslt/src/xpath/txNumberResult.cpp b/dom/xslt/xpath/txNumberResult.cpp similarity index 100% rename from content/xslt/src/xpath/txNumberResult.cpp rename to dom/xslt/xpath/txNumberResult.cpp diff --git a/content/xslt/src/xpath/txPathExpr.cpp b/dom/xslt/xpath/txPathExpr.cpp similarity index 100% rename from content/xslt/src/xpath/txPathExpr.cpp rename to dom/xslt/xpath/txPathExpr.cpp diff --git a/content/xslt/src/xpath/txPredicateList.cpp b/dom/xslt/xpath/txPredicateList.cpp similarity index 100% rename from content/xslt/src/xpath/txPredicateList.cpp rename to dom/xslt/xpath/txPredicateList.cpp diff --git a/content/xslt/src/xpath/txPredicatedNodeTest.cpp b/dom/xslt/xpath/txPredicatedNodeTest.cpp similarity index 100% rename from content/xslt/src/xpath/txPredicatedNodeTest.cpp rename to dom/xslt/xpath/txPredicatedNodeTest.cpp diff --git a/content/xslt/src/xpath/txRelationalExpr.cpp b/dom/xslt/xpath/txRelationalExpr.cpp similarity index 100% rename from content/xslt/src/xpath/txRelationalExpr.cpp rename to dom/xslt/xpath/txRelationalExpr.cpp diff --git a/content/xslt/src/xpath/txResultRecycler.cpp b/dom/xslt/xpath/txResultRecycler.cpp similarity index 100% rename from content/xslt/src/xpath/txResultRecycler.cpp rename to dom/xslt/xpath/txResultRecycler.cpp diff --git a/content/xslt/src/xpath/txResultRecycler.h b/dom/xslt/xpath/txResultRecycler.h similarity index 100% rename from content/xslt/src/xpath/txResultRecycler.h rename to dom/xslt/xpath/txResultRecycler.h diff --git a/content/xslt/src/xpath/txRootExpr.cpp b/dom/xslt/xpath/txRootExpr.cpp similarity index 100% rename from content/xslt/src/xpath/txRootExpr.cpp rename to dom/xslt/xpath/txRootExpr.cpp diff --git a/content/xslt/src/xpath/txSingleNodeContext.h b/dom/xslt/xpath/txSingleNodeContext.h similarity index 100% rename from content/xslt/src/xpath/txSingleNodeContext.h rename to dom/xslt/xpath/txSingleNodeContext.h diff --git a/content/xslt/src/xpath/txStringResult.cpp b/dom/xslt/xpath/txStringResult.cpp similarity index 100% rename from content/xslt/src/xpath/txStringResult.cpp rename to dom/xslt/xpath/txStringResult.cpp diff --git a/content/xslt/src/xpath/txUnaryExpr.cpp b/dom/xslt/xpath/txUnaryExpr.cpp similarity index 100% rename from content/xslt/src/xpath/txUnaryExpr.cpp rename to dom/xslt/xpath/txUnaryExpr.cpp diff --git a/content/xslt/src/xpath/txUnionExpr.cpp b/dom/xslt/xpath/txUnionExpr.cpp similarity index 100% rename from content/xslt/src/xpath/txUnionExpr.cpp rename to dom/xslt/xpath/txUnionExpr.cpp diff --git a/content/xslt/src/xpath/txUnionNodeTest.cpp b/dom/xslt/xpath/txUnionNodeTest.cpp similarity index 100% rename from content/xslt/src/xpath/txUnionNodeTest.cpp rename to dom/xslt/xpath/txUnionNodeTest.cpp diff --git a/content/xslt/src/xpath/txVariableRefExpr.cpp b/dom/xslt/xpath/txVariableRefExpr.cpp similarity index 100% rename from content/xslt/src/xpath/txVariableRefExpr.cpp rename to dom/xslt/xpath/txVariableRefExpr.cpp diff --git a/content/xslt/src/xpath/txXPCOMExtensionFunction.cpp b/dom/xslt/xpath/txXPCOMExtensionFunction.cpp similarity index 100% rename from content/xslt/src/xpath/txXPCOMExtensionFunction.cpp rename to dom/xslt/xpath/txXPCOMExtensionFunction.cpp diff --git a/content/xslt/src/xpath/txXPathNode.h b/dom/xslt/xpath/txXPathNode.h similarity index 100% rename from content/xslt/src/xpath/txXPathNode.h rename to dom/xslt/xpath/txXPathNode.h diff --git a/content/xslt/src/xpath/txXPathObjectAdaptor.h b/dom/xslt/xpath/txXPathObjectAdaptor.h similarity index 100% rename from content/xslt/src/xpath/txXPathObjectAdaptor.h rename to dom/xslt/xpath/txXPathObjectAdaptor.h diff --git a/content/xslt/src/xpath/txXPathOptimizer.cpp b/dom/xslt/xpath/txXPathOptimizer.cpp similarity index 100% rename from content/xslt/src/xpath/txXPathOptimizer.cpp rename to dom/xslt/xpath/txXPathOptimizer.cpp diff --git a/content/xslt/src/xpath/txXPathOptimizer.h b/dom/xslt/xpath/txXPathOptimizer.h similarity index 100% rename from content/xslt/src/xpath/txXPathOptimizer.h rename to dom/xslt/xpath/txXPathOptimizer.h diff --git a/content/xslt/src/xpath/txXPathTreeWalker.h b/dom/xslt/xpath/txXPathTreeWalker.h similarity index 100% rename from content/xslt/src/xpath/txXPathTreeWalker.h rename to dom/xslt/xpath/txXPathTreeWalker.h diff --git a/content/xslt/src/xslt/moz.build b/dom/xslt/xslt/moz.build similarity index 100% rename from content/xslt/src/xslt/moz.build rename to dom/xslt/xslt/moz.build diff --git a/content/xslt/src/xslt/txBufferingHandler.cpp b/dom/xslt/xslt/txBufferingHandler.cpp similarity index 100% rename from content/xslt/src/xslt/txBufferingHandler.cpp rename to dom/xslt/xslt/txBufferingHandler.cpp diff --git a/content/xslt/src/xslt/txBufferingHandler.h b/dom/xslt/xslt/txBufferingHandler.h similarity index 100% rename from content/xslt/src/xslt/txBufferingHandler.h rename to dom/xslt/xslt/txBufferingHandler.h diff --git a/content/xslt/src/xslt/txCurrentFunctionCall.cpp b/dom/xslt/xslt/txCurrentFunctionCall.cpp similarity index 100% rename from content/xslt/src/xslt/txCurrentFunctionCall.cpp rename to dom/xslt/xslt/txCurrentFunctionCall.cpp diff --git a/content/xslt/src/xslt/txDocumentFunctionCall.cpp b/dom/xslt/xslt/txDocumentFunctionCall.cpp similarity index 100% rename from content/xslt/src/xslt/txDocumentFunctionCall.cpp rename to dom/xslt/xslt/txDocumentFunctionCall.cpp diff --git a/content/xslt/src/xslt/txEXSLTFunctions.cpp b/dom/xslt/xslt/txEXSLTFunctions.cpp similarity index 100% rename from content/xslt/src/xslt/txEXSLTFunctions.cpp rename to dom/xslt/xslt/txEXSLTFunctions.cpp diff --git a/content/xslt/src/xslt/txEXSLTRegExFunctions.js b/dom/xslt/xslt/txEXSLTRegExFunctions.js similarity index 100% rename from content/xslt/src/xslt/txEXSLTRegExFunctions.js rename to dom/xslt/xslt/txEXSLTRegExFunctions.js diff --git a/content/xslt/src/xslt/txEXSLTRegExFunctions.manifest b/dom/xslt/xslt/txEXSLTRegExFunctions.manifest similarity index 100% rename from content/xslt/src/xslt/txEXSLTRegExFunctions.manifest rename to dom/xslt/xslt/txEXSLTRegExFunctions.manifest diff --git a/content/xslt/src/xslt/txExecutionState.cpp b/dom/xslt/xslt/txExecutionState.cpp similarity index 100% rename from content/xslt/src/xslt/txExecutionState.cpp rename to dom/xslt/xslt/txExecutionState.cpp diff --git a/content/xslt/src/xslt/txExecutionState.h b/dom/xslt/xslt/txExecutionState.h similarity index 100% rename from content/xslt/src/xslt/txExecutionState.h rename to dom/xslt/xslt/txExecutionState.h diff --git a/content/xslt/src/xslt/txFormatNumberFunctionCall.cpp b/dom/xslt/xslt/txFormatNumberFunctionCall.cpp similarity index 100% rename from content/xslt/src/xslt/txFormatNumberFunctionCall.cpp rename to dom/xslt/xslt/txFormatNumberFunctionCall.cpp diff --git a/content/xslt/src/xslt/txGenerateIdFunctionCall.cpp b/dom/xslt/xslt/txGenerateIdFunctionCall.cpp similarity index 100% rename from content/xslt/src/xslt/txGenerateIdFunctionCall.cpp rename to dom/xslt/xslt/txGenerateIdFunctionCall.cpp diff --git a/content/xslt/src/xslt/txInstructions.cpp b/dom/xslt/xslt/txInstructions.cpp similarity index 100% rename from content/xslt/src/xslt/txInstructions.cpp rename to dom/xslt/xslt/txInstructions.cpp diff --git a/content/xslt/src/xslt/txInstructions.h b/dom/xslt/xslt/txInstructions.h similarity index 100% rename from content/xslt/src/xslt/txInstructions.h rename to dom/xslt/xslt/txInstructions.h diff --git a/content/xslt/src/xslt/txKey.h b/dom/xslt/xslt/txKey.h similarity index 100% rename from content/xslt/src/xslt/txKey.h rename to dom/xslt/xslt/txKey.h diff --git a/content/xslt/src/xslt/txKeyFunctionCall.cpp b/dom/xslt/xslt/txKeyFunctionCall.cpp similarity index 100% rename from content/xslt/src/xslt/txKeyFunctionCall.cpp rename to dom/xslt/xslt/txKeyFunctionCall.cpp diff --git a/content/xslt/src/xslt/txMozillaStylesheetCompiler.cpp b/dom/xslt/xslt/txMozillaStylesheetCompiler.cpp similarity index 100% rename from content/xslt/src/xslt/txMozillaStylesheetCompiler.cpp rename to dom/xslt/xslt/txMozillaStylesheetCompiler.cpp diff --git a/content/xslt/src/xslt/txMozillaTextOutput.cpp b/dom/xslt/xslt/txMozillaTextOutput.cpp similarity index 100% rename from content/xslt/src/xslt/txMozillaTextOutput.cpp rename to dom/xslt/xslt/txMozillaTextOutput.cpp diff --git a/content/xslt/src/xslt/txMozillaTextOutput.h b/dom/xslt/xslt/txMozillaTextOutput.h similarity index 100% rename from content/xslt/src/xslt/txMozillaTextOutput.h rename to dom/xslt/xslt/txMozillaTextOutput.h diff --git a/content/xslt/src/xslt/txMozillaXMLOutput.cpp b/dom/xslt/xslt/txMozillaXMLOutput.cpp similarity index 100% rename from content/xslt/src/xslt/txMozillaXMLOutput.cpp rename to dom/xslt/xslt/txMozillaXMLOutput.cpp diff --git a/content/xslt/src/xslt/txMozillaXMLOutput.h b/dom/xslt/xslt/txMozillaXMLOutput.h similarity index 100% rename from content/xslt/src/xslt/txMozillaXMLOutput.h rename to dom/xslt/xslt/txMozillaXMLOutput.h diff --git a/content/xslt/src/xslt/txMozillaXSLTProcessor.cpp b/dom/xslt/xslt/txMozillaXSLTProcessor.cpp similarity index 100% rename from content/xslt/src/xslt/txMozillaXSLTProcessor.cpp rename to dom/xslt/xslt/txMozillaXSLTProcessor.cpp diff --git a/content/xslt/src/xslt/txMozillaXSLTProcessor.h b/dom/xslt/xslt/txMozillaXSLTProcessor.h similarity index 100% rename from content/xslt/src/xslt/txMozillaXSLTProcessor.h rename to dom/xslt/xslt/txMozillaXSLTProcessor.h diff --git a/content/xslt/src/xslt/txNodeSorter.cpp b/dom/xslt/xslt/txNodeSorter.cpp similarity index 100% rename from content/xslt/src/xslt/txNodeSorter.cpp rename to dom/xslt/xslt/txNodeSorter.cpp diff --git a/content/xslt/src/xslt/txNodeSorter.h b/dom/xslt/xslt/txNodeSorter.h similarity index 100% rename from content/xslt/src/xslt/txNodeSorter.h rename to dom/xslt/xslt/txNodeSorter.h diff --git a/content/xslt/src/xslt/txOutputFormat.cpp b/dom/xslt/xslt/txOutputFormat.cpp similarity index 100% rename from content/xslt/src/xslt/txOutputFormat.cpp rename to dom/xslt/xslt/txOutputFormat.cpp diff --git a/content/xslt/src/xslt/txOutputFormat.h b/dom/xslt/xslt/txOutputFormat.h similarity index 100% rename from content/xslt/src/xslt/txOutputFormat.h rename to dom/xslt/xslt/txOutputFormat.h diff --git a/content/xslt/src/xslt/txPatternOptimizer.cpp b/dom/xslt/xslt/txPatternOptimizer.cpp similarity index 100% rename from content/xslt/src/xslt/txPatternOptimizer.cpp rename to dom/xslt/xslt/txPatternOptimizer.cpp diff --git a/content/xslt/src/xslt/txPatternOptimizer.h b/dom/xslt/xslt/txPatternOptimizer.h similarity index 100% rename from content/xslt/src/xslt/txPatternOptimizer.h rename to dom/xslt/xslt/txPatternOptimizer.h diff --git a/content/xslt/src/xslt/txPatternParser.cpp b/dom/xslt/xslt/txPatternParser.cpp similarity index 100% rename from content/xslt/src/xslt/txPatternParser.cpp rename to dom/xslt/xslt/txPatternParser.cpp diff --git a/content/xslt/src/xslt/txPatternParser.h b/dom/xslt/xslt/txPatternParser.h similarity index 100% rename from content/xslt/src/xslt/txPatternParser.h rename to dom/xslt/xslt/txPatternParser.h diff --git a/content/xslt/src/xslt/txRtfHandler.cpp b/dom/xslt/xslt/txRtfHandler.cpp similarity index 100% rename from content/xslt/src/xslt/txRtfHandler.cpp rename to dom/xslt/xslt/txRtfHandler.cpp diff --git a/content/xslt/src/xslt/txRtfHandler.h b/dom/xslt/xslt/txRtfHandler.h similarity index 100% rename from content/xslt/src/xslt/txRtfHandler.h rename to dom/xslt/xslt/txRtfHandler.h diff --git a/content/xslt/src/xslt/txStylesheet.cpp b/dom/xslt/xslt/txStylesheet.cpp similarity index 100% rename from content/xslt/src/xslt/txStylesheet.cpp rename to dom/xslt/xslt/txStylesheet.cpp diff --git a/content/xslt/src/xslt/txStylesheet.h b/dom/xslt/xslt/txStylesheet.h similarity index 100% rename from content/xslt/src/xslt/txStylesheet.h rename to dom/xslt/xslt/txStylesheet.h diff --git a/content/xslt/src/xslt/txStylesheetCompileHandlers.cpp b/dom/xslt/xslt/txStylesheetCompileHandlers.cpp similarity index 100% rename from content/xslt/src/xslt/txStylesheetCompileHandlers.cpp rename to dom/xslt/xslt/txStylesheetCompileHandlers.cpp diff --git a/content/xslt/src/xslt/txStylesheetCompileHandlers.h b/dom/xslt/xslt/txStylesheetCompileHandlers.h similarity index 100% rename from content/xslt/src/xslt/txStylesheetCompileHandlers.h rename to dom/xslt/xslt/txStylesheetCompileHandlers.h diff --git a/content/xslt/src/xslt/txStylesheetCompiler.cpp b/dom/xslt/xslt/txStylesheetCompiler.cpp similarity index 100% rename from content/xslt/src/xslt/txStylesheetCompiler.cpp rename to dom/xslt/xslt/txStylesheetCompiler.cpp diff --git a/content/xslt/src/xslt/txStylesheetCompiler.h b/dom/xslt/xslt/txStylesheetCompiler.h similarity index 100% rename from content/xslt/src/xslt/txStylesheetCompiler.h rename to dom/xslt/xslt/txStylesheetCompiler.h diff --git a/content/xslt/src/xslt/txTextHandler.cpp b/dom/xslt/xslt/txTextHandler.cpp similarity index 100% rename from content/xslt/src/xslt/txTextHandler.cpp rename to dom/xslt/xslt/txTextHandler.cpp diff --git a/content/xslt/src/xslt/txTextHandler.h b/dom/xslt/xslt/txTextHandler.h similarity index 100% rename from content/xslt/src/xslt/txTextHandler.h rename to dom/xslt/xslt/txTextHandler.h diff --git a/content/xslt/src/xslt/txToplevelItems.cpp b/dom/xslt/xslt/txToplevelItems.cpp similarity index 100% rename from content/xslt/src/xslt/txToplevelItems.cpp rename to dom/xslt/xslt/txToplevelItems.cpp diff --git a/content/xslt/src/xslt/txToplevelItems.h b/dom/xslt/xslt/txToplevelItems.h similarity index 100% rename from content/xslt/src/xslt/txToplevelItems.h rename to dom/xslt/xslt/txToplevelItems.h diff --git a/content/xslt/src/xslt/txUnknownHandler.cpp b/dom/xslt/xslt/txUnknownHandler.cpp similarity index 100% rename from content/xslt/src/xslt/txUnknownHandler.cpp rename to dom/xslt/xslt/txUnknownHandler.cpp diff --git a/content/xslt/src/xslt/txUnknownHandler.h b/dom/xslt/xslt/txUnknownHandler.h similarity index 100% rename from content/xslt/src/xslt/txUnknownHandler.h rename to dom/xslt/xslt/txUnknownHandler.h diff --git a/content/xslt/src/xslt/txVariableMap.h b/dom/xslt/xslt/txVariableMap.h similarity index 100% rename from content/xslt/src/xslt/txVariableMap.h rename to dom/xslt/xslt/txVariableMap.h diff --git a/content/xslt/src/xslt/txXMLEventHandler.h b/dom/xslt/xslt/txXMLEventHandler.h similarity index 100% rename from content/xslt/src/xslt/txXMLEventHandler.h rename to dom/xslt/xslt/txXMLEventHandler.h diff --git a/content/xslt/src/xslt/txXPathResultComparator.cpp b/dom/xslt/xslt/txXPathResultComparator.cpp similarity index 100% rename from content/xslt/src/xslt/txXPathResultComparator.cpp rename to dom/xslt/xslt/txXPathResultComparator.cpp diff --git a/content/xslt/src/xslt/txXPathResultComparator.h b/dom/xslt/xslt/txXPathResultComparator.h similarity index 100% rename from content/xslt/src/xslt/txXPathResultComparator.h rename to dom/xslt/xslt/txXPathResultComparator.h diff --git a/content/xslt/src/xslt/txXSLTEnvironmentFunctionCall.cpp b/dom/xslt/xslt/txXSLTEnvironmentFunctionCall.cpp similarity index 100% rename from content/xslt/src/xslt/txXSLTEnvironmentFunctionCall.cpp rename to dom/xslt/xslt/txXSLTEnvironmentFunctionCall.cpp diff --git a/content/xslt/src/xslt/txXSLTFunctions.h b/dom/xslt/xslt/txXSLTFunctions.h similarity index 100% rename from content/xslt/src/xslt/txXSLTFunctions.h rename to dom/xslt/xslt/txXSLTFunctions.h diff --git a/content/xslt/src/xslt/txXSLTNumber.cpp b/dom/xslt/xslt/txXSLTNumber.cpp similarity index 100% rename from content/xslt/src/xslt/txXSLTNumber.cpp rename to dom/xslt/xslt/txXSLTNumber.cpp diff --git a/content/xslt/src/xslt/txXSLTNumber.h b/dom/xslt/xslt/txXSLTNumber.h similarity index 100% rename from content/xslt/src/xslt/txXSLTNumber.h rename to dom/xslt/xslt/txXSLTNumber.h diff --git a/content/xslt/src/xslt/txXSLTNumberCounters.cpp b/dom/xslt/xslt/txXSLTNumberCounters.cpp similarity index 100% rename from content/xslt/src/xslt/txXSLTNumberCounters.cpp rename to dom/xslt/xslt/txXSLTNumberCounters.cpp diff --git a/content/xslt/src/xslt/txXSLTPatterns.cpp b/dom/xslt/xslt/txXSLTPatterns.cpp similarity index 100% rename from content/xslt/src/xslt/txXSLTPatterns.cpp rename to dom/xslt/xslt/txXSLTPatterns.cpp diff --git a/content/xslt/src/xslt/txXSLTPatterns.h b/dom/xslt/xslt/txXSLTPatterns.h similarity index 100% rename from content/xslt/src/xslt/txXSLTPatterns.h rename to dom/xslt/xslt/txXSLTPatterns.h diff --git a/content/xslt/src/xslt/txXSLTProcessor.cpp b/dom/xslt/xslt/txXSLTProcessor.cpp similarity index 100% rename from content/xslt/src/xslt/txXSLTProcessor.cpp rename to dom/xslt/xslt/txXSLTProcessor.cpp diff --git a/content/xslt/src/xslt/txXSLTProcessor.h b/dom/xslt/xslt/txXSLTProcessor.h similarity index 100% rename from content/xslt/src/xslt/txXSLTProcessor.h rename to dom/xslt/xslt/txXSLTProcessor.h diff --git a/layout/build/moz.build b/layout/build/moz.build index 12b89a916c9..21ce32c3cd8 100644 --- a/layout/build/moz.build +++ b/layout/build/moz.build @@ -46,10 +46,6 @@ LOCAL_INCLUDES += [ '/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', @@ -66,6 +62,10 @@ LOCAL_INCLUDES += [ '/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', diff --git a/testing/crashtest/crashtests.list b/testing/crashtest/crashtests.list index 62c6768c102..aa06560c497 100644 --- a/testing/crashtest/crashtests.list +++ b/testing/crashtest/crashtests.list @@ -15,7 +15,6 @@ 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 @@ -29,6 +28,7 @@ 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