From 95a13cfc517cbb3acd06d740af1be443eacd0240 Mon Sep 17 00:00:00 2001
From: "Carsten \"Tomcat\" Book" <cbook@mozilla.com>
Date: Mon, 14 Apr 2014 08:50:29 +0200
Subject: [PATCH] Backed out changeset 6a0290190c1b (bug 946065)

--HG--
rename : dom/mathml/crashtests/462929-1.html => content/mathml/content/crashtests/462929-1.html
rename : dom/mathml/crashtests/770710-1.html => content/mathml/content/crashtests/770710-1.html
rename : dom/mathml/crashtests/crashtests.list => content/mathml/content/crashtests/crashtests.list
rename : dom/mathml/moz.build => content/mathml/content/src/moz.build
rename : dom/mathml/nsMathMLElement.cpp => content/mathml/content/src/nsMathMLElement.cpp
rename : dom/mathml/nsMathMLElement.h => content/mathml/content/src/nsMathMLElement.h
rename : dom/mathml/nsMathMLElementFactory.cpp => content/mathml/content/src/nsMathMLElementFactory.cpp
---
 {dom/mathml => content/mathml/content}/crashtests/462929-1.html | 0
 {dom/mathml => content/mathml/content}/crashtests/770710-1.html | 0
 .../mathml/content}/crashtests/crashtests.list                  | 0
 {dom/mathml => content/mathml/content/src}/moz.build            | 0
 {dom/mathml => content/mathml/content/src}/nsMathMLElement.cpp  | 0
 {dom/mathml => content/mathml/content/src}/nsMathMLElement.h    | 0
 .../mathml/content/src}/nsMathMLElementFactory.cpp              | 0
 content/moz.build                                               | 1 +
 dom/moz.build                                                   | 1 -
 layout/mathml/moz.build                                         | 2 +-
 testing/crashtest/crashtests.list                               | 2 +-
 11 files changed, 3 insertions(+), 3 deletions(-)
 rename {dom/mathml => content/mathml/content}/crashtests/462929-1.html (100%)
 rename {dom/mathml => content/mathml/content}/crashtests/770710-1.html (100%)
 rename {dom/mathml => content/mathml/content}/crashtests/crashtests.list (100%)
 rename {dom/mathml => content/mathml/content/src}/moz.build (100%)
 rename {dom/mathml => content/mathml/content/src}/nsMathMLElement.cpp (100%)
 rename {dom/mathml => content/mathml/content/src}/nsMathMLElement.h (100%)
 rename {dom/mathml => content/mathml/content/src}/nsMathMLElementFactory.cpp (100%)

diff --git a/dom/mathml/crashtests/462929-1.html b/content/mathml/content/crashtests/462929-1.html
similarity index 100%
rename from dom/mathml/crashtests/462929-1.html
rename to content/mathml/content/crashtests/462929-1.html
diff --git a/dom/mathml/crashtests/770710-1.html b/content/mathml/content/crashtests/770710-1.html
similarity index 100%
rename from dom/mathml/crashtests/770710-1.html
rename to content/mathml/content/crashtests/770710-1.html
diff --git a/dom/mathml/crashtests/crashtests.list b/content/mathml/content/crashtests/crashtests.list
similarity index 100%
rename from dom/mathml/crashtests/crashtests.list
rename to content/mathml/content/crashtests/crashtests.list
diff --git a/dom/mathml/moz.build b/content/mathml/content/src/moz.build
similarity index 100%
rename from dom/mathml/moz.build
rename to content/mathml/content/src/moz.build
diff --git a/dom/mathml/nsMathMLElement.cpp b/content/mathml/content/src/nsMathMLElement.cpp
similarity index 100%
rename from dom/mathml/nsMathMLElement.cpp
rename to content/mathml/content/src/nsMathMLElement.cpp
diff --git a/dom/mathml/nsMathMLElement.h b/content/mathml/content/src/nsMathMLElement.h
similarity index 100%
rename from dom/mathml/nsMathMLElement.h
rename to content/mathml/content/src/nsMathMLElement.h
diff --git a/dom/mathml/nsMathMLElementFactory.cpp b/content/mathml/content/src/nsMathMLElementFactory.cpp
similarity index 100%
rename from dom/mathml/nsMathMLElementFactory.cpp
rename to content/mathml/content/src/nsMathMLElementFactory.cpp
diff --git a/content/moz.build b/content/moz.build
index c2852df968ff..31d5af6ea27b 100644
--- a/content/moz.build
+++ b/content/moz.build
@@ -8,6 +8,7 @@ PARALLEL_DIRS += [
     'base',
     'canvas',
     'html',
+    'mathml/content/src',
     'media',
     'svg',
     'xul',
diff --git a/dom/moz.build b/dom/moz.build
index 24cbdcb4a75f..c1fef1a9862b 100644
--- a/dom/moz.build
+++ b/dom/moz.build
@@ -53,7 +53,6 @@ PARALLEL_DIRS += [
     'filesystem',
     'fmradio',
     'asmjscache',
-    'mathml',
     'media',
     'messages',
     'power',
diff --git a/layout/mathml/moz.build b/layout/mathml/moz.build
index 92c77a72c507..62fd09c48938 100644
--- a/layout/mathml/moz.build
+++ b/layout/mathml/moz.build
@@ -43,7 +43,7 @@ LOCAL_INCLUDES += [
     '../tables',
     '../xul',
     '/content/base/src',
-    '/dom/mathml',
+    '/content/mathml/content/src',
 ]
 
 if CONFIG['ENABLE_TESTS']:
diff --git a/testing/crashtest/crashtests.list b/testing/crashtest/crashtests.list
index 46cdf68a52c2..d61c2b120421 100644
--- a/testing/crashtest/crashtests.list
+++ b/testing/crashtest/crashtests.list
@@ -13,6 +13,7 @@ include ../../content/svg/content/src/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
@@ -23,7 +24,6 @@ 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/mathml/crashtests/crashtests.list
 include ../../dom/smil/crashtests/crashtests.list
 include ../../dom/xbl/crashtests/crashtests.list
 include ../../dom/xml/crashtests/crashtests.list