Backed out changeset c2350812b7f1 (bug 946065) hoping this fix the B2G mochitest-7 perma-fail on a CLOSED TREE
authorCarsten "Tomcat" Book <cbook@mozilla.com>
Mon, 14 Apr 2014 08:51:51 +0200
changeset 196804 5c139817cf242e39e1401e191bd333456c171b0f
parent 196803 c153aa5be1088073e57fe2a63d806f3b7a161b23
child 196805 83d0d281cfbcc92335c689b3c717993dbadb38d8
push id3624
push userasasaki@mozilla.com
push dateMon, 09 Jun 2014 21:49:01 +0000
treeherdermozilla-beta@b1a5da15899a [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs946065
milestone31.0a1
backs outc2350812b7f1188eebda30532d6108211697b97d
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
Backed out changeset c2350812b7f1 (bug 946065) hoping this fix the B2G mochitest-7 perma-fail on a CLOSED TREE
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/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/tests/books/bethlehem.gif
dom/xml/tests/books/bill.gif
dom/xml/tests/books/books.js
dom/xml/tests/books/books.xml
dom/xml/tests/books/charing.gif
dom/xml/tests/books/classic.css
dom/xml/tests/books/common.css
dom/xml/tests/books/kerouac.gif
dom/xml/tests/books/list.css
dom/xml/tests/books/road.gif
dom/xml/tests/books/welville.gif
dom/xml/tests/docbook.css
dom/xml/tests/docbooktest.xml
dom/xml/tests/flamer.gif
dom/xml/tests/load/display.css
dom/xml/tests/load/display.xml
dom/xml/tests/load/load.html
dom/xml/tests/load/loadauth.html
dom/xml/tests/load/loaddisplay.html
dom/xml/tests/load/test.xml
dom/xml/tests/mochitest/file_bug293347.xml
dom/xml/tests/mochitest/file_bug293347xslt.xml
dom/xml/tests/mochitest/mochitest.ini
dom/xml/tests/mochitest/moz.build
dom/xml/tests/mochitest/test_bug232004.xhtml
dom/xml/tests/mochitest/test_bug293347.html
dom/xml/tests/mochitest/test_bug343870.xhtml
dom/xml/tests/mochitest/test_bug355213.xhtml
dom/xml/tests/mochitest/test_bug392338.html
dom/xml/tests/mochitest/test_bug399502.xhtml
dom/xml/tests/mochitest/test_bug445330.html
dom/xml/tests/mochitest/test_bug691215.html
dom/xml/tests/mochitest/test_viewport.xhtml
dom/xml/tests/script.xml
dom/xml/tests/simple.xml
dom/xml/tests/toc/book.css
dom/xml/tests/toc/irslogo.gif
dom/xml/tests/toc/minus.gif
dom/xml/tests/toc/plus.gif
dom/xml/tests/toc/rights.xml
dom/xml/tests/toc/toc.css
dom/xml/tests/toc/toc.js
dom/xml/tests/xlink/auto.xml
dom/xml/tests/xlink/link.css
dom/xml/tests/xlink/manual.xml
dom/xml/tests/xmlbase/xmlbase.css
dom/xml/tests/xmlbase/xmlbase.xml
gfx/thebes/moz.build
testing/crashtest/crashtests.list
--- a/content/base/src/moz.build
+++ b/content/base/src/moz.build
@@ -204,24 +204,25 @@ 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,13 +6,14 @@
 
 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
@@ -248,18 +248,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',
-    '/dom/xml',
+    '/content/xml/document/src',
     '/layout/style',
 ]
 
 FINAL_LIBRARY = 'gklayout'
rename from dom/xml/crashtests/420429.xul
rename to content/xml/content/crashtest/420429.xul
rename from dom/xml/crashtests/453278-frame.xml
rename to content/xml/content/crashtest/453278-frame.xml
rename from dom/xml/crashtests/453278.html
rename to content/xml/content/crashtest/453278.html
rename from dom/xml/crashtests/803586.xhtml
rename to content/xml/content/crashtest/803586.xhtml
new file mode 100644
--- /dev/null
+++ b/content/xml/content/crashtest/crashtests.list
@@ -0,0 +1,3 @@
+load 420429.xul
+load 453278.html
+load 803586.xhtml
rename from dom/xml/CDATASection.cpp
rename to content/xml/content/src/CDATASection.cpp
rename from dom/xml/CDATASection.h
rename to content/xml/content/src/CDATASection.h
rename from dom/xml/ProcessingInstruction.cpp
rename to content/xml/content/src/ProcessingInstruction.cpp
rename from dom/xml/ProcessingInstruction.h
rename to content/xml/content/src/ProcessingInstruction.h
rename from dom/xml/XMLStylesheetProcessingInstruction.cpp
rename to content/xml/content/src/XMLStylesheetProcessingInstruction.cpp
rename from dom/xml/XMLStylesheetProcessingInstruction.h
rename to content/xml/content/src/XMLStylesheetProcessingInstruction.h
rename from dom/xml/htmlmathml-f.ent
rename to content/xml/content/src/htmlmathml-f.ent
rename from dom/xml/moz.build
rename to content/xml/content/src/moz.build
--- a/dom/xml/moz.build
+++ b/content/xml/content/src/moz.build
@@ -1,56 +1,35 @@
 # -*- 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 += [
