Backed out changeset 1dcb339812d1 (bug 945091) for mochitest-8 bustag…

…e on a CLOSED TREE
mozilla-spidermonkey · Dec 4, 2013 · 8e491c7 · 8e491c7
1 parent ed506ad
commit 8e491c7
Show file tree

Hide file tree

Showing 31 changed files with 26 additions and 22 deletions.
diff --git a/layout/build/moz.build b/layout/build/moz.build
@@ -33,7 +33,7 @@ LOCAL_INCLUDES += [
     '../base',
     '../forms',
     '../generic',
-    '../inspector',
+    '../inspector/src',
     '../mathml',
     '../style',
     '../tables',

diff --git a/layout/inspector/inICSSValueSearch.idl → ...ut/inspector/public/inICSSValueSearch.idl b/layout/inspector/inICSSValueSearch.idl → ...ut/inspector/public/inICSSValueSearch.idl
diff --git a/layout/inspector/inIDOMUtils.idl → layout/inspector/public/inIDOMUtils.idl b/layout/inspector/inIDOMUtils.idl → layout/inspector/public/inIDOMUtils.idl
diff --git a/layout/inspector/inIDOMView.idl → layout/inspector/public/inIDOMView.idl b/layout/inspector/inIDOMView.idl → layout/inspector/public/inIDOMView.idl
diff --git a/layout/inspector/inIDeepTreeWalker.idl → ...ut/inspector/public/inIDeepTreeWalker.idl b/layout/inspector/inIDeepTreeWalker.idl → ...ut/inspector/public/inIDeepTreeWalker.idl
diff --git a/layout/inspector/inIFlasher.idl → layout/inspector/public/inIFlasher.idl b/layout/inspector/inIFlasher.idl → layout/inspector/public/inIFlasher.idl
diff --git a/layout/inspector/inISearchObserver.idl → ...ut/inspector/public/inISearchObserver.idl b/layout/inspector/inISearchObserver.idl → ...ut/inspector/public/inISearchObserver.idl
diff --git a/layout/inspector/inISearchProcess.idl → layout/inspector/public/inISearchProcess.idl b/layout/inspector/inISearchProcess.idl → layout/inspector/public/inISearchProcess.idl
diff --git a/layout/inspector/public/moz.build b/layout/inspector/public/moz.build
@@ -0,0 +1,20 @@
+# -*- 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/.
+
+XPIDL_SOURCES += [
+    'inICSSValueSearch.idl',
+    'inIDeepTreeWalker.idl',
+    'inIDOMUtils.idl',
+    'inIDOMView.idl',
+    'inIFlasher.idl',
+    'inISearchObserver.idl',
+    'inISearchProcess.idl',
+    'nsIDOMFontFace.idl',
+    'nsIDOMFontFaceList.idl',
+]
+
+XPIDL_MODULE = 'inspector'
+
diff --git a/layout/inspector/nsIDOMFontFace.idl → layout/inspector/public/nsIDOMFontFace.idl b/layout/inspector/nsIDOMFontFace.idl → layout/inspector/public/nsIDOMFontFace.idl
diff --git a/layout/inspector/nsIDOMFontFaceList.idl → ...t/inspector/public/nsIDOMFontFaceList.idl b/layout/inspector/nsIDOMFontFaceList.idl → ...t/inspector/public/nsIDOMFontFaceList.idl
diff --git a/layout/inspector/inCSSValueSearch.cpp → layout/inspector/src/inCSSValueSearch.cpp b/layout/inspector/inCSSValueSearch.cpp → layout/inspector/src/inCSSValueSearch.cpp
diff --git a/layout/inspector/inCSSValueSearch.h → layout/inspector/src/inCSSValueSearch.h b/layout/inspector/inCSSValueSearch.h → layout/inspector/src/inCSSValueSearch.h
diff --git a/layout/inspector/inDOMUtils.cpp → layout/inspector/src/inDOMUtils.cpp b/layout/inspector/inDOMUtils.cpp → layout/inspector/src/inDOMUtils.cpp
diff --git a/layout/inspector/inDOMUtils.h → layout/inspector/src/inDOMUtils.h b/layout/inspector/inDOMUtils.h → layout/inspector/src/inDOMUtils.h
diff --git a/layout/inspector/inDOMView.cpp → layout/inspector/src/inDOMView.cpp b/layout/inspector/inDOMView.cpp → layout/inspector/src/inDOMView.cpp
diff --git a/layout/inspector/inDOMView.h → layout/inspector/src/inDOMView.h b/layout/inspector/inDOMView.h → layout/inspector/src/inDOMView.h
diff --git a/layout/inspector/inDeepTreeWalker.cpp → layout/inspector/src/inDeepTreeWalker.cpp b/layout/inspector/inDeepTreeWalker.cpp → layout/inspector/src/inDeepTreeWalker.cpp
diff --git a/layout/inspector/inDeepTreeWalker.h → layout/inspector/src/inDeepTreeWalker.h b/layout/inspector/inDeepTreeWalker.h → layout/inspector/src/inDeepTreeWalker.h
diff --git a/layout/inspector/inFlasher.cpp → layout/inspector/src/inFlasher.cpp b/layout/inspector/inFlasher.cpp → layout/inspector/src/inFlasher.cpp
diff --git a/layout/inspector/inFlasher.h → layout/inspector/src/inFlasher.h b/layout/inspector/inFlasher.h → layout/inspector/src/inFlasher.h
diff --git a/layout/inspector/inLayoutUtils.cpp → layout/inspector/src/inLayoutUtils.cpp b/layout/inspector/inLayoutUtils.cpp → layout/inspector/src/inLayoutUtils.cpp
diff --git a/layout/inspector/inLayoutUtils.h → layout/inspector/src/inLayoutUtils.h b/layout/inspector/inLayoutUtils.h → layout/inspector/src/inLayoutUtils.h
diff --git a/layout/inspector/inSearchLoop.cpp → layout/inspector/src/inSearchLoop.cpp b/layout/inspector/inSearchLoop.cpp → layout/inspector/src/inSearchLoop.cpp
diff --git a/layout/inspector/inSearchLoop.h → layout/inspector/src/inSearchLoop.h b/layout/inspector/inSearchLoop.h → layout/inspector/src/inSearchLoop.h
diff --git a/layout/inspector/moz.build → layout/inspector/src/moz.build b/layout/inspector/moz.build → layout/inspector/src/moz.build
@@ -4,20 +4,6 @@
 # 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/.
 
-XPIDL_SOURCES += [
-    'inICSSValueSearch.idl',
-    'inIDeepTreeWalker.idl',
-    'inIDOMUtils.idl',
-    'inIDOMView.idl',
-    'inIFlasher.idl',
-    'inISearchObserver.idl',
-    'inISearchProcess.idl',
-    'nsIDOMFontFace.idl',
-    'nsIDOMFontFaceList.idl',
-]
-
-XPIDL_MODULE = 'inspector'
-
 EXPORTS += [
     'nsFontFace.h',
     'nsFontFaceList.h',
@@ -43,13 +29,8 @@ FAIL_ON_WARNINGS = True
 
 FINAL_LIBRARY = 'gklayout'
 LOCAL_INCLUDES += [
-    '../style',
+    '../../style',
     '/content/base/src',
     '/content/xbl/src',
 ]
 
-if CONFIG['ENABLE_TESTS']:
-    PARALLEL_DIRS += [
-        'tests',
-        'tests/chrome',
-    ]
diff --git a/layout/inspector/nsFontFace.cpp → layout/inspector/src/nsFontFace.cpp b/layout/inspector/nsFontFace.cpp → layout/inspector/src/nsFontFace.cpp
diff --git a/layout/inspector/nsFontFace.h → layout/inspector/src/nsFontFace.h b/layout/inspector/nsFontFace.h → layout/inspector/src/nsFontFace.h
diff --git a/layout/inspector/nsFontFaceList.cpp → layout/inspector/src/nsFontFaceList.cpp b/layout/inspector/nsFontFaceList.cpp → layout/inspector/src/nsFontFaceList.cpp
diff --git a/layout/inspector/nsFontFaceList.h → layout/inspector/src/nsFontFaceList.h b/layout/inspector/nsFontFaceList.h → layout/inspector/src/nsFontFaceList.h
diff --git a/layout/moz.build b/layout/moz.build
@@ -15,7 +15,8 @@ PARALLEL_DIRS += [
     'xul/base/src',
     'ipc',
     'mathml',
-    'inspector',
+    'inspector/public',
+    'inspector/src',
     'tools/recording',
 ]
 
@@ -27,6 +28,8 @@ if CONFIG['MOZ_XUL']:
 
 if CONFIG['ENABLE_TESTS']:
     PARALLEL_DIRS += [
+        'inspector/tests',
+        'inspector/tests/chrome',
         'mathml/tests',
         'xul/test',
         'xul/base/test',