☠☠ backed out by 9b8364f50488 ☠ ☠ | |
author | Robert O'Callahan <robert@ocallahan.org> |
Wed, 04 Dec 2013 14:04:23 +1300 | |
changeset 158772 | 1dcb339812d1bd157e5c8a123cff9d77252f4978 |
parent 158771 | 30a98b93ba256498bdbeef2008c4c469beda973c |
child 158773 | 9d2111fee8d5dbbf44a330818f69b06b331e3578 |
push id | 25761 |
push user | ryanvm@gmail.com |
push date | Wed, 04 Dec 2013 22:38:46 +0000 |
treeherder | mozilla-central@1426ffa9caf2 [default view] [failures only] |
perfherder | [talos] [build metrics] [platform microbench] (compared to previous push) |
reviewers | glandium |
bugs | 945091 |
milestone | 28.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
|
--- 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/inDeepTreeWalker.cpp rename to layout/inspector/inDeepTreeWalker.cpp
rename from layout/inspector/public/inICSSValueSearch.idl rename to layout/inspector/inICSSValueSearch.idl
rename from layout/inspector/public/inIDeepTreeWalker.idl rename to layout/inspector/inIDeepTreeWalker.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/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/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',