-    'tests/mochitest',
-]
-
-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 dom/xml/nsXMLElement.cpp
rename to content/xml/content/src/nsXMLElement.cpp
rename from dom/xml/nsXMLElement.h
rename to content/xml/content/src/nsXMLElement.h
rename from dom/xml/crashtests/136896-1.xml
rename to content/xml/document/crashtests/136896-1.xml
rename from dom/xml/crashtests/185285-1.xml
rename to content/xml/document/crashtests/185285-1.xml
rename from dom/xml/crashtests/382636-1.xml
rename to content/xml/document/crashtests/382636-1.xml
rename from dom/xml/crashtests/382636-2.svg
rename to content/xml/document/crashtests/382636-2.svg
rename from dom/xml/crashtests/382636-3.xhtml
rename to content/xml/document/crashtests/382636-3.xhtml
rename from dom/xml/crashtests/382636-4.xul
rename to content/xml/document/crashtests/382636-4.xul
rename from dom/xml/crashtests/431703-1.xhtml
rename to content/xml/document/crashtests/431703-1.xhtml
rename from dom/xml/crashtests/crashtests.list
rename to content/xml/document/crashtests/crashtests.list
--- a/dom/xml/crashtests/crashtests.list
+++ b/content/xml/document/crashtests/crashtests.list
@@ -1,11 +1,8 @@
 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 dom/xml/crashtests/tree.gif
