Bug 946065 - Part 6: Move content/xml/ to dom/ and flatten subdirectories. r=jst
☠☠ backed out by 6f0b312e09aa ☠ ☠
authorBirunthan Mohanathas <birunthan@mohanathas.com>
Mon, 12 May 2014 22:29:03 +0300
changeset 182737 9b673ac36f66a926d3d8c95111a24270348b43c0
parent 182736 91959a8f21ae4f177f5718b5c2eab1d8549eaf2a
child 182738 7b6b04006c1b5757772906ced329c4151531fe3e
push id26769
push usercbook@mozilla.com
push dateTue, 13 May 2014 10:23:39 +0000
treeherdermozilla-central@1c03dfd4b49b [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersjst
bugs946065
milestone32.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 6: Move content/xml/ to dom/ and flatten subdirectories. r=jst
content/base/src/moz.build
content/moz.build
content/svg/content/src/moz.build
content/svg/document/src/moz.build
content/xml/content/crashtest/420429.xul
content/xml/content/crashtest/453278-frame.xml
content/xml/content/crashtest/453278.html
content/xml/content/crashtest/803586.xhtml
content/xml/content/crashtest/crashtests.list
content/xml/content/src/CDATASection.cpp
content/xml/content/src/CDATASection.h
content/xml/content/src/ProcessingInstruction.cpp
content/xml/content/src/ProcessingInstruction.h
content/xml/content/src/XMLStylesheetProcessingInstruction.cpp
content/xml/content/src/XMLStylesheetProcessingInstruction.h
content/xml/content/src/htmlmathml-f.ent
content/xml/content/src/moz.build
content/xml/content/src/nsXMLElement.cpp
content/xml/content/src/nsXMLElement.h
content/xml/document/crashtests/136896-1.xml
content/xml/document/crashtests/185285-1.xml
content/xml/document/crashtests/382636-1.xml
content/xml/document/crashtests/382636-2.svg
content/xml/document/crashtests/382636-3.xhtml
content/xml/document/crashtests/382636-4.xul
content/xml/document/crashtests/431703-1.xhtml
content/xml/document/crashtests/994740-1.xhtml
content/xml/document/crashtests/crashtests.list
content/xml/document/crashtests/tree.gif
content/xml/document/moz.build
content/xml/document/public/moz.build
content/xml/document/public/nsIXMLContentSink.h
content/xml/document/resources/XMLMonoPrint.css
content/xml/document/resources/XMLPrettyPrint.css
content/xml/document/resources/XMLPrettyPrint.xml
content/xml/document/resources/XMLPrettyPrint.xsl
content/xml/document/resources/jar.mn
content/xml/document/resources/moz.build
content/xml/document/src/XMLDocument.cpp
content/xml/document/src/XMLDocument.h
content/xml/document/src/moz.build
content/xml/document/src/nsXMLContentSink.cpp
content/xml/document/src/nsXMLContentSink.h
content/xml/document/src/nsXMLFragmentContentSink.cpp
content/xml/document/src/nsXMLPrettyPrinter.cpp
content/xml/document/src/nsXMLPrettyPrinter.h
content/xml/document/test/file_bug293347.xml
content/xml/document/test/file_bug293347xslt.xml
content/xml/document/test/mochitest.ini
content/xml/document/test/moz.build
content/xml/document/test/test_bug232004.xhtml
content/xml/document/test/test_bug293347.html
content/xml/document/test/test_bug343870.xhtml
content/xml/document/test/test_bug355213.xhtml
content/xml/document/test/test_bug392338.html
content/xml/document/test/test_bug399502.xhtml
content/xml/document/test/test_bug445330.html
content/xml/document/test/test_bug691215.html
content/xml/document/test/test_viewport.xhtml
content/xml/moz.build
content/xml/tests/books/bethlehem.gif
content/xml/tests/books/bill.gif
content/xml/tests/books/books.js
content/xml/tests/books/books.xml
content/xml/tests/books/charing.gif
content/xml/tests/books/classic.css
content/xml/tests/books/common.css
content/xml/tests/books/kerouac.gif
content/xml/tests/books/list.css
content/xml/tests/books/road.gif
content/xml/tests/books/welville.gif
content/xml/tests/docbook.css
content/xml/tests/docbooktest.xml
content/xml/tests/flamer.gif
content/xml/tests/load/display.css
content/xml/tests/load/display.xml
content/xml/tests/load/load.html
content/xml/tests/load/loadauth.html
content/xml/tests/load/loaddisplay.html
content/xml/tests/load/test.xml
content/xml/tests/script.xml
content/xml/tests/simple.xml
content/xml/tests/toc/book.css
content/xml/tests/toc/irslogo.gif
content/xml/tests/toc/minus.gif
content/xml/tests/toc/plus.gif
content/xml/tests/toc/rights.xml
content/xml/tests/toc/toc.css
content/xml/tests/toc/toc.js
content/xml/tests/xlink/auto.xml
content/xml/tests/xlink/link.css
content/xml/tests/xlink/manual.xml
content/xml/tests/xmlbase/xmlbase.css
content/xml/tests/xmlbase/xmlbase.xml
content/xul/content/src/moz.build
content/xul/document/src/moz.build
dom/bindings/moz.build
dom/events/moz.build
dom/moz.build
dom/xbl/moz.build
dom/xml/CDATASection.cpp
dom/xml/CDATASection.h
dom/xml/ProcessingInstruction.cpp
dom/xml/ProcessingInstruction.h
dom/xml/XMLDocument.cpp
dom/xml/XMLDocument.h
dom/xml/XMLStylesheetProcessingInstruction.cpp
dom/xml/XMLStylesheetProcessingInstruction.h
dom/xml/crashtests/136896-1.xml
dom/xml/crashtests/185285-1.xml
dom/xml/crashtests/382636-1.xml
dom/xml/crashtests/382636-2.svg
dom/xml/crashtests/382636-3.xhtml
dom/xml/crashtests/382636-4.xul
dom/xml/crashtests/420429.xul
dom/xml/crashtests/431703-1.xhtml
dom/xml/crashtests/453278-frame.xml
dom/xml/crashtests/453278.html
dom/xml/crashtests/803586.xhtml
dom/xml/crashtests/crashtests.list
dom/xml/crashtests/tree.gif
dom/xml/htmlmathml-f.ent
dom/xml/moz.build
dom/xml/nsIXMLContentSink.h
dom/xml/nsXMLContentSink.cpp
dom/xml/nsXMLContentSink.h
dom/xml/nsXMLElement.cpp
dom/xml/nsXMLElement.h
dom/xml/nsXMLFragmentContentSink.cpp
dom/xml/nsXMLPrettyPrinter.cpp
dom/xml/nsXMLPrettyPrinter.h
dom/xml/resources/XMLMonoPrint.css
dom/xml/resources/XMLPrettyPrint.css
dom/xml/resources/XMLPrettyPrint.xml
dom/xml/resources/XMLPrettyPrint.xsl
dom/xml/resources/jar.mn
dom/xml/resources/moz.build
dom/xml/test/file_bug293347.xml
dom/xml/test/file_bug293347xslt.xml
dom/xml/test/mochitest.ini
dom/xml/test/moz.build
dom/xml/test/old/books/bethlehem.gif
dom/xml/test/old/books/bill.gif
dom/xml/test/old/books/books.js
dom/xml/test/old/books/books.xml
dom/xml/test/old/books/charing.gif
dom/xml/test/old/books/classic.css
dom/xml/test/old/books/common.css
dom/xml/test/old/books/kerouac.gif
dom/xml/test/old/books/list.css
dom/xml/test/old/books/road.gif
dom/xml/test/old/books/welville.gif
dom/xml/test/old/docbook.css
dom/xml/test/old/docbooktest.xml
dom/xml/test/old/flamer.gif
dom/xml/test/old/load/display.css
dom/xml/test/old/load/display.xml
dom/xml/test/old/load/load.html
dom/xml/test/old/load/loadauth.html
dom/xml/test/old/load/loaddisplay.html
dom/xml/test/old/load/test.xml
dom/xml/test/old/script.xml
dom/xml/test/old/simple.xml
dom/xml/test/old/toc/book.css
dom/xml/test/old/toc/irslogo.gif
dom/xml/test/old/toc/minus.gif
dom/xml/test/old/toc/plus.gif
dom/xml/test/old/toc/rights.xml
dom/xml/test/old/toc/toc.css
dom/xml/test/old/toc/toc.js
dom/xml/test/old/xlink/auto.xml
dom/xml/test/old/xlink/link.css
dom/xml/test/old/xlink/manual.xml
dom/xml/test/old/xmlbase/xmlbase.css
dom/xml/test/old/xmlbase/xmlbase.xml
dom/xml/test/test_bug232004.xhtml
dom/xml/test/test_bug293347.html
dom/xml/test/test_bug343870.xhtml
dom/xml/test/test_bug355213.xhtml
dom/xml/test/test_bug392338.html
dom/xml/test/test_bug399502.xhtml
dom/xml/test/test_bug445330.html
dom/xml/test/test_bug691215.html
dom/xml/test/test_viewport.xhtml
gfx/thebes/moz.build
testing/crashtest/crashtests.list
--- a/content/base/src/moz.build
+++ b/content/base/src/moz.build
@@ -209,25 +209,24 @@ MSVC_ENABLE_PGO = True
 include('/ipc/chromium/chromium-config.mozbuild')
 
 FINAL_LIBRARY = 'gklayout'
 LOCAL_INCLUDES += [
     '/caps/include',
     '/content/html/content/src',
     '/content/html/document/src',
     '/content/svg/content/src',
-    '/content/xml/content/src',
-    '/content/xml/document/src',
     '/content/xul/content/src',
     '/content/xul/document/src',
     '/docshell/base',
     '/dom/base',
     '/dom/ipc',
     '/dom/workers',
     '/dom/xbl',
+    '/dom/xml',
     '/dom/xslt/xpath',
     '/image/src',
     '/js/ipc',
     '/js/xpconnect/src',
     '/js/xpconnect/wrappers',
     '/layout/base',
     '/layout/generic',
     '/layout/style',
--- a/content/moz.build
+++ b/content/moz.build
@@ -6,14 +6,13 @@
 
 PARALLEL_DIRS += [
     'base',
     'canvas',
     'html',
     'mathml/content/src',
     'media',
     'svg',
-    'xml',
     'xul',
 ]
 
 TEST_TOOL_DIRS += ['test']
 
--- a/content/svg/content/src/moz.build
+++ b/content/svg/content/src/moz.build
@@ -250,18 +250,18 @@ UNIFIED_SOURCES += [
 FAIL_ON_WARNINGS = True
 
 include('/ipc/chromium/chromium-config.mozbuild')
 
 FINAL_LIBRARY = 'gklayout'
 LOCAL_INCLUDES += [
     '/content/base/src',
     '/content/html/content/src',
-    '/content/xml/content/src',
     '/dom',
     '/dom/smil',
     '/dom/xbl',
+    '/dom/xml',
     '/layout/generic',
     '/layout/style',
     '/layout/svg',
     '/layout/xul',
 ]
 
--- a/content/svg/document/src/moz.build
+++ b/content/svg/document/src/moz.build
@@ -13,13 +13,13 @@ SOURCES += [
 ]
 
 FAIL_ON_WARNINGS = True
 
 LOCAL_INCLUDES += [
     '/content/base/src',
     '/content/html/document/src',
     '/content/svg/content/src',
-    '/content/xml/document/src',
+    '/dom/xml',
     '/layout/style',
 ]
 
 FINAL_LIBRARY = 'gklayout'
deleted file mode 100644
--- a/content/xml/content/crashtest/crashtests.list
+++ /dev/null
@@ -1,3 +0,0 @@
-load 420429.xul
-load 453278.html
-load 803586.xhtml
deleted file mode 100644
--- a/content/xml/document/crashtests/994740-1.xhtml
+++ /dev/null
@@ -1,15 +0,0 @@
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<script>
-<![CDATA[
-
-function boom()
-{
-    document.createElement("head").innerHTML = "<";
-}
-
-]]>
-</script></head>
-
-<body onload="boom();"></body>
-</html>
deleted file mode 100644
--- a/content/xml/document/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', 'resources', 'src']
-TEST_DIRS += ['test']
deleted file mode 100644
--- a/content/xml/document/public/moz.build
+++ /dev/null
@@ -1,10 +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/.
-
-EXPORTS += [
-    'nsIXMLContentSink.h',
-]
-
deleted file mode 100644
--- a/content/xml/document/src/moz.build
+++ /dev/null
@@ -1,31 +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/.
-
-EXPORTS.mozilla.dom += [
-    'XMLDocument.h',
-]
-
-UNIFIED_SOURCES += [
-    'nsXMLContentSink.cpp',
-    'nsXMLFragmentContentSink.cpp',
-    'nsXMLPrettyPrinter.cpp',
-    'XMLDocument.cpp',
-]
-
-FAIL_ON_WARNINGS = True
-
-MSVC_ENABLE_PGO = True
-
-LOCAL_INCLUDES += [
-    '/caps/include',
-    '/content/base/src',
-    '/content/html/document/src',
-    '/content/xul/content/src',
-    '/dom/base',
-    '/layout/style',
-]
-
-FINAL_LIBRARY = 'gklayout'
deleted file mode 100644
--- a/content/xml/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 += ['content/src', 'document']
--- a/content/xul/content/src/moz.build
+++ b/content/xul/content/src/moz.build
@@ -15,17 +15,16 @@ if CONFIG['MOZ_XUL']:
 
 FAIL_ON_WARNINGS = True
 
 LOCAL_INCLUDES += [
     '../../document/src',
     '../../templates/src',
     '/content/base/src',
     '/content/html/content/src',
-    '/content/xml/content/src',
-    '/content/xml/document/src',
     '/dom/xbl',
+    '/dom/xml',
     '/layout/generic',
     '/layout/style',
     '/layout/xul',
 ]
 
 FINAL_LIBRARY = 'gklayout'
--- a/content/xul/document/src/moz.build
+++ b/content/xul/document/src/moz.build
@@ -18,21 +18,21 @@ if CONFIG['MOZ_XUL']:
     ]
 
 FAIL_ON_WARNINGS = True
 
 MSVC_ENABLE_PGO = True
 
 LOCAL_INCLUDES += [
     '/content/base/src',
-    '/content/xml/document/src',
     '/content/xul/content/src',
     '/content/xul/templates/src',
     '/docshell/base',
     '/dom/base',
     '/dom/xbl',
+    '/dom/xml',
     '/layout/base',
     '/layout/generic',
     '/layout/style',
     '/layout/xul',
 ]
 
 FINAL_LIBRARY = 'gklayout'
--- a/dom/bindings/moz.build
+++ b/dom/bindings/moz.build
@@ -41,28 +41,28 @@ MSVC_ENABLE_PGO = True
 LOCAL_INCLUDES += [
     '/content/base/src',
     '/content/canvas/src',
     '/content/html/content/src',
     '/content/html/document/src',
     '/content/media/webaudio',
     '/content/media/webspeech/recognition',
     '/content/svg/content/src',
-    '/content/xml/content/src',
     '/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/xbl',
+    '/dom/xml',
     '/dom/xslt/base',
     '/dom/xslt/xpath',
     '/js/ipc',
     '/js/xpconnect/src',
     '/js/xpconnect/wrappers',
     '/layout/style',
     '/layout/xul/tree',
     '/media/mtransport',
--- a/dom/events/moz.build
+++ b/dom/events/moz.build
@@ -120,22 +120,22 @@ FAIL_ON_WARNINGS = True
 MSVC_ENABLE_PGO = True
 
 include('/ipc/chromium/chromium-config.mozbuild')
 
 FINAL_LIBRARY = 'gklayout'
 LOCAL_INCLUDES += [
     '/content/base/src',
     '/content/html/content/src',
-    '/content/xml/content/src',
     '/content/xul/content/src',
     '/dom/base',
     '/dom/settings',
     '/dom/src/storage',
     '/dom/workers',
+    '/dom/xml',
     '/js/xpconnect/wrappers',
     '/layout/generic',
     '/layout/xul',
     '/layout/xul/tree/',
 ]
 
 if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gonk':
     LOCAL_INCLUDES += [
--- a/dom/moz.build
+++ b/dom/moz.build
@@ -76,16 +76,17 @@ PARALLEL_DIRS += [
     'camera',
     'audiochannel',
     'promise',
     'smil',
     'telephony',
     'inputmethod',
     'webidl',
     'xbl',
+    'xml',
     'xslt',
 ]
 
 if CONFIG['OS_ARCH'] == 'WINNT':
     PARALLEL_DIRS += ['plugins/ipc/hangui']
 
 if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gonk':
     PARALLEL_DIRS += [
--- a/dom/xbl/moz.build
+++ b/dom/xbl/moz.build
@@ -39,16 +39,16 @@ UNIFIED_SOURCES += [
 
 FAIL_ON_WARNINGS = True
 
 MSVC_ENABLE_PGO = True
 
 LOCAL_INCLUDES += [
     '/content/base/src',
     '/content/html/document/src',
-    '/content/xml/document/src',
     '/content/xul/content/src',
     '/content/xul/document/src',
     '/dom/base',
+    '/dom/xml',
     '/layout/style',
 ]
 
 FINAL_LIBRARY = 'gklayout'
rename from content/xml/content/src/CDATASection.cpp
rename to dom/xml/CDATASection.cpp
rename from content/xml/content/src/CDATASection.h
rename to dom/xml/CDATASection.h
rename from content/xml/content/src/ProcessingInstruction.cpp
rename to dom/xml/ProcessingInstruction.cpp
rename from content/xml/content/src/ProcessingInstruction.h
rename to dom/xml/ProcessingInstruction.h
rename from content/xml/document/src/XMLDocument.cpp
rename to dom/xml/XMLDocument.cpp
rename from content/xml/document/src/XMLDocument.h
rename to dom/xml/XMLDocument.h
rename from content/xml/content/src/XMLStylesheetProcessingInstruction.cpp
rename to dom/xml/XMLStylesheetProcessingInstruction.cpp
rename from content/xml/content/src/XMLStylesheetProcessingInstruction.h
rename to dom/xml/XMLStylesheetProcessingInstruction.h
rename from content/xml/document/crashtests/136896-1.xml
rename to dom/xml/crashtests/136896-1.xml
rename from content/xml/document/crashtests/185285-1.xml
rename to dom/xml/crashtests/185285-1.xml
rename from content/xml/document/crashtests/382636-1.xml
rename to dom/xml/crashtests/382636-1.xml
rename from content/xml/document/crashtests/382636-2.svg
rename to dom/xml/crashtests/382636-2.svg
rename from content/xml/document/crashtests/382636-3.xhtml
rename to dom/xml/crashtests/382636-3.xhtml
rename from content/xml/document/crashtests/382636-4.xul
rename to dom/xml/crashtests/382636-4.xul
rename from content/xml/content/crashtest/420429.xul
rename to dom/xml/crashtests/420429.xul
rename from content/xml/document/crashtests/431703-1.xhtml
rename to dom/xml/crashtests/431703-1.xhtml
rename from content/xml/content/crashtest/453278-frame.xml
rename to dom/xml/crashtests/453278-frame.xml
rename from content/xml/content/crashtest/453278.html
rename to dom/xml/crashtests/453278.html
rename from content/xml/content/crashtest/803586.xhtml
rename to dom/xml/crashtests/803586.xhtml
rename from content/xml/document/crashtests/crashtests.list
rename to dom/xml/crashtests/crashtests.list
--- a/content/xml/document/crashtests/crashtests.list
+++ b/dom/xml/crashtests/crashtests.list
@@ -1,8 +1,11 @@
 load 136896-1.xml
 load 185285-1.xml
 load 382636-1.xml
 load 382636-2.svg
 load 382636-3.xhtml
 load 382636-4.xul # Throws (bug 455856)
+load 420429.xul
 load 431703-1.xhtml
+load 453278.html
+load 803586.xhtml
 load 994740-1.xhtml
rename from content/xml/document/crashtests/tree.gif
rename to dom/xml/crashtests/tree.gif
rename from content/xml/content/src/htmlmathml-f.ent
rename to dom/xml/htmlmathml-f.ent
rename from content/xml/content/src/moz.build
rename to dom/xml/moz.build
--- a/content/xml/content/src/moz.build
+++ b/dom/xml/moz.build
@@ -1,35 +1,54 @@
 # -*- 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 += ['resources']
+
+TEST_DIRS += ['test']
+
+EXPORTS += [
+    'nsIXMLContentSink.h',
+]
+
 EXPORTS.mozilla.dom += [
     'CDATASection.h',
     'nsXMLElement.h',
     'ProcessingInstruction.h',
+    'XMLDocument.h',
     'XMLStylesheetProcessingInstruction.h',
 ]
 
 UNIFIED_SOURCES += [
     'CDATASection.cpp',
+    'nsXMLContentSink.cpp',
     'nsXMLElement.cpp',
+    'nsXMLFragmentContentSink.cpp',
+    'nsXMLPrettyPrinter.cpp',
     'ProcessingInstruction.cpp',
+    'XMLDocument.cpp',
     'XMLStylesheetProcessingInstruction.cpp',
 ]
 
 FAIL_ON_WARNINGS = True
 
 MSVC_ENABLE_PGO = True
 
 FINAL_LIBRARY = 'gklayout'
+
 LOCAL_INCLUDES += [
+    '/caps/include',
     '/content/base/src',
+    '/content/html/document/src',
+    '/content/xul/content/src',
+    '/dom/base',
+    '/layout/style',
 ]
 
 RESOURCE_FILES.dtd += [
     'htmlmathml-f.ent',
 ]
 
 if CONFIG['GNU_CC'] and CONFIG['MOZ_WIDGET_TOOLKIT'] == 'android':
     # Work around bug 986928
rename from content/xml/document/public/nsIXMLContentSink.h
rename to dom/xml/nsIXMLContentSink.h
rename from content/xml/document/src/nsXMLContentSink.cpp
rename to dom/xml/nsXMLContentSink.cpp
rename from content/xml/document/src/nsXMLContentSink.h
rename to dom/xml/nsXMLContentSink.h
rename from content/xml/content/src/nsXMLElement.cpp
rename to dom/xml/nsXMLElement.cpp
rename from content/xml/content/src/nsXMLElement.h
rename to dom/xml/nsXMLElement.h
rename from content/xml/document/src/nsXMLFragmentContentSink.cpp
rename to dom/xml/nsXMLFragmentContentSink.cpp
rename from content/xml/document/src/nsXMLPrettyPrinter.cpp
rename to dom/xml/nsXMLPrettyPrinter.cpp
rename from content/xml/document/src/nsXMLPrettyPrinter.h
rename to dom/xml/nsXMLPrettyPrinter.h
rename from content/xml/document/resources/XMLMonoPrint.css
rename to dom/xml/resources/XMLMonoPrint.css
rename from content/xml/document/resources/XMLPrettyPrint.css
rename to dom/xml/resources/XMLPrettyPrint.css
rename from content/xml/document/resources/XMLPrettyPrint.xml
rename to dom/xml/resources/XMLPrettyPrint.xml
rename from content/xml/document/resources/XMLPrettyPrint.xsl
rename to dom/xml/resources/XMLPrettyPrint.xsl
rename from content/xml/document/resources/jar.mn
rename to dom/xml/resources/jar.mn
rename from content/xml/document/resources/moz.build
rename to dom/xml/resources/moz.build
rename from content/xml/document/test/file_bug293347.xml
rename to dom/xml/test/file_bug293347.xml
rename from content/xml/document/test/file_bug293347xslt.xml
rename to dom/xml/test/file_bug293347xslt.xml
rename from content/xml/document/test/mochitest.ini
rename to dom/xml/test/mochitest.ini
rename from content/xml/document/test/moz.build
rename to dom/xml/test/moz.build
rename from content/xml/tests/books/bethlehem.gif
rename to dom/xml/test/old/books/bethlehem.gif
rename from content/xml/tests/books/bill.gif
rename to dom/xml/test/old/books/bill.gif
rename from content/xml/tests/books/books.js
rename to dom/xml/test/old/books/books.js
rename from content/xml/tests/books/books.xml
rename to dom/xml/test/old/books/books.xml
rename from content/xml/tests/books/charing.gif
rename to dom/xml/test/old/books/charing.gif
rename from content/xml/tests/books/classic.css
rename to dom/xml/test/old/books/classic.css
rename from content/xml/tests/books/common.css
rename to dom/xml/test/old/books/common.css
rename from content/xml/tests/books/kerouac.gif
rename to dom/xml/test/old/books/kerouac.gif
rename from content/xml/tests/books/list.css
rename to dom/xml/test/old/books/list.css
rename from content/xml/tests/books/road.gif
rename to dom/xml/test/old/books/road.gif
rename from content/xml/tests/books/welville.gif
rename to dom/xml/test/old/books/welville.gif
rename from content/xml/tests/docbook.css
rename to dom/xml/test/old/docbook.css
rename from content/xml/tests/docbooktest.xml
rename to dom/xml/test/old/docbooktest.xml
rename from content/xml/tests/flamer.gif
rename to dom/xml/test/old/flamer.gif
rename from content/xml/tests/load/display.css
rename to dom/xml/test/old/load/display.css
rename from content/xml/tests/load/display.xml
rename to dom/xml/test/old/load/display.xml
rename from content/xml/tests/load/load.html
rename to dom/xml/test/old/load/load.html
rename from content/xml/tests/load/loadauth.html
rename to dom/xml/test/old/load/loadauth.html
rename from content/xml/tests/load/loaddisplay.html
rename to dom/xml/test/old/load/loaddisplay.html
rename from content/xml/tests/load/test.xml
rename to dom/xml/test/old/load/test.xml
rename from content/xml/tests/script.xml
rename to dom/xml/test/old/script.xml
rename from content/xml/tests/simple.xml
rename to dom/xml/test/old/simple.xml
rename from content/xml/tests/toc/book.css
rename to dom/xml/test/old/toc/book.css
rename from content/xml/tests/toc/irslogo.gif
rename to dom/xml/test/old/toc/irslogo.gif
rename from content/xml/tests/toc/minus.gif
rename to dom/xml/test/old/toc/minus.gif
rename from content/xml/tests/toc/plus.gif
rename to dom/xml/test/old/toc/plus.gif
rename from content/xml/tests/toc/rights.xml
rename to dom/xml/test/old/toc/rights.xml
rename from content/xml/tests/toc/toc.css
rename to dom/xml/test/old/toc/toc.css
rename from content/xml/tests/toc/toc.js
rename to dom/xml/test/old/toc/toc.js
rename from content/xml/tests/xlink/auto.xml
rename to dom/xml/test/old/xlink/auto.xml
rename from content/xml/tests/xlink/link.css
rename to dom/xml/test/old/xlink/link.css
rename from content/xml/tests/xlink/manual.xml
rename to dom/xml/test/old/xlink/manual.xml
rename from content/xml/tests/xmlbase/xmlbase.css
rename to dom/xml/test/old/xmlbase/xmlbase.css
rename from content/xml/tests/xmlbase/xmlbase.xml
rename to dom/xml/test/old/xmlbase/xmlbase.xml
rename from content/xml/document/test/test_bug232004.xhtml
rename to dom/xml/test/test_bug232004.xhtml
rename from content/xml/document/test/test_bug293347.html
rename to dom/xml/test/test_bug293347.html
rename from content/xml/document/test/test_bug343870.xhtml
rename to dom/xml/test/test_bug343870.xhtml
rename from content/xml/document/test/test_bug355213.xhtml
rename to dom/xml/test/test_bug355213.xhtml
rename from content/xml/document/test/test_bug392338.html
rename to dom/xml/test/test_bug392338.html
rename from content/xml/document/test/test_bug399502.xhtml
rename to dom/xml/test/test_bug399502.xhtml
rename from content/xml/document/test/test_bug445330.html
rename to dom/xml/test/test_bug445330.html
rename from content/xml/document/test/test_bug691215.html
rename to dom/xml/test/test_bug691215.html
rename from content/xml/document/test/test_viewport.xhtml
rename to dom/xml/test/test_viewport.xhtml
--- a/gfx/thebes/moz.build
+++ b/gfx/thebes/moz.build
@@ -268,17 +268,17 @@ include('/ipc/chromium/chromium-config.m
 
 FINAL_LIBRARY = 'xul'
 
 GENERATED_FILES = [
     'DeprecatedPremultiplyTables.h',
 ]
 
 LOCAL_INCLUDES += [
-    '/content/xml/document/src',
+    '/dom/xml',
 ]
 
 if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('android', 'gtk2', 'gtk3', 'gonk', 'qt'):
     DEFINES['MOZ_ENABLE_FREETYPE'] = True
 
 if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'windows':
     for var in ('MOZ_ENABLE_D3D9_LAYER', 'MOZ_ENABLE_D3D10_LAYER'):
         if CONFIG[var]:
--- a/testing/crashtest/crashtests.list
+++ b/testing/crashtest/crashtests.list
@@ -5,34 +5,33 @@ include ../../testing/crashtest/sanity/c
 
 include ../../accessible/tests/crashtests/crashtests.list
 
 include ../../content/base/crashtests/crashtests.list
 include ../../content/canvas/crashtests/crashtests.list
 include ../../content/html/document/crashtests/crashtests.list
 include ../../content/html/content/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/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/events/crashtests/crashtests.list
 include ../../dom/indexedDB/crashtests/crashtests.list
 include ../../dom/smil/crashtests/crashtests.list
 include ../../dom/xbl/crashtests/crashtests.list
+include ../../dom/xml/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