Bug 946065 - Part 7: Move content/mathml/ to dom/ and flatten subdirectories. r=karlt
☠☠ backed out by 6f0b312e09aa ☠ ☠
authorBirunthan Mohanathas <birunthan@mohanathas.com>
Mon, 12 May 2014 22:29:03 +0300
changeset 201960 7b6b04006c1b5757772906ced329c4151531fe3e
parent 201959 9b673ac36f66a926d3d8c95111a24270348b43c0
child 201961 85228ee8ce8b1ed628e49baf88104469fb0ea7e6
push id3741
push userasasaki@mozilla.com
push dateMon, 21 Jul 2014 20:25:18 +0000
treeherdermozilla-beta@4d6f46f5af68 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerskarlt
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 7: Move content/mathml/ to dom/ and flatten subdirectories. r=karlt
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
--- a/content/moz.build
+++ b/content/moz.build
@@ -3,16 +3,15 @@
 # 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']
 
rename from content/mathml/content/crashtests/462929-1.html
rename to dom/mathml/crashtests/462929-1.html
rename from content/mathml/content/crashtests/770710-1.html
rename to dom/mathml/crashtests/770710-1.html
rename from content/mathml/content/crashtests/crashtests.list
rename to dom/mathml/crashtests/crashtests.list
rename from content/mathml/content/src/moz.build
rename to dom/mathml/moz.build
rename from content/mathml/content/src/nsMathMLElement.cpp
rename to dom/mathml/nsMathMLElement.cpp
rename from content/mathml/content/src/nsMathMLElement.h
rename to dom/mathml/nsMathMLElement.h
rename from content/mathml/content/src/nsMathMLElementFactory.cpp
rename to dom/mathml/nsMathMLElementFactory.cpp
--- a/dom/moz.build
+++ b/dom/moz.build
@@ -49,16 +49,17 @@ PARALLEL_DIRS += [
     'datastore',
     'devicestorage',
     'encoding',
     'events',
     'filehandle',
     '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',
-    '/content/mathml/content/src',
+    '/dom/mathml',
 ]
 
 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