rename to content/xml/document/crashtests/tree.gif
new file mode 100644
--- /dev/null
+++ b/content/xml/document/moz.build
@@ -0,0 +1,8 @@
+# -*- 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']
new file mode 100644
--- /dev/null
+++ b/content/xml/document/public/moz.build
@@ -0,0 +1,10 @@
+# -*- 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',
+]
+
rename from dom/xml/nsIXMLContentSink.h
rename to content/xml/document/public/nsIXMLContentSink.h
rename from dom/xml/resources/XMLMonoPrint.css
rename to content/xml/document/resources/XMLMonoPrint.css
rename from dom/xml/resources/XMLPrettyPrint.css
rename to content/xml/document/resources/XMLPrettyPrint.css
rename from dom/xml/resources/XMLPrettyPrint.xml
rename to content/xml/document/resources/XMLPrettyPrint.xml
rename from dom/xml/resources/XMLPrettyPrint.xsl
rename to content/xml/document/resources/XMLPrettyPrint.xsl
rename from dom/xml/resources/jar.mn
rename to content/xml/document/resources/jar.mn
rename from dom/xml/resources/moz.build
rename to content/xml/document/resources/moz.build
rename from dom/xml/XMLDocument.cpp
rename to content/xml/document/src/XMLDocument.cpp
rename from dom/xml/XMLDocument.h
rename to content/xml/document/src/XMLDocument.h
new file mode 100644
--- /dev/null
+++ b/content/xml/document/src/moz.build
@@ -0,0 +1,31 @@
+# -*- 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'
rename from dom/xml/nsXMLContentSink.cpp
rename to content/xml/document/src/nsXMLContentSink.cpp
rename from dom/xml/nsXMLContentSink.h
rename to content/xml/document/src/nsXMLContentSink.h
rename from dom/xml/nsXMLFragmentContentSink.cpp
rename to content/xml/document/src/nsXMLFragmentContentSink.cpp
rename from dom/xml/nsXMLPrettyPrinter.cpp
rename to content/xml/document/src/nsXMLPrettyPrinter.cpp
rename from dom/xml/nsXMLPrettyPrinter.h
rename to content/xml/document/src/nsXMLPrettyPrinter.h
rename from dom/xml/tests/mochitest/file_bug293347.xml
rename to content/xml/document/test/file_bug293347.xml
rename from dom/xml/tests/mochitest/file_bug293347xslt.xml
rename to content/xml/document/test/file_bug293347xslt.xml
rename from dom/xml/tests/mochitest/mochitest.ini
rename to content/xml/document/test/mochitest.ini
rename from dom/xml/tests/mochitest/moz.build
rename to content/xml/document/test/moz.build
rename from dom/xml/tests/mochitest/test_bug232004.xhtml
rename to content/xml/document/test/test_bug232004.xhtml
rename from dom/xml/tests/mochitest/test_bug293347.html
rename to content/xml/document/test/test_bug293347.html
rename from dom/xml/tests/mochitest/test_bug343870.xhtml
rename to content/xml/document/test/test_bug343870.xhtml
rename from dom/xml/tests/mochitest/test_bug355213.xhtml
rename to content/xml/document/test/test_bug355213.xhtml
rename from dom/xml/tests/mochitest/test_bug392338.html
rename to content/xml/document/test/test_bug392338.html
rename from dom/xml/tests/mochitest/test_bug399502.xhtml
rename to content/xml/document/test/test_bug399502.xhtml
rename from dom/xml/tests/mochitest/test_bug445330.html
rename to content/xml/document/test/test_bug445330.html
rename from dom/xml/tests/mochitest/test_bug691215.html
rename to content/xml/document/test/test_bug691215.html
rename from dom/xml/tests/mochitest/test_viewport.xhtml
rename to content/xml/document/test/test_viewport.xhtml
new file mode 100644
--- /dev/null
+++ b/content/xml/moz.build
@@ -0,0 +1,7 @@
+# -*- 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']
rename from dom/xml/tests/books/bethlehem.gif
rename to content/xml/tests/books/bethlehem.gif
rename from dom/xml/tests/books/bill.gif
rename to content/xml/tests/books/bill.gif
rename from dom/xml/tests/books/books.js
rename to content/xml/tests/books/books.js
rename from dom/xml/tests/books/books.xml
rename to content/xml/tests/books/books.xml
rename from dom/xml/tests/books/charing.gif
rename to content/xml/tests/books/charing.gif
rename from dom/xml/tests/books/classic.css
rename to content/xml/tests/books/classic.css
rename from dom/xml/tests/books/common.css
rename to content/xml/tests/books/common.css
rename from dom/xml/tests/books/kerouac.gif
rename to content/xml/tests/books/kerouac.gif
rename from dom/xml/tests/books/list.css
rename to content/xml/tests/books/list.css
rename from dom/xml/tests/books/road.gif
rename to content/xml/tests/books/road.gif
rename from dom/xml/tests/books/welville.gif
rename to content/xml/tests/books/welville.gif
rename from dom/xml/tests/docbook.css
rename to content/xml/tests/docbook.css
rename from dom/xml/tests/docbooktest.xml
rename to content/xml/tests/docbooktest.xml
rename from dom/xml/tests/flamer.gif
rename to content/xml/tests/flamer.gif
rename from dom/xml/tests/load/display.css
rename to content/xml/tests/load/display.css
rename from dom/xml/tests/load/display.xml
rename to content/xml/tests/load/display.xml
rename from dom/xml/tests/load/load.html
rename to content/xml/tests/load/load.html
rename from dom/xml/tests/load/loadauth.html
rename to content/xml/tests/load/loadauth.html
rename from dom/xml/tests/load/loaddisplay.html
rename to content/xml/tests/load/loaddisplay.html
rename from dom/xml/tests/load/test.xml
rename to content/xml/tests/load/test.xml
rename from dom/xml/tests/script.xml
rename to content/xml/tests/script.xml
rename from dom/xml/tests/simple.xml
rename to content/xml/tests/simple.xml
rename from dom/xml/tests/toc/book.css
rename to content/xml/tests/toc/book.css
rename from dom/xml/tests/toc/irslogo.gif
rename to content/xml/tests/toc/irslogo.gif
rename from dom/xml/tests/toc/minus.gif
rename to content/xml/tests/toc/minus.gif
rename from dom/xml/tests/toc/plus.gif
rename to content/xml/tests/toc/plus.gif
rename from dom/xml/tests/toc/rights.xml
rename to content/xml/tests/toc/rights.xml
rename from dom/xml/tests/toc/toc.css
rename to content/xml/tests/toc/toc.css
rename from dom/xml/tests/toc/toc.js
rename to content/xml/tests/toc/toc.js
rename from dom/xml/tests/xlink/auto.xml
rename to content/xml/tests/xlink/auto.xml
rename from dom/xml/tests/xlink/link.css
rename to content/xml/tests/xlink/link.css
rename from dom/xml/tests/xlink/manual.xml
rename to content/xml/tests/xlink/manual.xml
rename from dom/xml/tests/xmlbase/xmlbase.css
rename to content/xml/tests/xmlbase/xmlbase.css
rename from dom/xml/tests/xmlbase/xmlbase.xml
rename to content/xml/tests/xmlbase/xmlbase.xml
--- a/content/xul/content/src/moz.build
+++ b/content/xul/content/src/moz.build
@@ -15,16 +15,17 @@ 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
@@ -75,17 +75,16 @@ 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'
--- a/gfx/thebes/moz.build
+++ b/gfx/thebes/moz.build
@@ -266,17 +266,17 @@ include('/ipc/chromium/chromium-config.m
 
 FINAL_LIBRARY = 'xul'
 
 GENERATED_FILES = [
     'DeprecatedPremultiplyTables.h',
 ]
 
 LOCAL_INCLUDES += [
-    '/dom/xml',
+    '/content/xml/document/src',
 ]
 
 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,33 +5,34 @@ 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