Bug 945091. Part 1: Flatten inspector/public and inspector/src into inspector. r=glandium
authorRobert O'Callahan <robert@ocallahan.org>
Wed, 04 Dec 2013 14:04:23 +1300
changeset 158784 20ba1c3ccad8d5f6f0d38885cc47187b81cb5c37
parent 158783 9b8364f5048885d2ff085e890c22f86f07e17f6b
child 158785 20e0cd2a9c82a7d26be9ac8a5bfb117674ddb675
push id25761
push userryanvm@gmail.com
push dateWed, 04 Dec 2013 22:38:46 +0000
treeherdermozilla-central@1426ffa9caf2 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersglandium
bugs945091
milestone28.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 945091. Part 1: Flatten inspector/public and inspector/src into inspector. r=glandium
layout/build/moz.build
layout/inspector/inCSSValueSearch.cpp
layout/inspector/inCSSValueSearch.h
layout/inspector/inDOMUtils.cpp
layout/inspector/inDOMUtils.h
layout/inspector/inDOMView.cpp
layout/inspector/inDOMView.h
layout/inspector/inDeepTreeWalker.cpp
layout/inspector/inDeepTreeWalker.h
layout/inspector/inFlasher.cpp
layout/inspector/inFlasher.h
layout/inspector/inICSSValueSearch.idl
layout/inspector/inIDOMUtils.idl
layout/inspector/inIDOMView.idl
layout/inspector/inIDeepTreeWalker.idl
layout/inspector/inIFlasher.idl
layout/inspector/inISearchObserver.idl
layout/inspector/inISearchProcess.idl
layout/inspector/inLayoutUtils.cpp
layout/inspector/inLayoutUtils.h
layout/inspector/inSearchLoop.cpp
layout/inspector/inSearchLoop.h
layout/inspector/moz.build
layout/inspector/nsFontFace.cpp
layout/inspector/nsFontFace.h
layout/inspector/nsFontFaceList.cpp
layout/inspector/nsFontFaceList.h
layout/inspector/nsIDOMFontFace.idl
layout/inspector/nsIDOMFontFaceList.idl
layout/inspector/public/inICSSValueSearch.idl
layout/inspector/public/inIDOMUtils.idl
layout/inspector/public/inIDOMView.idl
layout/inspector/public/inIDeepTreeWalker.idl
layout/inspector/public/inIFlasher.idl
layout/inspector/public/inISearchObserver.idl
layout/inspector/public/inISearchProcess.idl
layout/inspector/public/moz.build
layout/inspector/public/nsIDOMFontFace.idl
layout/inspector/public/nsIDOMFontFaceList.idl
layout/inspector/src/inCSSValueSearch.cpp
layout/inspector/src/inCSSValueSearch.h
layout/inspector/src/inDOMUtils.cpp
layout/inspector/src/inDOMUtils.h
layout/inspector/src/inDOMView.cpp
layout/inspector/src/inDOMView.h
layout/inspector/src/inDeepTreeWalker.cpp
layout/inspector/src/inDeepTreeWalker.h
layout/inspector/src/inFlasher.cpp
layout/inspector/src/inFlasher.h
layout/inspector/src/inLayoutUtils.cpp
layout/inspector/src/inLayoutUtils.h
layout/inspector/src/inSearchLoop.cpp
layout/inspector/src/inSearchLoop.h
layout/inspector/src/moz.build
layout/inspector/src/nsFontFace.cpp
layout/inspector/src/nsFontFace.h
layout/inspector/src/nsFontFaceList.cpp
layout/inspector/src/nsFontFaceList.h
layout/moz.build
--- a/layout/build/moz.build
+++ b/layout/build/moz.build
@@ -28,17 +28,17 @@ MSVC_ENABLE_PGO = True
 LIBRARY_NAME = 'gklayout'
 
 include('/ipc/chromium/chromium-config.mozbuild')
 
 LOCAL_INCLUDES += [
     '../base',
     '../forms',
     '../generic',
-    '../inspector/src',
+    '../inspector',
     '../mathml',
     '../style',
     '../tables',
     '../xul/base/src',
     '/caps/include',
     '/content/base/src',
     '/content/canvas/src',
     '/content/events/src',
rename from layout/inspector/src/inCSSValueSearch.cpp
rename to layout/inspector/inCSSValueSearch.cpp
rename from layout/inspector/src/inCSSValueSearch.h
rename to layout/inspector/inCSSValueSearch.h
rename from layout/inspector/src/inDOMUtils.cpp
rename to layout/inspector/inDOMUtils.cpp
rename from layout/inspector/src/inDOMUtils.h
rename to layout/inspector/inDOMUtils.h
rename from layout/inspector/src/inDOMView.cpp
rename to layout/inspector/inDOMView.cpp
rename from layout/inspector/src/inDOMView.h
rename to layout/inspector/inDOMView.h
rename from layout/inspector/src/inDeepTreeWalker.cpp
rename to layout/inspector/inDeepTreeWalker.cpp
rename from layout/inspector/src/inDeepTreeWalker.h
rename to layout/inspector/inDeepTreeWalker.h
rename from layout/inspector/src/inFlasher.cpp
rename to layout/inspector/inFlasher.cpp
rename from layout/inspector/src/inFlasher.h
rename to layout/inspector/inFlasher.h
rename from layout/inspector/public/inICSSValueSearch.idl
rename to layout/inspector/inICSSValueSearch.idl
rename from layout/inspector/public/inIDOMUtils.idl
rename to layout/inspector/inIDOMUtils.idl
rename from layout/inspector/public/inIDOMView.idl
rename to layout/inspector/inIDOMView.idl
rename from layout/inspector/public/inIDeepTreeWalker.idl
rename to layout/inspector/inIDeepTreeWalker.idl
rename from layout/inspector/public/inIFlasher.idl
rename to layout/inspector/inIFlasher.idl
rename from layout/inspector/public/inISearchObserver.idl
rename to layout/inspector/inISearchObserver.idl
rename from layout/inspector/public/inISearchProcess.idl
rename to layout/inspector/inISearchProcess.idl
rename from layout/inspector/src/inLayoutUtils.cpp
rename to layout/inspector/inLayoutUtils.cpp
rename from layout/inspector/src/inLayoutUtils.h
rename to layout/inspector/inLayoutUtils.h
rename from layout/inspector/src/inSearchLoop.cpp
rename to layout/inspector/inSearchLoop.cpp
rename from layout/inspector/src/inSearchLoop.h
rename to layout/inspector/inSearchLoop.h
rename from layout/inspector/src/moz.build
rename to layout/inspector/moz.build
--- a/layout/inspector/src/moz.build
+++ b/layout/inspector/moz.build
@@ -1,14 +1,28 @@
 # -*- 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'
+
 EXPORTS += [
     'nsFontFace.h',
     'nsFontFaceList.h',
 ]
 
 UNIFIED_SOURCES += [
     'inCSSValueSearch.cpp',
     'inDeepTreeWalker.cpp',
@@ -24,13 +38,18 @@ if CONFIG['MOZ_XUL']:
     UNIFIED_SOURCES += [
         'inDOMView.cpp',
     ]
 
 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',
+    ]
rename from layout/inspector/src/nsFontFace.cpp
rename to layout/inspector/nsFontFace.cpp
rename from layout/inspector/src/nsFontFace.h
rename to layout/inspector/nsFontFace.h
rename from layout/inspector/src/nsFontFaceList.cpp
rename to layout/inspector/nsFontFaceList.cpp
rename from layout/inspector/src/nsFontFaceList.h
rename to layout/inspector/nsFontFaceList.h
rename from layout/inspector/public/nsIDOMFontFace.idl
rename to layout/inspector/nsIDOMFontFace.idl
rename from layout/inspector/public/nsIDOMFontFaceList.idl
rename to layout/inspector/nsIDOMFontFaceList.idl
deleted file mode 100644
--- a/layout/inspector/public/moz.build
+++ /dev/null
@@ -1,20 +0,0 @@
-# -*- 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'
-
--- a/layout/moz.build
+++ b/layout/moz.build
@@ -10,31 +10,28 @@ PARALLEL_DIRS += [
     'generic',
     'forms',
     'tables',
     'svg',
     'xul/base/public',
     'xul/base/src',
     'ipc',
     'mathml',
-    'inspector/public',
-    'inspector/src',
+    'inspector',
     'tools/recording',
 ]
 
 if CONFIG['NS_PRINTING']:
     PARALLEL_DIRS += ['printing']
 
 if CONFIG['MOZ_XUL']:
     PARALLEL_DIRS += ['xul/tree', 'xul/grid']
 
 if CONFIG['ENABLE_TESTS']:
     PARALLEL_DIRS += [
-        'inspector/tests',
-        'inspector/tests/chrome',
         'mathml/tests',
         'xul/test',
         'xul/base/test',
     ]
 
 TEST_TOOL_DIRS += [
     'tools/reftest',
     'reftests/fonts',