Backed out changeset c2350812b7f1 (bug 946065) hoping this fix the B2G mochitest-7 perma-fail on a CLOSED TREE

--HG--
rename : dom/xml/crashtests/420429.xul => content/xml/content/crashtest/420429.xul
rename : dom/xml/crashtests/453278-frame.xml => content/xml/content/crashtest/453278-frame.xml
rename : dom/xml/crashtests/453278.html => content/xml/content/crashtest/453278.html
rename : dom/xml/crashtests/803586.xhtml => content/xml/content/crashtest/803586.xhtml
rename : dom/xml/CDATASection.cpp => content/xml/content/src/CDATASection.cpp
rename : dom/xml/CDATASection.h => content/xml/content/src/CDATASection.h
rename : dom/xml/ProcessingInstruction.cpp => content/xml/content/src/ProcessingInstruction.cpp
rename : dom/xml/ProcessingInstruction.h => content/xml/content/src/ProcessingInstruction.h
rename : dom/xml/XMLStylesheetProcessingInstruction.cpp => content/xml/content/src/XMLStylesheetProcessingInstruction.cpp
rename : dom/xml/XMLStylesheetProcessingInstruction.h => content/xml/content/src/XMLStylesheetProcessingInstruction.h
rename : dom/xml/htmlmathml-f.ent => content/xml/content/src/htmlmathml-f.ent
rename : dom/xml/moz.build => content/xml/content/src/moz.build
rename : dom/xml/nsXMLElement.cpp => content/xml/content/src/nsXMLElement.cpp
rename : dom/xml/nsXMLElement.h => content/xml/content/src/nsXMLElement.h
rename : dom/xml/crashtests/136896-1.xml => content/xml/document/crashtests/136896-1.xml
rename : dom/xml/crashtests/185285-1.xml => content/xml/document/crashtests/185285-1.xml
rename : dom/xml/crashtests/382636-1.xml => content/xml/document/crashtests/382636-1.xml
rename : dom/xml/crashtests/382636-2.svg => content/xml/document/crashtests/382636-2.svg
rename : dom/xml/crashtests/382636-3.xhtml => content/xml/document/crashtests/382636-3.xhtml
rename : dom/xml/crashtests/382636-4.xul => content/xml/document/crashtests/382636-4.xul
rename : dom/xml/crashtests/431703-1.xhtml => content/xml/document/crashtests/431703-1.xhtml
rename : dom/xml/crashtests/crashtests.list => content/xml/document/crashtests/crashtests.list
rename : dom/xml/crashtests/tree.gif => content/xml/document/crashtests/tree.gif
rename : dom/xml/nsIXMLContentSink.h => content/xml/document/public/nsIXMLContentSink.h
rename : dom/xml/resources/XMLMonoPrint.css => content/xml/document/resources/XMLMonoPrint.css
rename : dom/xml/resources/XMLPrettyPrint.css => content/xml/document/resources/XMLPrettyPrint.css
rename : dom/xml/resources/XMLPrettyPrint.xml => content/xml/document/resources/XMLPrettyPrint.xml
rename : dom/xml/resources/XMLPrettyPrint.xsl => content/xml/document/resources/XMLPrettyPrint.xsl
rename : dom/xml/resources/jar.mn => content/xml/document/resources/jar.mn
rename : dom/xml/resources/moz.build => content/xml/document/resources/moz.build
rename : dom/xml/XMLDocument.cpp => content/xml/document/src/XMLDocument.cpp
rename : dom/xml/XMLDocument.h => content/xml/document/src/XMLDocument.h
rename : dom/xml/nsXMLContentSink.cpp => content/xml/document/src/nsXMLContentSink.cpp
rename : dom/xml/nsXMLContentSink.h => content/xml/document/src/nsXMLContentSink.h
rename : dom/xml/nsXMLFragmentContentSink.cpp => content/xml/document/src/nsXMLFragmentContentSink.cpp
rename : dom/xml/nsXMLPrettyPrinter.cpp => content/xml/document/src/nsXMLPrettyPrinter.cpp
rename : dom/xml/nsXMLPrettyPrinter.h => content/xml/document/src/nsXMLPrettyPrinter.h
rename : dom/xml/tests/mochitest/file_bug293347.xml => content/xml/document/test/file_bug293347.xml
rename : dom/xml/tests/mochitest/file_bug293347xslt.xml => content/xml/document/test/file_bug293347xslt.xml
rename : dom/xml/tests/mochitest/mochitest.ini => content/xml/document/test/mochitest.ini
rename : dom/xml/tests/mochitest/moz.build => content/xml/document/test/moz.build
rename : dom/xml/tests/mochitest/test_bug232004.xhtml => content/xml/document/test/test_bug232004.xhtml
rename : dom/xml/tests/mochitest/test_bug293347.html => content/xml/document/test/test_bug293347.html
rename : dom/xml/tests/mochitest/test_bug343870.xhtml => content/xml/document/test/test_bug343870.xhtml
rename : dom/xml/tests/mochitest/test_bug355213.xhtml => content/xml/document/test/test_bug355213.xhtml
rename : dom/xml/tests/mochitest/test_bug392338.html => content/xml/document/test/test_bug392338.html
rename : dom/xml/tests/mochitest/test_bug399502.xhtml => content/xml/document/test/test_bug399502.xhtml
rename : dom/xml/tests/mochitest/test_bug445330.html => content/xml/document/test/test_bug445330.html
rename : dom/xml/tests/mochitest/test_bug691215.html => content/xml/document/test/test_bug691215.html
rename : dom/xml/tests/mochitest/test_viewport.xhtml => content/xml/document/test/test_viewport.xhtml
rename : dom/xml/tests/books/bethlehem.gif => content/xml/tests/books/bethlehem.gif
rename : dom/xml/tests/books/bill.gif => content/xml/tests/books/bill.gif
rename : dom/xml/tests/books/books.js => content/xml/tests/books/books.js
rename : dom/xml/tests/books/books.xml => content/xml/tests/books/books.xml
rename : dom/xml/tests/books/charing.gif => content/xml/tests/books/charing.gif
rename : dom/xml/tests/books/classic.css => content/xml/tests/books/classic.css
rename : dom/xml/tests/books/common.css => content/xml/tests/books/common.css
rename : dom/xml/tests/books/kerouac.gif => content/xml/tests/books/kerouac.gif
rename : dom/xml/tests/books/list.css => content/xml/tests/books/list.css
rename : dom/xml/tests/books/road.gif => content/xml/tests/books/road.gif
rename : dom/xml/tests/books/welville.gif => content/xml/tests/books/welville.gif
rename : dom/xml/tests/docbook.css => content/xml/tests/docbook.css
rename : dom/xml/tests/docbooktest.xml => content/xml/tests/docbooktest.xml
rename : dom/xml/tests/flamer.gif => content/xml/tests/flamer.gif
rename : dom/xml/tests/load/display.css => content/xml/tests/load/display.css
rename : dom/xml/tests/load/display.xml => content/xml/tests/load/display.xml
rename : dom/xml/tests/load/load.html => content/xml/tests/load/load.html
rename : dom/xml/tests/load/loadauth.html => content/xml/tests/load/loadauth.html
rename : dom/xml/tests/load/loaddisplay.html => content/xml/tests/load/loaddisplay.html
rename : dom/xml/tests/load/test.xml => content/xml/tests/load/test.xml
rename : dom/xml/tests/script.xml => content/xml/tests/script.xml
rename : dom/xml/tests/simple.xml => content/xml/tests/simple.xml
rename : dom/xml/tests/toc/book.css => content/xml/tests/toc/book.css
rename : dom/xml/tests/toc/irslogo.gif => content/xml/tests/toc/irslogo.gif
rename : dom/xml/tests/toc/minus.gif => content/xml/tests/toc/minus.gif
rename : dom/xml/tests/toc/plus.gif => content/xml/tests/toc/plus.gif
rename : dom/xml/tests/toc/rights.xml => content/xml/tests/toc/rights.xml
rename : dom/xml/tests/toc/toc.css => content/xml/tests/toc/toc.css
rename : dom/xml/tests/toc/toc.js => content/xml/tests/toc/toc.js
rename : dom/xml/tests/xlink/auto.xml => content/xml/tests/xlink/auto.xml
rename : dom/xml/tests/xlink/link.css => content/xml/tests/xlink/link.css
rename : dom/xml/tests/xlink/manual.xml => content/xml/tests/xlink/manual.xml
rename : dom/xml/tests/xmlbase/xmlbase.css => content/xml/tests/xmlbase/xmlbase.css
rename : dom/xml/tests/xmlbase/xmlbase.xml => content/xml/tests/xmlbase/xmlbase.xml

