Backed out changeset 6a0290190c1b (bug 946065)
authorCarsten "Tomcat" Book <cbook@mozilla.com>
Mon, 14 Apr 2014 08:50:29 +0200
changeset 196803 c153aa5be1088073e57fe2a63d806f3b7a161b23
parent 196802 0a1315c30090e8df8b90096e375b6b067a54c1ba
child 196804 5c139817cf242e39e1401e191bd333456c171b0f
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 out6a0290190c1bccb366650d3a0ac0c96f86edda4e
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 6a0290190c1b (bug 946065)
content/mathml/content/crashtests/462929-1.html
content/mathml/content/crashtests/770710-1.html
content/mathml/content/crashtests/crashtests.list
content/mathml/content/src/moz.build
content/mathml/content/src/nsMathMLElement.cpp
content/mathml/content/src/nsMathMLElement.h
content/mathml/content/src/nsMathMLElementFactory.cpp
content/moz.build
dom/mathml/crashtests/462929-1.html
dom/mathml/crashtests/770710-1.html
dom/mathml/crashtests/crashtests.list
dom/mathml/moz.build
dom/mathml/nsMathMLElement.cpp
dom/mathml/nsMathMLElement.h
dom/mathml/nsMathMLElementFactory.cpp
dom/moz.build
layout/mathml/moz.build
testing/crashtest/crashtests.list
rename from dom/mathml/crashtests/462929-1.html
rename to content/mathml/content/crashtests/462929-1.html
rename from dom/mathml/crashtests/770710-1.html
rename to content/mathml/content/crashtests/770710-1.html
rename from dom/mathml/crashtests/crashtests.list
rename to content/mathml/content/crashtests/crashtests.list
rename from dom/mathml/moz.build
rename to content/mathml/content/src/moz.build
rename from dom/mathml/nsMathMLElement.cpp
rename to content/mathml/content/src/nsMathMLElement.cpp
rename from dom/mathml/nsMathMLElement.h
rename to content/mathml/content/src/nsMathMLElement.h
rename from dom/mathml/nsMathMLElementFactory.cpp
rename to content/mathml/content/src/nsMathMLElementFactory.cpp
--- a/content/moz.build
+++ b/content/moz.build
@@ -3,15 +3,16 @@
 # 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',
     'canvas',
     'html',
+    'mathml/content/src',
     'media',
     'svg',
     'xul',
 ]
 
 TEST_TOOL_DIRS += ['test']
 
--- a/dom/moz.build
+++ b/dom/moz.build
@@ -48,17 +48,16 @@ PARALLEL_DIRS += [
     'datastore',
     'devicestorage',
     'encoding',
     'events',
     'file',
     'filesystem',
     'fmradio',
     'asmjscache',
-    'mathml',
     'media',
     'messages',
     'power',
     'push',
     'quota',
     'settings',
     'mobilemessage',
     'src',
--- a/layout/mathml/moz.build
+++ b/layout/mathml/moz.build
@@ -38,17 +38,17 @@ FAIL_ON_WARNINGS = True
 FINAL_LIBRARY = 'gklayout'
 LOCAL_INCLUDES += [
     '../base',
     '../generic',
     '../style',
     '../tables',
     '../xul',
     '/content/base/src',
-    '/dom/mathml',
+    '/content/mathml/content/src',
 ]
 
 if CONFIG['ENABLE_TESTS']:
     PARALLEL_DIRS += [
         'tests',
     ]
 
 JAR_MANIFESTS += ['jar.mn']
--- a/testing/crashtest/crashtests.list
+++ b/testing/crashtest/crashtests.list
@@ -8,27 +8,27 @@ include ../../accessible/tests/crashtest
 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/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/mathml/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