Bug 946065 - Part 7: Move content/mathml/ to dom/ and flatten subdirectories. r=karlt
authorBirunthan Mohanathas <birunthan@mohanathas.com>
Fri, 25 Jul 2014 14:15:35 -0700
changeset 217830 bf3d1eb30dcfd4bcfb3243a94f9f2ab284c9c22d
parent 217829 a947d30dc810ed8fbd7de49c682b59b96769bc76
child 217831 af1e635f0846cce006ded862a7afc6636a065d75
push id3979
push userraliiev@mozilla.com
push dateMon, 13 Oct 2014 16:35:44 +0000
treeherdermozilla-beta@30f2cc610691 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerskarlt
bugs946065
milestone34.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
@@ -2,16 +2,15 @@
 # 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 += [
     'base',
     '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
@@ -51,16 +51,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 = 'xul'
 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
@@ -7,28 +7,28 @@ include ../../accessible/tests/crashtest
 
 include ../../content/base/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/canvas/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||!webrtc) include ../../dom/media/tests/crashtests/crashtests.list