content/base/src/moz.build

@@ -209,6 +209,8 @@ LOCAL_INCLUDES += [
     '/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',
@@ -216,7 +218,6 @@ LOCAL_INCLUDES += [
     '/dom/ipc',
     '/dom/workers',
     '/dom/xbl',
-    '/dom/xml',
     '/dom/xslt/xpath',
     '/image/src',
     '/js/ipc',

content/moz.build

@@ -11,6 +11,7 @@ PARALLEL_DIRS += [
     'mathml/content/src',
     'media',
     'svg',
+    'xml',
     'xul',
 ]
 

content/svg/content/src/moz.build

@@ -253,10 +253,10 @@ 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',

content/svg/document/src/moz.build

@@ -18,7 +18,7 @@ LOCAL_INCLUDES += [
     '/content/base/src',
     '/content/html/document/src',
     '/content/svg/content/src',
-    '/dom/xml',
+    '/content/xml/document/src',
     '/layout/style',
 ]
 

content/xml/content/crashtest/crashtests.list

@@ -0,0 +1,3 @@
+load 420429.xul
+load 453278.html
+load 803586.xhtml

content/xml/content/src/moz.build

@@ -4,32 +4,17 @@
 # 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',
 ]
 
@@ -38,14 +23,8 @@ 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 += [

content/xml/document/crashtests/crashtests.list

@@ -4,8 +4,5 @@ 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

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']

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',
+]
+

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'

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']

content/xul/content/src/moz.build

@@ -20,8 +20,9 @@ LOCAL_INCLUDES += [
     '../../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',

content/xul/document/src/moz.build

@@ -23,12 +23,12 @@ 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',

dom/bindings/moz.build

@@ -46,6 +46,7 @@ LOCAL_INCLUDES += [
     '/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',
@@ -57,7 +58,6 @@ LOCAL_INCLUDES += [
     '/dom/src/geolocation',
     '/dom/workers',
     '/dom/xbl',
-    '/dom/xml',
     '/dom/xslt/base',
     '/dom/xslt/xpath',
     '/js/ipc',

dom/events/moz.build

@@ -125,12 +125,12 @@ 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',

dom/moz.build

@@ -80,7 +80,6 @@ PARALLEL_DIRS += [
     'inputmethod',
     'webidl',
     'xbl',
-    'xml',
     'xslt',
 ]
 

dom/xbl/moz.build

@@ -44,10 +44,10 @@ 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',
 ]
 

gfx/thebes/moz.build

@@ -271,7 +271,7 @@ GENERATED_FILES = [
 ]
 
 LOCAL_INCLUDES += [
-    '/dom/xml',
+    '/content/xml/document/src',
 ]
 
 if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('android', 'gtk2', 'gtk3', 'gonk', 'qt'):