mozilla
/
gecko-dev
зеркало из https://github.com/mozilla/gecko-dev.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

Merge mozilla-central to inbound. r=merge a=merge CLOSED TREE

This commit is contained in:
Tiberius Oros 2017-12-24 00:48:00 +02:00
Родитель 6f7ccb6937 842032609a
Коммит fd149086d0
45 изменённых файлов: 269 добавлений и 396 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

3
browser/config/mozconfigs/linux32/debug-asan
Просмотреть файл

@ -10,8 +10,7 @@ ac_add_options --enable-valgrind
. $topsrcdir/build/unix/mozconfig.asan . $topsrcdir/build/unix/mozconfig.asan
export PKG_CONFIG_LIBDIR=/usr/lib/pkgconfig:/usr/share/pkgconfig export PKG_CONFIG_LIBDIR=/usr/local/lib/pkgconfig:/usr/lib/pkgconfig:/usr/share/pkgconfig
. $topsrcdir/build/unix/mozconfig.gtk
# Enable Telemetry # Enable Telemetry
export MOZ_TELEMETRY_REPORTING=1 export MOZ_TELEMETRY_REPORTING=1

3
browser/config/mozconfigs/linux32/nightly-asan
Просмотреть файл

@ -9,8 +9,7 @@ ac_add_options --enable-valgrind
. $topsrcdir/build/unix/mozconfig.asan . $topsrcdir/build/unix/mozconfig.asan
export PKG_CONFIG_LIBDIR=/usr/lib/pkgconfig:/usr/share/pkgconfig export PKG_CONFIG_LIBDIR=/usr/local/lib/pkgconfig:/usr/lib/pkgconfig:/usr/share/pkgconfig
. $topsrcdir/build/unix/mozconfig.gtk
# Package js shell. # Package js shell.
export MOZ_PACKAGE_JSSHELL=1 export MOZ_PACKAGE_JSSHELL=1

3
browser/config/mozconfigs/linux64/debug-asan
Просмотреть файл

@ -10,8 +10,7 @@ ac_add_options --enable-valgrind
. $topsrcdir/build/unix/mozconfig.asan . $topsrcdir/build/unix/mozconfig.asan
export PKG_CONFIG_LIBDIR=/usr/lib64/pkgconfig:/usr/share/pkgconfig export PKG_CONFIG_LIBDIR=/usr/local/lib64/pkgconfig:/usr/lib64/pkgconfig:/usr/share/pkgconfig
. $topsrcdir/build/unix/mozconfig.gtk
# Enable Telemetry # Enable Telemetry
export MOZ_TELEMETRY_REPORTING=1 export MOZ_TELEMETRY_REPORTING=1

3
browser/config/mozconfigs/linux64/debug-searchfox-clang
Просмотреть файл

@ -19,7 +19,6 @@ ac_add_options --enable-mozsearch-plugin
. "$topsrcdir/build/unix/mozconfig.stdcxx" . "$topsrcdir/build/unix/mozconfig.stdcxx"
export PKG_CONFIG_LIBDIR=/usr/lib64/pkgconfig:/usr/share/pkgconfig export PKG_CONFIG_LIBDIR=/usr/local/lib64/pkgconfig:/usr/lib64/pkgconfig:/usr/share/pkgconfig
. $topsrcdir/build/unix/mozconfig.gtk
. "$topsrcdir/build/mozconfig.common.override" . "$topsrcdir/build/mozconfig.common.override"

3
browser/config/mozconfigs/linux64/debug-static-analysis-clang
Просмотреть файл

@ -18,7 +18,6 @@ ac_add_options --enable-clang-plugin
. "$topsrcdir/build/unix/mozconfig.stdcxx" . "$topsrcdir/build/unix/mozconfig.stdcxx"
export PKG_CONFIG_LIBDIR=/usr/lib64/pkgconfig:/usr/share/pkgconfig export PKG_CONFIG_LIBDIR=/usr/local/lib64/pkgconfig:/usr/lib64/pkgconfig:/usr/share/pkgconfig
. $topsrcdir/build/unix/mozconfig.gtk
. "$topsrcdir/build/mozconfig.common.override" . "$topsrcdir/build/mozconfig.common.override"

3
browser/config/mozconfigs/linux64/hazards
Просмотреть файл

@ -40,7 +40,6 @@ CFLAGS="$CFLAGS -Wno-attributes"
CPPFLAGS="$CPPFLAGS -Wno-attributes" CPPFLAGS="$CPPFLAGS -Wno-attributes"
CXXFLAGS="$CXXFLAGS -Wno-attributes" CXXFLAGS="$CXXFLAGS -Wno-attributes"
export PKG_CONFIG_LIBDIR=/usr/lib64/pkgconfig:/usr/share/pkgconfig export PKG_CONFIG_LIBDIR=/usr/local/lib64/pkgconfig:/usr/lib64/pkgconfig:/usr/share/pkgconfig
. $topsrcdir/build/unix/mozconfig.gtk
. "$topsrcdir/build/mozconfig.common.override" . "$topsrcdir/build/mozconfig.common.override"

3
browser/config/mozconfigs/linux64/nightly-asan
Просмотреть файл

@ -9,8 +9,7 @@ ac_add_options --enable-valgrind
. $topsrcdir/build/unix/mozconfig.asan . $topsrcdir/build/unix/mozconfig.asan
export PKG_CONFIG_LIBDIR=/usr/lib64/pkgconfig:/usr/share/pkgconfig export PKG_CONFIG_LIBDIR=/usr/local/lib64/pkgconfig:/usr/lib64/pkgconfig:/usr/share/pkgconfig
. $topsrcdir/build/unix/mozconfig.gtk
# Package js shell. # Package js shell.
export MOZ_PACKAGE_JSSHELL=1 export MOZ_PACKAGE_JSSHELL=1

3
browser/config/mozconfigs/linux64/nightly-asan-reporter
Просмотреть файл

@ -11,8 +11,7 @@ ac_add_options --enable-valgrind
ac_add_options --enable-address-sanitizer-reporter ac_add_options --enable-address-sanitizer-reporter
export PKG_CONFIG_LIBDIR=/usr/lib64/pkgconfig:/usr/share/pkgconfig export PKG_CONFIG_LIBDIR=/usr/local/lib64/pkgconfig:/usr/lib64/pkgconfig:/usr/share/pkgconfig
. $topsrcdir/build/unix/mozconfig.gtk
# Need this to prevent name conflicts with the normal nightly build packages # Need this to prevent name conflicts with the normal nightly build packages
export MOZ_PKG_SPECIAL=asan-reporter export MOZ_PKG_SPECIAL=asan-reporter

3
browser/config/mozconfigs/linux64/nightly-fuzzing-asan
Просмотреть файл

@ -12,8 +12,7 @@ ac_add_options --enable-valgrind
ac_add_options --enable-fuzzing ac_add_options --enable-fuzzing
unset MOZ_STDCXX_COMPAT unset MOZ_STDCXX_COMPAT
export PKG_CONFIG_LIBDIR=/usr/lib64/pkgconfig:/usr/share/pkgconfig export PKG_CONFIG_LIBDIR=/usr/local/lib64/pkgconfig:/usr/lib64/pkgconfig:/usr/share/pkgconfig
. $topsrcdir/build/unix/mozconfig.gtk
# Package js shell. # Package js shell.
export MOZ_PACKAGE_JSSHELL=1 export MOZ_PACKAGE_JSSHELL=1

3
browser/config/mozconfigs/linux64/opt-static-analysis-clang
Просмотреть файл

@ -17,7 +17,6 @@ ac_add_options --enable-clang-plugin
. "$topsrcdir/build/unix/mozconfig.stdcxx" . "$topsrcdir/build/unix/mozconfig.stdcxx"
export PKG_CONFIG_LIBDIR=/usr/lib64/pkgconfig:/usr/share/pkgconfig export PKG_CONFIG_LIBDIR=/usr/local/lib64/pkgconfig:/usr/lib64/pkgconfig:/usr/share/pkgconfig
. $topsrcdir/build/unix/mozconfig.gtk
. "$topsrcdir/build/mozconfig.common.override" . "$topsrcdir/build/mozconfig.common.override"

3
browser/config/mozconfigs/linux64/opt-tsan
Просмотреть файл

@ -1,7 +1,6 @@
. $topsrcdir/build/unix/mozconfig.tsan . $topsrcdir/build/unix/mozconfig.tsan
export PKG_CONFIG_LIBDIR=/usr/lib64/pkgconfig:/usr/share/pkgconfig export PKG_CONFIG_LIBDIR=/usr/local/lib64/pkgconfig:/usr/lib64/pkgconfig:/usr/share/pkgconfig
. $topsrcdir/build/unix/mozconfig.gtk
# Need this to prevent name conflicts with the normal nightly build packages # Need this to prevent name conflicts with the normal nightly build packages
export MOZ_PKG_SPECIAL=tsan export MOZ_PKG_SPECIAL=tsan

10
browser/config/tooltool-manifests/linux32/releng.manifest
Просмотреть файл

@ -1,10 +0,0 @@
[
{
"size": 11189216,
"digest": "18bc52b0599b1308b667e282abb45f47597bfc98a5140cfcab8da71dacf89dd76d0dee22a04ce26fe7ad1f04e2d6596991f9e5b01fd2aaaab5542965f596b0e6",
"algorithm": "sha512",
"filename": "gtk3.tar.xz",
"setup": "setup.sh",
"unpack": true
}
]

10
browser/config/tooltool-manifests/linux64/base-toolchains.manifest
Просмотреть файл

@ -1,10 +0,0 @@
[
{
"size": 12072532,
"digest": "3915f8ec396c56a8a92e6f9695b70f09ce9d1582359d1258e37e3fd43a143bc974410e4cfc27f500e095f34a8956206e0ebf799b7287f0f38def0d5e34ed71c9",
"algorithm": "sha512",
"filename": "gtk3.tar.xz",
"setup": "setup.sh",
"unpack": true
}
]

10
browser/config/tooltool-manifests/linux64/releng.manifest
Просмотреть файл

@ -1,10 +0,0 @@
[
{
"size": 12072532,
"digest": "3915f8ec396c56a8a92e6f9695b70f09ce9d1582359d1258e37e3fd43a143bc974410e4cfc27f500e095f34a8956206e0ebf799b7287f0f38def0d5e34ed71c9",
"algorithm": "sha512",
"filename": "gtk3.tar.xz",
"setup": "setup.sh",
"unpack": true
}
]

10
browser/config/tooltool-manifests/linux64/tsan.manifest
Просмотреть файл

@ -1,10 +0,0 @@
[
{
"size": 12072532,
"digest": "3915f8ec396c56a8a92e6f9695b70f09ce9d1582359d1258e37e3fd43a143bc974410e4cfc27f500e095f34a8956206e0ebf799b7287f0f38def0d5e34ed71c9",
"algorithm": "sha512",
"filename": "gtk3.tar.xz",
"setup": "setup.sh",
"unpack": true
}
]

2
build/moz.configure/toolchain.configure
Просмотреть файл

@ -1373,7 +1373,7 @@ def rust_compiler_flags(opt_level_option, debug_rust, debug_symbols,
if debug_symbols: if debug_symbols:
if host.kernel == 'Linux' and target.kernel == 'Darwin': if host.kernel == 'Linux' and target.kernel == 'Darwin':
# hack to work around dsymutil failing on cross-OSX builds (bug 1410148) # hack to work around dsymutil failing on cross-OSX builds (bug 1410148)
debug_info = '1' debug_info = '0'
else: else:
debug_info = '2' debug_info = '2'

105
build/unix/build-gtk3/build-gtk3.sh
Просмотреть файл

@ -1,19 +1,7 @@
#!/bin/bash #!/bin/bash
# Use "build-gtk.sh" or "build-gtk.sh 64" to build a 64-bits tarball for tooltool.
# Use "build-gtk.sh 32" to build a 32-bits tarball for tooltool.
# Mock environments used:
# - 64-bits:
# https://s3.amazonaws.com/mozilla-releng-mock-archive/67b65e51eb091fba7941a04d249343924a3ee653
# + libxml2-devel.x86_64 gettext.x86_64 libjpeg-devel.x86_64
# - 32-bits:
# https://s3.amazonaws.com/mozilla-releng-mock-archive/58d76c6acca148a1aedcbec7fc1b8212e12807b4
# + libxml2-devel.i686 gettext.i686 libjpeg-devel.i686
set -e set -e
pkg_config_version=0.28
fontconfig_version=2.8.0 fontconfig_version=2.8.0
libffi_version=3.0.13 libffi_version=3.0.13
glib_version=2.34.3 glib_version=2.34.3
@ -24,7 +12,6 @@ pango_version=1.30.1
atk_version=2.2.0 atk_version=2.2.0
gtk__version=3.4.4 gtk__version=3.4.4
pkg_config_url=http://pkgconfig.freedesktop.org/releases/pkg-config-${pkg_config_version}.tar.gz
fontconfig_url=http://www.freedesktop.org/software/fontconfig/release/fontconfig-${fontconfig_version}.tar.gz fontconfig_url=http://www.freedesktop.org/software/fontconfig/release/fontconfig-${fontconfig_version}.tar.gz
libffi_url=ftp://sourceware.org/pub/libffi/libffi-${libffi_version}.tar.gz libffi_url=ftp://sourceware.org/pub/libffi/libffi-${libffi_version}.tar.gz
glib_url=http://ftp.gnome.org/pub/gnome/sources/glib/${glib_version%.*}/glib-${glib_version}.tar.xz glib_url=http://ftp.gnome.org/pub/gnome/sources/glib/${glib_version%.*}/glib-${glib_version}.tar.xz
@ -35,15 +22,10 @@ pango_url=http://ftp.gnome.org/pub/GNOME/sources/pango/${pango_version%.*}/pango
atk_url=http://ftp.gnome.org/pub/GNOME/sources/atk/${atk_version%.*}/atk-${atk_version}.tar.xz atk_url=http://ftp.gnome.org/pub/GNOME/sources/atk/${atk_version%.*}/atk-${atk_version}.tar.xz
gtk__url=http://ftp.gnome.org/pub/gnome/sources/gtk+/${gtk__version%.*}/gtk+-${gtk__version}.tar.xz gtk__url=http://ftp.gnome.org/pub/gnome/sources/gtk+/${gtk__version%.*}/gtk+-${gtk__version}.tar.xz
cwd=$(pwd)
root_dir=$(mktemp -d) root_dir=$(mktemp -d)
cd $root_dir cd $root_dir
if test -z $TMPDIR; then make_flags=-j$(nproc)
TMPDIR=/tmp/
fi
make_flags=-j12
build() { build() {
name=$1 name=$1
@ -51,18 +33,21 @@ build() {
pkg=$(echo $name | tr '+-' '__') pkg=$(echo $name | tr '+-' '__')
version=$(eval echo \$${pkg}_version) version=$(eval echo \$${pkg}_version)
url=$(eval echo \$${pkg}_url) url=$(eval echo \$${pkg}_url)
wget -c -P $TMPDIR $url wget -c -P $root_dir $url
tar -axf $TMPDIR/$name-$version.tar.* tar -axf $root_dir/$name-$version.tar.*
mkdir -p build/$name mkdir -p build/$name
cd build/$name cd build/$name
eval ../../$name-$version/configure --disable-static $* $configure_args eval ../../$name-$version/configure --disable-static $* $configure_args --libdir=/usr/local/$lib
make $make_flags make $make_flags
make install DESTDIR=$root_dir/gtk3 make install
find $root_dir/gtk3 -name \*.la -delete
cd ../.. cd ../..
} }
case "$1" in for bits in 32 64; do
rm -rf $root_dir/build
case "$bits" in
32) 32)
configure_args='--host=i686-pc-linux --build=i686-pc-linux CC="gcc -m32" CXX="g++ -m32"' configure_args='--host=i686-pc-linux --build=i686-pc-linux CC="gcc -m32" CXX="g++ -m32"'
lib=lib lib=lib
@ -73,26 +58,13 @@ case "$1" in
;; ;;
esac esac
export PKG_CONFIG_LIBDIR=/usr/$lib/pkgconfig:/usr/share/pkgconfig export PKG_CONFIG_LIBDIR=/usr/local/$lib/pkgconfig:/usr/$lib/pkgconfig:/usr/share/pkgconfig
export LD_LIBRARY_PATH=/usr/local/$lib
# The pkg-config version in the mock images is buggy is how it handles
# PKG_CONFIG_SYSROOT_DIR. So we need our own.
build pkg-config
ln -sf /usr/include $root_dir/gtk3/usr/
ln -sf /usr/$lib $root_dir/gtk3/usr/
if [ "$lib" = lib64 ]; then
ln -s lib $root_dir/gtk3/usr/local/lib64
fi
export PKG_CONFIG_PATH=$root_dir/gtk3/usr/local/lib/pkgconfig
export PKG_CONFIG_SYSROOT_DIR=$root_dir/gtk3
export LD_LIBRARY_PATH=$root_dir/gtk3/usr/local/lib
export PATH=$root_dir/gtk3/usr/local/bin:${PATH}
build fontconfig build fontconfig
build libffi build libffi
build glib build glib
build gdk-pixbuf --without-libtiff build gdk-pixbuf --without-libtiff --without-libjpeg
build pixman --disable-gtk build pixman --disable-gtk
build cairo --enable-tee build cairo --enable-tee
build pango build pango
@ -100,51 +72,10 @@ build atk
make_flags="$make_flags GLIB_COMPILE_SCHEMAS=glib-compile-schemas" make_flags="$make_flags GLIB_COMPILE_SCHEMAS=glib-compile-schemas"
build gtk+ build gtk+
rm -rf $root_dir/gtk3/usr/local/share/gtk-doc done
rm -rf $root_dir/gtk3/usr/local/share/locale
# mock build environment doesn't have fonts in /usr/share/fonts, but rm -rf $root_dir
# has some in /usr/share/X11/fonts. Add this directory to the
# fontconfig configuration without changing the gtk3 tooltool package.
cat << EOF > $root_dir/gtk3/usr/local/etc/fonts/local.conf
<?xml version="1.0"?>
<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
<fontconfig>
<dir>/usr/share/X11/fonts</dir>
</fontconfig>
EOF
cat <<EOF > $root_dir/gtk3/setup.sh echo /usr/local/lib > /etc/ld.so.conf.d/local.conf
#!/bin/sh echo /usr/local/lib64 >> /etc/ld.so.conf.d/local.conf
ldconfig
cd \$(dirname \$0)
HERE=\$(pwd)
# pango expects absolute paths in pango.modules, and TOOLTOOL_DIR may vary...
LD_LIBRARY_PATH=\$HERE/usr/local/lib \
PANGO_SYSCONFDIR=\$HERE/usr/local/etc \
PANGO_LIBDIR=\$HERE/usr/local/lib \
\$HERE/usr/local/bin/pango-querymodules > \$HERE/usr/local/etc/pango/pango.modules
# same with gdb-pixbuf and loaders.cache
LD_LIBRARY_PATH=\$HERE/usr/local/lib \
GDK_PIXBUF_MODULE_FILE=\$HERE/usr/local/lib/gdk-pixbuf-2.0/2.10.0/loaders.cache \
GDK_PIXBUF_MODULEDIR=\$HERE/usr/local/lib/gdk-pixbuf-2.0/2.10.0/loaders \
\$HERE/usr/local/bin/gdk-pixbuf-query-loaders > \
\$HERE/usr/local/lib/gdk-pixbuf-2.0/2.10.0/loaders.cache
# The fontconfig version in the tooltool package has known uses of
# uninitialized memory when creating its cache, and while most users
# will already have an existing cache, running Firefox on automation
# will create it. Combined with valgrind, this generates irrelevant
# errors.
# So create the fontconfig cache beforehand.
FONTCONFIG_PATH=\$HERE/usr/local/etc/fonts \
LD_LIBRARY_PATH=\$HERE/usr/local/lib \
\$HERE/usr/local/bin/fc-cache
EOF
chmod +x $root_dir/gtk3/setup.sh
cd $cwd
tar -C $root_dir -Jcf gtk3.tar.xz gtk3

28
build/unix/mozconfig.gtk
Просмотреть файл

@ -1,28 +0,0 @@
# To do try builds with Gtk+2, uncomment the following line, and remove
# everything after that.
#ac_add_options --enable-default-toolkit=cairo-gtk2
TOOLTOOL_DIR=${TOOLTOOL_DIR:-$topsrcdir}
# $TOOLTOOL_DIR/gtk3 comes from tooltool, and must be included in the tooltool manifest.
if [ -z "$PKG_CONFIG_LIBDIR" ]; then
echo PKG_CONFIG_LIBDIR must be set >&2
exit 1
fi
export PKG_CONFIG_SYSROOT_DIR="$TOOLTOOL_DIR/gtk3"
export PKG_CONFIG_PATH="$TOOLTOOL_DIR/gtk3/usr/local/lib/pkgconfig"
PKG_CONFIG="$TOOLTOOL_DIR/gtk3/usr/local/bin/pkg-config"
export PATH="$TOOLTOOL_DIR/gtk3/usr/local/bin:${PATH}"
# Ensure cairo, gdk-pixbuf, etc. are not taken from the system installed packages.
LDFLAGS="-L$TOOLTOOL_DIR/gtk3/usr/local/lib ${LDFLAGS}"
ac_add_options --enable-default-toolkit=cairo-gtk3
# Set things up to use Gtk+3 from the tooltool package
mk_add_options "export FONTCONFIG_PATH=$TOOLTOOL_DIR/gtk3/usr/local/etc/fonts"
mk_add_options "export PANGO_SYSCONFDIR=$TOOLTOOL_DIR/gtk3/usr/local/etc"
mk_add_options "export PANGO_LIBDIR=$TOOLTOOL_DIR/gtk3/usr/local/lib"
mk_add_options "export GDK_PIXBUF_MODULE_FILE=$TOOLTOOL_DIR/gtk3/usr/local/lib/gdk-pixbuf-2.0/2.10.0/loaders.cache"
mk_add_options "export GDK_PIXBUF_MODULEDIR=$TOOLTOOL_DIR/gtk3/usr/local/lib/gdk-pixbuf-2.0/2.10.0/loaders"
LD_LIBRARY_PATH=${LD_LIBRARY_PATH:+$LD_LIBRARY_PATH:}$TOOLTOOL_DIR/gtk3/usr/local/lib
mk_add_options "export LD_LIBRARY_PATH=$LD_LIBRARY_PATH"

4
build/unix/mozconfig.linux
Просмотреть файл

@ -27,6 +27,4 @@ fi
. "$topsrcdir/build/unix/mozconfig.stdcxx" . "$topsrcdir/build/unix/mozconfig.stdcxx"
# PKG_CONFIG_LIBDIR is appropriately overridden in mozconfig.linux32 # PKG_CONFIG_LIBDIR is appropriately overridden in mozconfig.linux32
export PKG_CONFIG_LIBDIR=/usr/lib64/pkgconfig:/usr/share/pkgconfig export PKG_CONFIG_LIBDIR=/usr/local/lib64/pkgconfig:/usr/lib64/pkgconfig:/usr/share/pkgconfig
. "$topsrcdir/build/unix/mozconfig.gtk"

3
build/unix/mozconfig.linux32
Просмотреть файл

@ -1,6 +1,6 @@
. "$topsrcdir/build/unix/mozconfig.linux" . "$topsrcdir/build/unix/mozconfig.linux"
export PKG_CONFIG_LIBDIR=/usr/lib/pkgconfig:/usr/share/pkgconfig export PKG_CONFIG_LIBDIR=/usr/local/lib/pkgconfig:/usr/lib/pkgconfig:/usr/share/pkgconfig
export MOZ_LINUX_32_SSE2_STARTUP_ERROR=1 export MOZ_LINUX_32_SSE2_STARTUP_ERROR=1
@ -12,5 +12,4 @@ if test `uname -m` = "x86_64"; then
CXX="$CXX -m32 -march=pentium-m" CXX="$CXX -m32 -march=pentium-m"
ac_add_options --target=i686-pc-linux ac_add_options --target=i686-pc-linux
ac_add_options --host=i686-pc-linux ac_add_options --host=i686-pc-linux
ac_add_options --x-libraries=/usr/lib
fi fi

10
js/src/devtools/rootAnalysis/build/gcc.manifest
Просмотреть файл

@ -1,10 +0,0 @@
[
{
"size": 12072532,
"digest": "3915f8ec396c56a8a92e6f9695b70f09ce9d1582359d1258e37e3fd43a143bc974410e4cfc27f500e095f34a8956206e0ebf799b7287f0f38def0d5e34ed71c9",
"algorithm": "sha512",
"filename": "gtk3.tar.xz",
"setup": "setup.sh",
"unpack": true
}
]

8
layout/generic/nsBlockFrame.cpp
Просмотреть файл

@ -4147,11 +4147,7 @@ nsBlockFrame::ReflowInlineFrame(BlockReflowInput& aState,
nsIFrame* aFrame, nsIFrame* aFrame,
LineReflowStatus* aLineReflowStatus) LineReflowStatus* aLineReflowStatus)
{ {
if (!aFrame) { // XXX change to MOZ_ASSERT(aFrame) MOZ_ASSERT(aFrame);
NS_ERROR("why call me?");
return;
}
*aLineReflowStatus = LineReflowStatus::OK; *aLineReflowStatus = LineReflowStatus::OK;
#ifdef NOISY_FIRST_LETTER #ifdef NOISY_FIRST_LETTER
@ -4169,7 +4165,7 @@ nsBlockFrame::ReflowInlineFrame(BlockReflowInput& aState,
// Reflow the inline frame // Reflow the inline frame
nsReflowStatus frameReflowStatus; nsReflowStatus frameReflowStatus;
bool pushedFrame; bool pushedFrame;
aLineLayout.ReflowFrame(aFrame, frameReflowStatus, nullptr, pushedFrame); aLineLayout.ReflowFrame(aFrame, frameReflowStatus, nullptr, pushedFrame);
if (frameReflowStatus.NextInFlowNeedsReflow()) { if (frameReflowStatus.NextInFlowNeedsReflow()) {

20
layout/generic/nsLineLayout.cpp
Просмотреть файл

@ -662,6 +662,7 @@ nsLineLayout::NewPerFrameData(nsIFrame* aFrame)
pfd->mIsBullet = false; pfd->mIsBullet = false;
pfd->mSkipWhenTrimmingWhitespace = false; pfd->mSkipWhenTrimmingWhitespace = false;
pfd->mIsEmpty = false; pfd->mIsEmpty = false;
pfd->mIsPlaceholder = false;
pfd->mIsLinkedToBase = false; pfd->mIsLinkedToBase = false;
pfd->mWritingMode = aFrame->GetWritingMode(); pfd->mWritingMode = aFrame->GetWritingMode();
@ -840,7 +841,7 @@ nsLineLayout::ReflowFrame(nsIFrame* aFrame,
// Figure out whether we're talking about a textframe here // Figure out whether we're talking about a textframe here
LayoutFrameType frameType = aFrame->Type(); LayoutFrameType frameType = aFrame->Type();
bool isText = frameType == LayoutFrameType::Text; const bool isText = frameType == LayoutFrameType::Text;
// Inline-ish and text-ish things don't compute their width; // Inline-ish and text-ish things don't compute their width;
// everything else does. We need to give them an available width that // everything else does. We need to give them an available width that
@ -940,6 +941,7 @@ nsLineLayout::ReflowFrame(nsIFrame* aFrame,
} else { } else {
if (LayoutFrameType::Placeholder == frameType) { if (LayoutFrameType::Placeholder == frameType) {
isEmpty = true; isEmpty = true;
pfd->mIsPlaceholder = true;
pfd->mSkipWhenTrimmingWhitespace = true; pfd->mSkipWhenTrimmingWhitespace = true;
nsIFrame* outOfFlowFrame = nsLayoutUtils::GetFloatFromPlaceholder(aFrame); nsIFrame* outOfFlowFrame = nsLayoutUtils::GetFloatFromPlaceholder(aFrame);
if (outOfFlowFrame) { if (outOfFlowFrame) {
@ -2209,17 +2211,17 @@ nsLineLayout::VerticalAlignFrames(PerSpanData* psd)
// For example in quirks mode, avoiding empty text frames prevents // For example in quirks mode, avoiding empty text frames prevents
// "tall" lines around elements like <hr> since the rules of <hr> // "tall" lines around elements like <hr> since the rules of <hr>
// in quirks.css have pseudo text contents with LF in them. // in quirks.css have pseudo text contents with LF in them.
#if 0 bool canUpdate;
if (!pfd->mIsTextFrame) { if (pfd->mIsTextFrame) {
#else // Only consider text frames if they're not empty and
// Only consider non empty text frames when line-height=normal // line-height=normal.
bool canUpdate = !pfd->mIsTextFrame; canUpdate = pfd->mIsNonWhitespaceTextFrame &&
if (!canUpdate && pfd->mIsNonWhitespaceTextFrame) {
canUpdate =
frame->StyleText()->mLineHeight.GetUnit() == eStyleUnit_Normal; frame->StyleText()->mLineHeight.GetUnit() == eStyleUnit_Normal;
} else {
canUpdate = !pfd->mIsPlaceholder;
} }
if (canUpdate) { if (canUpdate) {
#endif
nscoord blockStart, blockEnd; nscoord blockStart, blockEnd;
if (frameSpan) { if (frameSpan) {
// For spans that were are now placing, use their position // For spans that were are now placing, use their position

1
layout/generic/nsLineLayout.h
Просмотреть файл

@ -471,6 +471,7 @@ protected:
bool mIsBullet : 1; bool mIsBullet : 1;
bool mSkipWhenTrimmingWhitespace : 1; bool mSkipWhenTrimmingWhitespace : 1;
bool mIsEmpty : 1; bool mIsEmpty : 1;
bool mIsPlaceholder : 1;
bool mIsLinkedToBase : 1; bool mIsLinkedToBase : 1;
// Other state we use // Other state we use

5
layout/painting/nsDisplayList.cpp
Просмотреть файл

@ -9564,6 +9564,11 @@ nsDisplayMask::ComputeInvalidationRegion(nsDisplayListBuilder* aBuilder,
bool snap; bool snap;
nsRect bounds = GetBounds(aBuilder, &snap); nsRect bounds = GetBounds(aBuilder, &snap);
if (mFrame->StyleEffects()->mOpacity != geometry->mOpacity ||
mHandleOpacity != geometry->mHandleOpacity) {
aInvalidRegion->Or(*aInvalidRegion, bounds);
}
if (mDestRects.Length() != geometry->mDestRects.Length()) { if (mDestRects.Length() != geometry->mDestRects.Length()) {
aInvalidRegion->Or(bounds, geometry->mBounds); aInvalidRegion->Or(bounds, geometry->mBounds);
} else { } else {

4
layout/painting/nsDisplayList.h
Просмотреть файл

@ -5696,6 +5696,10 @@ public:
return false; return false;
} }
bool ShouldHandleOpacity() {
return mHandleOpacity;
}
gfxRect BBoxInUserSpace() const; gfxRect BBoxInUserSpace() const;
gfxPoint UserSpaceOffset() const; gfxPoint UserSpaceOffset() const;

2
layout/painting/nsDisplayListInvalidation.cpp
Просмотреть файл

@ -124,6 +124,8 @@ nsDisplayMaskGeometry::nsDisplayMaskGeometry(nsDisplayMask* aItem, nsDisplayList
: nsDisplaySVGEffectGeometry(aItem, aBuilder) : nsDisplaySVGEffectGeometry(aItem, aBuilder)
, nsImageGeometryMixin(aItem, aBuilder) , nsImageGeometryMixin(aItem, aBuilder)
, mDestRects(aItem->GetDestRects()) , mDestRects(aItem->GetDestRects())
, mOpacity(aItem->Frame()->StyleEffects()->mOpacity)
, mHandleOpacity(aItem->ShouldHandleOpacity())
{} {}
nsDisplayFilterGeometry::nsDisplayFilterGeometry(nsDisplayFilter* aItem, nsDisplayListBuilder* aBuilder) nsDisplayFilterGeometry::nsDisplayFilterGeometry(nsDisplayFilter* aItem, nsDisplayListBuilder* aBuilder)

2
layout/painting/nsDisplayListInvalidation.h
Просмотреть файл

@ -309,6 +309,8 @@ public:
} }
nsTArray<nsRect> mDestRects; nsTArray<nsRect> mDestRects;
float mOpacity;
bool mHandleOpacity;
}; };
class nsDisplayFilterGeometry : public nsDisplaySVGEffectGeometry class nsDisplayFilterGeometry : public nsDisplaySVGEffectGeometry

5
security/manager/ssl/StaticHPKPins.h
Просмотреть файл

@ -736,6 +736,7 @@ static const TransportSecurityPreload kPublicKeyPinningPreloadList[] = {
{ "ct.search.yahoo.com", false, true, false, -1, &kPinset_yahoo }, { "ct.search.yahoo.com", false, true, false, -1, &kPinset_yahoo },
{ "de.search.yahoo.com", false, true, false, -1, &kPinset_yahoo }, { "de.search.yahoo.com", false, true, false, -1, &kPinset_yahoo },
{ "dev.twitter.com", true, false, false, -1, &kPinset_twitterCom }, { "dev.twitter.com", true, false, false, -1, &kPinset_twitterCom },
{ "developer.android.com", true, false, false, -1, &kPinset_google_root_pems },
{ "developers.facebook.com", true, false, false, -1, &kPinset_facebook }, { "developers.facebook.com", true, false, false, -1, &kPinset_facebook },
{ "dist.torproject.org", true, false, false, -1, &kPinset_tor }, { "dist.torproject.org", true, false, false, -1, &kPinset_tor },
{ "dk.search.yahoo.com", false, true, false, -1, &kPinset_yahoo }, { "dk.search.yahoo.com", false, true, false, -1, &kPinset_yahoo },
@ -1155,8 +1156,8 @@ static const TransportSecurityPreload kPublicKeyPinningPreloadList[] = {
{ "zh.search.yahoo.com", false, true, false, -1, &kPinset_yahoo }, { "zh.search.yahoo.com", false, true, false, -1, &kPinset_yahoo },
}; };
// Pinning Preload List Length = 481; // Pinning Preload List Length = 482;
static const int32_t kUnknownId = -1; static const int32_t kUnknownId = -1;
static const PRTime kPreloadPKPinsExpirationTime = INT64_C(1522434806681000); static const PRTime kPreloadPKPinsExpirationTime = INT64_C(1522521295982000);

186
security/manager/ssl/nsSTSPreloadList.errors
Просмотреть файл

Разница между файлами не показана из-за своего большого размера Загрузить разницу

66
security/manager/ssl/nsSTSPreloadList.inc
Просмотреть файл

@ -8,7 +8,7 @@
/*****************************************************************************/ /*****************************************************************************/
#include <stdint.h> #include <stdint.h>
const PRTime gPreloadListExpirationTime = INT64_C(1524853993707000); const PRTime gPreloadListExpirationTime = INT64_C(1524940483304000);
%% %%
0-1.party, 1 0-1.party, 1
0.me.uk, 1 0.me.uk, 1
@ -181,6 +181,7 @@ const PRTime gPreloadListExpirationTime = INT64_C(1524853993707000);
1p.ro, 0 1p.ro, 0
1panorama.ru, 1 1panorama.ru, 1
1para.net, 1 1para.net, 1
1password.com, 1
1pw.ca, 1 1pw.ca, 1
1px.tv, 1 1px.tv, 1
1q365a.com, 1 1q365a.com, 1
@ -379,6 +380,7 @@ const PRTime gPreloadListExpirationTime = INT64_C(1524853993707000);
50ma.xyz, 1 50ma.xyz, 1
50north.de, 1 50north.de, 1
50plusnet.nl, 1 50plusnet.nl, 1
517vpn.cn, 1
525.info, 1 525.info, 1
52kb1.com, 1 52kb1.com, 1
52kb365.com, 1 52kb365.com, 1
@ -656,6 +658,7 @@ academicexperts.us, 1
academie-de-police.ch, 1 academie-de-police.ch, 1
academy4.net, 1 academy4.net, 1
academytv.com.au, 1 academytv.com.au, 1
acadianapatios.com, 1
acampar.com.br, 1 acampar.com.br, 1
acaonegocios.com.br, 1 acaonegocios.com.br, 1
acara-yoga.de, 1 acara-yoga.de, 1
@ -1768,7 +1771,6 @@ annuaire-photographe.fr, 0
anohana.org, 1 anohana.org, 1
anojan.com, 1 anojan.com, 1
anon-next.de, 1 anon-next.de, 1
anonboards.com, 1
anoncom.net, 1 anoncom.net, 1
anoneko.com, 1 anoneko.com, 1
anongoth.pl, 1 anongoth.pl, 1
@ -2104,7 +2106,6 @@ arjanvaartjes.net, 1
arjunasdaughter.pub, 1 arjunasdaughter.pub, 1
arjweb.co.uk, 1 arjweb.co.uk, 1
arkacrao.org, 1 arkacrao.org, 1
arkadiyt.com, 1
arkaic.dyndns.org, 1 arkaic.dyndns.org, 1
arkbyte.com, 1 arkbyte.com, 1
arknodejs.com, 1 arknodejs.com, 1
@ -4568,7 +4569,6 @@ buri.be, 0
buricloud.fr, 1 buricloud.fr, 1
burke.services, 1 burke.services, 1
burlapsac.ca, 1 burlapsac.ca, 1
burlesquemakeup.com, 1
burnerfitness.com, 1 burnerfitness.com, 1
burnhamonseabouncycastles.co.uk, 1 burnhamonseabouncycastles.co.uk, 1
burningbird.net, 1 burningbird.net, 1
@ -6076,6 +6076,7 @@ codingfromhell.net, 1
codingrobots.com, 1 codingrobots.com, 1
codxg.org, 1 codxg.org, 1
codyevanscomputer.com, 1 codyevanscomputer.com, 1
codymoniz.com, 1
coffee-mamenoki.jp, 1 coffee-mamenoki.jp, 1
coffeedino.com, 1 coffeedino.com, 1
coffeetocode.me, 1 coffeetocode.me, 1
@ -6824,7 +6825,6 @@ cubua.com, 1
cuckoopalace.cn, 1 cuckoopalace.cn, 1
cuddlecomfort.com, 1 cuddlecomfort.com, 1
cuddlingyaks.com, 1 cuddlingyaks.com, 1
cuecamania.com.br, 1
cuecasonline.com.br, 1 cuecasonline.com.br, 1
cuentasmutualamr.org.ar, 1 cuentasmutualamr.org.ar, 1
cuetoems.com, 1 cuetoems.com, 1
@ -7723,6 +7723,7 @@ devdom.io, 1
devdoodle.net, 1 devdoodle.net, 1
devel.cz, 1 devel.cz, 1
develop.cool, 1 develop.cool, 1
developer.android.com, 1
developer.mydigipass.com, 0 developer.mydigipass.com, 0
developerfair.com, 1 developerfair.com, 1
developermail.io, 1 developermail.io, 1
@ -7739,6 +7740,7 @@ devh.de, 1
devh.net, 1 devh.net, 1
deviant.email, 1 deviant.email, 1
devillers-occasions.be, 1 devillers-occasions.be, 1
devilshakerz.com, 1
deviltracks.net, 1 deviltracks.net, 1
deviltraxxx.de, 1 deviltraxxx.de, 1
devinfo.net, 0 devinfo.net, 0
@ -7763,6 +7765,7 @@ devyn.ca, 1
devzero.io, 1 devzero.io, 1
dewalch.net, 1 dewalch.net, 1
dewapress.com, 1 dewapress.com, 1
dewebwerf.nl, 1
dexalo.de, 1 dexalo.de, 1
dezeregio.nl, 1 dezeregio.nl, 1
dezet-ev.de, 1 dezet-ev.de, 1
@ -8584,7 +8587,6 @@ duckbase.com, 1
duckduckstart.com, 1 duckduckstart.com, 1
duckinc.net, 1 duckinc.net, 1
duckyubuntu.tk, 1 duckyubuntu.tk, 1
ducohosting.com, 1
duelsow.eu, 1 duelsow.eu, 1
duernberg.at, 1 duernberg.at, 1
duesee.org, 1 duesee.org, 1
@ -8642,6 +8644,7 @@ dustygroove.com, 1
dustyspokesbnb.ca, 1 dustyspokesbnb.ca, 1
dutch.desi, 1 dutch.desi, 1
dutch1.nl, 1 dutch1.nl, 1
dutchessuganda.com, 1
dutchrank.nl, 1 dutchrank.nl, 1
dutchwanderers.nl, 1 dutchwanderers.nl, 1
dutchweballiance.nl, 1 dutchweballiance.nl, 1
@ -8839,6 +8842,7 @@ echoworld.ch, 1
ecirtam.net, 1 ecirtam.net, 1
eckel.co, 1 eckel.co, 1
eclipse.ws, 1 eclipse.ws, 1
ecnetworker.com, 1
eco-derattizzazione.it, 1 eco-derattizzazione.it, 1
eco-work.it, 1 eco-work.it, 1
ecoccinelles.ch, 1 ecoccinelles.ch, 1
@ -9452,7 +9456,7 @@ epiteugma.com, 1
epizentrum.work, 1 epizentrum.work, 1
epizentrum.works, 1 epizentrum.works, 1
epmcentroitalia.it, 1 epmcentroitalia.it, 1
epoch.com, 1 epoch.com, 0
epolitiker.com, 1 epolitiker.com, 1
epos-distributor.co.uk, 1 epos-distributor.co.uk, 1
eposbirmingham.co.uk, 1 eposbirmingham.co.uk, 1
@ -10516,7 +10520,6 @@ firexarxa.de, 1
firma-cerny.cz, 1 firma-cerny.cz, 1
firma-offshore.com, 1 firma-offshore.com, 1
firmale.com, 1 firmale.com, 1
firmament.space, 1
firmapi.com, 1 firmapi.com, 1
first-house.no, 1 first-house.no, 1
first-time-offender.com, 1 first-time-offender.com, 1
@ -10748,7 +10751,6 @@ fognini-depablo.eu, 1
foia.gov, 1 foia.gov, 1
fojing.com, 1 fojing.com, 1
fokan.be, 1 fokan.be, 1
fokan.ch, 1
fokkusu.fi, 1 fokkusu.fi, 1
fol.tf, 1 fol.tf, 1
foliekonsulenten.dk, 1 foliekonsulenten.dk, 1
@ -11058,11 +11060,8 @@ freifahrt.de, 1
freifamily.ch, 1 freifamily.ch, 1
freifunk-burgaltendorf.de, 1 freifunk-burgaltendorf.de, 1
freifunk-essen.de, 1 freifunk-essen.de, 1
freifunk-in-solingen.de, 1
freifunk-lindlar.net, 1
freifunk-luenen.de, 1 freifunk-luenen.de, 1
freifunk-nrw.de, 1 freifunk-nrw.de, 1
freifunk-remscheid.de, 1
freimeldungen.de, 1 freimeldungen.de, 1
freims.cc, 1 freims.cc, 1
freiwurst.net, 1 freiwurst.net, 1
@ -11326,7 +11325,7 @@ g01.in.ua, 1
g1.ie, 1 g1.ie, 1
g10e.ch, 1 g10e.ch, 1
g1jeu.com, 1 g1jeu.com, 1
g2-inc.com, 1 g2-inc.com, 0
g2links.com, 1 g2links.com, 1
g2pla.net, 1 g2pla.net, 1
g2soft.net, 1 g2soft.net, 1
@ -11851,7 +11850,6 @@ ginnegappen.nl, 1
ginniemae.gov, 1 ginniemae.gov, 1
ginzadelunch.jp, 1 ginzadelunch.jp, 1
giochi-online.ws, 1 giochi-online.ws, 1
giochiecodici.it, 1
giochistem.it, 1 giochistem.it, 1
gioielleriamolena.com, 1 gioielleriamolena.com, 1
gip-carif-idf.net, 1 gip-carif-idf.net, 1
@ -12577,7 +12575,6 @@ haiboxu.com, 1
hail2u.net, 1 hail2u.net, 1
hailer.com, 1 hailer.com, 1
haircrazy.com, 1 haircrazy.com, 1
hairlossstop.net, 1
hairraisingphotobooths.co.uk, 1 hairraisingphotobooths.co.uk, 1
hairtonic-lab.com, 1 hairtonic-lab.com, 1
hajnzic.at, 1 hajnzic.at, 1
@ -12963,7 +12960,6 @@ helppresta.com, 1
helpstarloja.com.br, 1 helpstarloja.com.br, 1
helsingfors.guide, 1 helsingfors.guide, 1
helsinki.dating, 1 helsinki.dating, 1
helup.com, 1
helvella.de, 1 helvella.de, 1
hematoonkologia.pl, 1 hematoonkologia.pl, 1
hemdal.se, 1 hemdal.se, 1
@ -13152,7 +13148,7 @@ hilti.kz, 0
hilti.lv, 0 hilti.lv, 0
hiltonarubabeachservices.com, 1 hiltonarubabeachservices.com, 1
hiltonhyland.com, 1 hiltonhyland.com, 1
himens.com, 0 himens.com, 1
hindmanfuneralhomes.com, 1 hindmanfuneralhomes.com, 1
hingle.me, 1 hingle.me, 1
hinrich.de, 1 hinrich.de, 1
@ -14767,6 +14763,7 @@ itswincer.com, 1
ittop-gabon.com, 1 ittop-gabon.com, 1
itzap.com.au, 1 itzap.com.au, 1
ivanbenito.com, 1 ivanbenito.com, 1
ivancacic.com, 0
ivanilla.org, 1 ivanilla.org, 1
ivanmeade.com, 1 ivanmeade.com, 1
ivanpolchenko.com, 1 ivanpolchenko.com, 1
@ -14874,6 +14871,7 @@ jahofmann.de, 1
jailbreakingisnotacrime.org, 1 jailbreakingisnotacrime.org, 1
jaimechanaga.com, 1 jaimechanaga.com, 1
jaion.ml, 1 jaion.ml, 1
jaispirit.com, 0
jaitnetworking.com, 0 jaitnetworking.com, 0
jakarta.dating, 1 jakarta.dating, 1
jake.eu.org, 1 jake.eu.org, 1
@ -15351,7 +15349,6 @@ jonarcher.info, 1
jonas-thelemann.de, 1 jonas-thelemann.de, 1
jonas-wenk.de, 1 jonas-wenk.de, 1
jonaskjodt.com, 1 jonaskjodt.com, 1
jonasmoeller.consulting, 0
jonaswitmer.ch, 1 jonaswitmer.ch, 1
jonathan-apps.com, 1 jonathan-apps.com, 1
jonathancarter.org, 1 jonathancarter.org, 1
@ -15832,7 +15829,6 @@ kattelans.eu, 1
kattenfun.be, 1 kattenfun.be, 1
kattenfun.nl, 1 kattenfun.nl, 1
katyl.info, 0 katyl.info, 0
katyusha.net, 1
katzen.me, 1 katzen.me, 1
katzspeech.com, 1 katzspeech.com, 1
kau-boys.com, 1 kau-boys.com, 1
@ -16779,6 +16775,7 @@ landbetweenthelakes.us, 1
landell.ml, 1 landell.ml, 1
landflair-magazin.de, 1 landflair-magazin.de, 1
landhaus-christmann.de, 1 landhaus-christmann.de, 1
landinfo.no, 1
landofelves.net, 1 landofelves.net, 1
landyparts.nl, 1 landyparts.nl, 1
lanetix.com, 1 lanetix.com, 1
@ -17217,7 +17214,7 @@ leveredge.net, 1
leverj.io, 1 leverj.io, 1
levermann.eu, 1 levermann.eu, 1
levindesalpes.fr, 0 levindesalpes.fr, 0
levinus.de, 0 levinus.de, 1
lew.im, 1 lew.im, 1
lewdawson.com, 1 lewdawson.com, 1
lewis.li, 1 lewis.li, 1
@ -19257,7 +19254,6 @@ millstep.de, 1
milonga.tips, 1 milonga.tips, 1
mim.properties, 1 mim.properties, 1
mimbeim.com, 1 mimbeim.com, 1
mimeit.de, 1
mimemo.io, 1 mimemo.io, 1
mimeo.digital, 1 mimeo.digital, 1
mimithedog.com, 1 mimithedog.com, 1
@ -20092,7 +20088,6 @@ mycamda.com, 1
mycard.moe, 1 mycard.moe, 1
mycieokien.info, 0 mycieokien.info, 0
mycircleworks.com, 1 mycircleworks.com, 1
myclientsplus.com, 1
myclinicalstudybuddy.com, 1 myclinicalstudybuddy.com, 1
mycloud-system.com, 1 mycloud-system.com, 1
mycofairtrade.com, 1 mycofairtrade.com, 1
@ -20438,7 +20433,6 @@ naturalcommission.com, 1
naturalkitchen.co.uk, 1 naturalkitchen.co.uk, 1
naturalspacesdomes.com, 1 naturalspacesdomes.com, 1
naturaum.de, 1 naturaum.de, 1
natureflo.net, 1
naturesorganichaven.com, 1 naturesorganichaven.com, 1
naturheilpraxis-orlowsky.de, 1 naturheilpraxis-orlowsky.de, 1
naturheilpraxis-p-grote.de, 1 naturheilpraxis-p-grote.de, 1
@ -21051,7 +21045,6 @@ nodecompat.com, 1
nodefiles.com, 1 nodefiles.com, 1
nodefoo.com, 1 nodefoo.com, 1
nodejs.de, 1 nodejs.de, 1
nodelab-it.de, 1
nodelia.com, 1 nodelia.com, 1
nodepanel.net, 0 nodepanel.net, 0
nodepositcasinouk.com, 1 nodepositcasinouk.com, 1
@ -21852,7 +21845,6 @@ orfeo-engineering.ch, 1
organica.co.za, 1 organica.co.za, 1
organicae.com, 1 organicae.com, 1
organisatieteam.nl, 1 organisatieteam.nl, 1
organisationsberatung-jacobi.de, 1
organix.ma, 1 organix.ma, 1
orgasmium.com, 1 orgasmium.com, 1
orhideous.name, 1 orhideous.name, 1
@ -21935,7 +21927,6 @@ oticasaopaulo.com.br, 1
oticasvisao.net.br, 1 oticasvisao.net.br, 1
otinane.eu, 1 otinane.eu, 1
otmns.net, 1 otmns.net, 1
otokonna.com, 1
otorrino.pt, 1 otorrino.pt, 1
otoy.com, 1 otoy.com, 1
otoya.space, 1 otoya.space, 1
@ -22191,7 +22182,6 @@ pardnoy.com, 1
parentheseardenne.be, 1 parentheseardenne.be, 1
parentinterview.com, 1 parentinterview.com, 1
parentsintouch.co.uk, 1 parentsintouch.co.uk, 1
parfum-baza.ru, 1
pariga.co.uk, 1 pariga.co.uk, 1
parisescortgirls.com, 1 parisescortgirls.com, 1
parisfranceparking.com, 1 parisfranceparking.com, 1
@ -22546,7 +22536,6 @@ percolate.com, 1
percraft.com, 1 percraft.com, 1
percy.io, 1 percy.io, 1
perd.re, 1 perd.re, 1
perdel.cn, 0
perecraft.com, 1 perecraft.com, 1
pereuda.com, 1 pereuda.com, 1
perezdecastro.org, 1 perezdecastro.org, 1
@ -23038,7 +23027,7 @@ plexusmd.com, 1
plinc.co, 1 plinc.co, 1
pliosoft.com, 1 pliosoft.com, 1
plitu.de, 1 plitu.de, 1
ploader.ru, 1 ploader.ru, 0
plochka.bg, 1 plochka.bg, 1
plomberierenga.com, 1 plomberierenga.com, 1
plongee-phuket.fr, 1 plongee-phuket.fr, 1
@ -23283,6 +23272,7 @@ postdarwinism.com, 1
postdeck.de, 1 postdeck.de, 1
posteo.de, 0 posteo.de, 0
posters.win, 1 posters.win, 1
posterspy.com, 1
postfalls-naturopathic.com, 1 postfalls-naturopathic.com, 1
postfinance.ch, 1 postfinance.ch, 1
postmatescode.com, 1 postmatescode.com, 1
@ -23620,6 +23610,7 @@ promoterms.com.au, 1
promotiongeeks.com, 0 promotiongeeks.com, 0
pronto-intervento.net, 1 pronto-intervento.net, 1
proobec.cz, 1 proobec.cz, 1
proofwiki.org, 1
proos.nl, 1 proos.nl, 1
proovn.com, 1 proovn.com, 1
propagandablog.de, 1 propagandablog.de, 1
@ -24988,7 +24979,7 @@ roosteroriginals.com, 1
roosterpgplus.nl, 1 roosterpgplus.nl, 1
root.bg, 1 root.bg, 1
root.eu.org, 1 root.eu.org, 1
rootbsd.at, 0 rootbsd.at, 1
rootcamp.net, 1 rootcamp.net, 1
rootcommand.com, 1 rootcommand.com, 1
rootear.com, 1 rootear.com, 1
@ -26273,6 +26264,7 @@ shan.io, 0
shanae.nl, 1 shanae.nl, 1
shanetully.com, 1 shanetully.com, 1
shanewadleigh.com, 1 shanewadleigh.com, 1
shang-yu.cn, 1
shannoneichorn.com, 1 shannoneichorn.com, 1
shansing.cn, 1 shansing.cn, 1
shansing.com, 1 shansing.com, 1
@ -26522,7 +26514,7 @@ silashes.com, 1
silashes.ru, 1 silashes.ru, 1
silaslova-ekb.ru, 1 silaslova-ekb.ru, 1
silentexplosion.de, 1 silentexplosion.de, 1
silentkernel.fr, 1 silentkernel.fr, 0
silentmode.com, 1 silentmode.com, 1
silentundo.org, 1 silentundo.org, 1
siliconchip.me, 1 siliconchip.me, 1
@ -26717,6 +26709,7 @@ sirbouncelot.co.uk, 1
sirena.co.jp, 1 sirena.co.jp, 1
sirenslove.com, 1 sirenslove.com, 1
siriuspup.com, 1 siriuspup.com, 1
siroop.ch, 1
sirtaptap.com, 1 sirtaptap.com, 1
sirtuins.com, 1 sirtuins.com, 1
sistel.es, 1 sistel.es, 1
@ -27889,7 +27882,7 @@ strategiclivingblog.com, 1
strategie-zone.de, 1 strategie-zone.de, 1
strathewerd.de, 1 strathewerd.de, 1
stratmann-b.de, 1 stratmann-b.de, 1
straubis.org, 0 straubis.org, 1
strauser.com, 1 strauser.com, 1
stravers.shoes, 1 stravers.shoes, 1
stream-ing.xyz, 1 stream-ing.xyz, 1
@ -29389,7 +29382,6 @@ tintencenter.com, 1
tintenfix.net, 1 tintenfix.net, 1
tintenfux.de, 1 tintenfux.de, 1
tintenland.de, 1 tintenland.de, 1
tintenprofi.de, 1
tinyhousefinance.com.au, 1 tinyhousefinance.com.au, 1
tinylan.com, 1 tinylan.com, 1
tinyspeck.com, 1 tinyspeck.com, 1
@ -30461,7 +30453,6 @@ unirenter.ru, 1
unit7jazz.com, 1 unit7jazz.com, 1
unit7jazz.org, 1 unit7jazz.org, 1
unite-ka.de, 1 unite-ka.de, 1
uniteasia.org, 1
united-schools.net, 1 united-schools.net, 1
united.com, 0 united.com, 0
unitedadmins.com, 1 unitedadmins.com, 1
@ -30901,7 +30892,6 @@ vereinscheck.de, 1
verfassungsklage.at, 1 verfassungsklage.at, 1
vergeaccessories.com, 1 vergeaccessories.com, 1
verhovs.ky, 1 verhovs.ky, 1
verifiedinvesting.com, 1
verifyos.com, 1 verifyos.com, 1
veriny.tf, 1 veriny.tf, 1
veriomed.com, 1 veriomed.com, 1
@ -31199,7 +31189,6 @@ vmoe.info, 1
vmug.pl, 1 vmug.pl, 1
vn.search.yahoo.com, 0 vn.search.yahoo.com, 0
vnd.cloud, 1 vnd.cloud, 1
vnfs-team.com, 1
vnvisa.center, 1 vnvisa.center, 1
vnvisa.ru, 1 vnvisa.ru, 1
vocab.guru, 1 vocab.guru, 1
@ -31261,7 +31250,7 @@ vorodevops.com, 1
vos-fleurs.ch, 1 vos-fleurs.ch, 1
vos-fleurs.com, 1 vos-fleurs.com, 1
vosgym.jp, 1 vosgym.jp, 1
voshod.org, 0 voshod.org, 1
vosky.fr, 1 vosky.fr, 1
vostronet.com, 1 vostronet.com, 1
voter-info.uk, 1 voter-info.uk, 1
@ -32394,6 +32383,7 @@ wvw698.com, 1
wweforums.net, 1 wweforums.net, 1
wweichen.com.cn, 1 wweichen.com.cn, 1
wwgc2011.se, 1 wwgc2011.se, 1
wwv-8522.com, 1
www-33445.com, 1 www-33445.com, 1
www-49889.com, 1 www-49889.com, 1
www-62755.com, 1 www-62755.com, 1
@ -32734,6 +32724,7 @@ xninja.xyz, 1
xnode.org, 1 xnode.org, 1
xntrik.wtf, 1 xntrik.wtf, 1
xo.tc, 1 xo.tc, 1
xoda.pw, 1
xolphin.nl, 1 xolphin.nl, 1
xombitgames.com, 1 xombitgames.com, 1
xombitmusic.com, 1 xombitmusic.com, 1
@ -33188,6 +33179,7 @@ zaratan.fr, 1
zargaripour.com, 1 zargaripour.com, 1
zarmarket.org, 1 zarmarket.org, 1
zarpo.com.br, 1 zarpo.com.br, 1
zary.me, 1
zaufanatrzeciastrona.pl, 1 zaufanatrzeciastrona.pl, 1
zavec.com.ec, 1 zavec.com.ec, 1
zavetaji.lv, 1 zavetaji.lv, 1

2
taskcluster/ci/artifact-build/kind.yml
Просмотреть файл

@ -29,8 +29,6 @@ jobs:
worker: worker:
docker-image: {in-tree: desktop-build} docker-image: {in-tree: desktop-build}
max-run-time: 36000 max-run-time: 36000
env:
TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/linux64/releng.manifest"
run: run:
using: mozharness using: mozharness
actions: [get-secrets build] actions: [get-secrets build]

41
taskcluster/ci/build/linux.yml
Просмотреть файл

@ -9,8 +9,6 @@ linux64/opt:
worker-type: aws-provisioner-v1/gecko-{level}-b-linux worker-type: aws-provisioner-v1/gecko-{level}-b-linux
worker: worker:
max-run-time: 36000 max-run-time: 36000
env:
TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/linux64/releng.manifest"
run: run:
using: mozharness using: mozharness
actions: [get-secrets build check-test update] actions: [get-secrets build check-test update]
@ -40,8 +38,6 @@ linux64-dmd/opt:
worker-type: aws-provisioner-v1/gecko-{level}-b-linux worker-type: aws-provisioner-v1/gecko-{level}-b-linux
worker: worker:
max-run-time: 36000 max-run-time: 36000
env:
TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/linux64/releng.manifest"
run: run:
using: mozharness using: mozharness
actions: [get-secrets build check-test update] actions: [get-secrets build check-test update]
@ -72,8 +68,6 @@ linux64/pgo:
worker-type: aws-provisioner-v1/gecko-{level}-b-linux worker-type: aws-provisioner-v1/gecko-{level}-b-linux
worker: worker:
max-run-time: 36000 max-run-time: 36000
env:
TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/linux64/releng.manifest"
run: run:
using: mozharness using: mozharness
actions: [get-secrets build check-test update] actions: [get-secrets build check-test update]
@ -105,7 +99,6 @@ linux64-fuzzing/debug:
max-run-time: 36000 max-run-time: 36000
env: env:
PERFHERDER_EXTRA_OPTIONS: fuzzing PERFHERDER_EXTRA_OPTIONS: fuzzing
TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/linux64/releng.manifest"
run: run:
using: mozharness using: mozharness
actions: [get-secrets build check-test update] actions: [get-secrets build check-test update]
@ -135,8 +128,6 @@ linux64/debug:
worker-type: aws-provisioner-v1/gecko-{level}-b-linux worker-type: aws-provisioner-v1/gecko-{level}-b-linux
worker: worker:
max-run-time: 36000 max-run-time: 36000
env:
TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/linux64/releng.manifest"
run: run:
using: mozharness using: mozharness
actions: [get-secrets build check-test update] actions: [get-secrets build check-test update]
@ -171,8 +162,6 @@ linux64-devedition-nightly/opt:
worker-type: aws-provisioner-v1/gecko-{level}-b-linux worker-type: aws-provisioner-v1/gecko-{level}-b-linux
worker: worker:
max-run-time: 36000 max-run-time: 36000
env:
TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/linux64/releng.manifest"
run: run:
using: mozharness using: mozharness
actions: [get-secrets build check-test update] actions: [get-secrets build check-test update]
@ -207,7 +196,6 @@ linux64-base-toolchains/opt:
max-run-time: 36000 max-run-time: 36000
env: env:
PERFHERDER_EXTRA_OPTIONS: base-toolchains PERFHERDER_EXTRA_OPTIONS: base-toolchains
TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/linux64/base-toolchains.manifest"
run: run:
using: mozharness using: mozharness
actions: [get-secrets build check-test update] actions: [get-secrets build check-test update]
@ -238,7 +226,6 @@ linux64-base-toolchains/debug:
max-run-time: 36000 max-run-time: 36000
env: env:
PERFHERDER_EXTRA_OPTIONS: base-toolchains PERFHERDER_EXTRA_OPTIONS: base-toolchains
TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/linux64/base-toolchains.manifest"
run: run:
using: mozharness using: mozharness
actions: [get-secrets build check-test update] actions: [get-secrets build check-test update]
@ -268,8 +255,6 @@ linux/opt:
worker-type: aws-provisioner-v1/gecko-{level}-b-linux worker-type: aws-provisioner-v1/gecko-{level}-b-linux
worker: worker:
max-run-time: 36000 max-run-time: 36000
env:
TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/linux32/releng.manifest"
run: run:
using: mozharness using: mozharness
actions: [get-secrets build check-test update] actions: [get-secrets build check-test update]
@ -298,8 +283,6 @@ linux/debug:
worker-type: aws-provisioner-v1/gecko-{level}-b-linux worker-type: aws-provisioner-v1/gecko-{level}-b-linux
worker: worker:
max-run-time: 36000 max-run-time: 36000
env:
TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/linux32/releng.manifest"
run: run:
using: mozharness using: mozharness
actions: [get-secrets build check-test update] actions: [get-secrets build check-test update]
@ -329,8 +312,6 @@ linux/pgo:
worker-type: aws-provisioner-v1/gecko-{level}-b-linux worker-type: aws-provisioner-v1/gecko-{level}-b-linux
worker: worker:
max-run-time: 36000 max-run-time: 36000
env:
TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/linux32/releng.manifest"
run: run:
using: mozharness using: mozharness
actions: [get-secrets build check-test update] actions: [get-secrets build check-test update]
@ -363,7 +344,6 @@ linux-rusttests/opt:
max-run-time: 5400 max-run-time: 5400
env: env:
PERFHERDER_EXTRA_OPTIONS: rusttests PERFHERDER_EXTRA_OPTIONS: rusttests
TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/linux32/releng.manifest"
run: run:
using: mozharness using: mozharness
actions: [get-secrets build check-test update] actions: [get-secrets build check-test update]
@ -398,7 +378,6 @@ linux-rusttests/debug:
max-run-time: 5400 max-run-time: 5400
env: env:
PERFHERDER_EXTRA_OPTIONS: rusttests PERFHERDER_EXTRA_OPTIONS: rusttests
TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/linux32/releng.manifest"
run: run:
using: mozharness using: mozharness
actions: [get-secrets build check-test update] actions: [get-secrets build check-test update]
@ -435,8 +414,6 @@ linux-devedition-nightly/opt:
worker-type: aws-provisioner-v1/gecko-{level}-b-linux worker-type: aws-provisioner-v1/gecko-{level}-b-linux
worker: worker:
max-run-time: 36000 max-run-time: 36000
env:
TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/linux32/releng.manifest"
run: run:
using: mozharness using: mozharness
actions: [get-secrets build check-test update] actions: [get-secrets build check-test update]
@ -474,8 +451,6 @@ linux-nightly/opt:
worker-type: aws-provisioner-v1/gecko-{level}-b-linux worker-type: aws-provisioner-v1/gecko-{level}-b-linux
worker: worker:
max-run-time: 36000 max-run-time: 36000
env:
TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/linux32/releng.manifest"
run: run:
using: mozharness using: mozharness
actions: [get-secrets build check-test update] actions: [get-secrets build check-test update]
@ -507,7 +482,6 @@ linux64-asan/opt:
worker: worker:
env: env:
PERFHERDER_EXTRA_OPTIONS: "opt asan" PERFHERDER_EXTRA_OPTIONS: "opt asan"
TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/linux64/releng.manifest"
max-run-time: 36000 max-run-time: 36000
run: run:
using: mozharness using: mozharness
@ -540,7 +514,6 @@ linux64-asan-fuzzing/opt:
worker: worker:
env: env:
PERFHERDER_EXTRA_OPTIONS: asan-fuzzing PERFHERDER_EXTRA_OPTIONS: asan-fuzzing
TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/linux64/releng.manifest"
max-run-time: 36000 max-run-time: 36000
run: run:
using: mozharness using: mozharness
@ -572,7 +545,6 @@ linux64-asan-reporter/opt:
worker: worker:
env: env:
PERFHERDER_EXTRA_OPTIONS: asan-reporter PERFHERDER_EXTRA_OPTIONS: asan-reporter
TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/linux64/releng.manifest"
max-run-time: 36000 max-run-time: 36000
run: run:
using: mozharness using: mozharness
@ -604,7 +576,6 @@ linux64-asan/debug:
worker: worker:
env: env:
PERFHERDER_EXTRA_OPTIONS: "debug asan" PERFHERDER_EXTRA_OPTIONS: "debug asan"
TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/linux64/releng.manifest"
max-run-time: 36000 max-run-time: 36000
run: run:
using: mozharness using: mozharness
@ -640,8 +611,6 @@ linux64-nightly/opt:
worker-type: aws-provisioner-v1/gecko-{level}-b-linux worker-type: aws-provisioner-v1/gecko-{level}-b-linux
worker: worker:
max-run-time: 36000 max-run-time: 36000
env:
TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/linux64/releng.manifest"
run: run:
using: mozharness using: mozharness
actions: [get-secrets build check-test update] actions: [get-secrets build check-test update]
@ -672,8 +641,6 @@ linux64-noopt/debug:
worker-type: aws-provisioner-v1/gecko-{level}-b-linux worker-type: aws-provisioner-v1/gecko-{level}-b-linux
worker: worker:
max-run-time: 3600 max-run-time: 3600
env:
TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/linux64/releng.manifest"
run: run:
using: mozharness using: mozharness
actions: [get-secrets build check-test update] actions: [get-secrets build check-test update]
@ -708,7 +675,6 @@ linux64-rusttests/opt:
max-run-time: 5400 max-run-time: 5400
env: env:
PERFHERDER_EXTRA_OPTIONS: rusttests PERFHERDER_EXTRA_OPTIONS: rusttests
TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/linux64/releng.manifest"
run: run:
using: mozharness using: mozharness
actions: [get-secrets build check-test update] actions: [get-secrets build check-test update]
@ -743,7 +709,6 @@ linux64-rusttests/debug:
max-run-time: 5400 max-run-time: 5400
env: env:
PERFHERDER_EXTRA_OPTIONS: rusttests PERFHERDER_EXTRA_OPTIONS: rusttests
TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/linux64/releng.manifest"
run: run:
using: mozharness using: mozharness
actions: [get-secrets build check-test update] actions: [get-secrets build check-test update]
@ -777,8 +742,6 @@ linux64-jsdcov/opt:
worker-type: aws-provisioner-v1/gecko-{level}-b-linux worker-type: aws-provisioner-v1/gecko-{level}-b-linux
worker: worker:
max-run-time: 36000 max-run-time: 36000
env:
TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/linux64/releng.manifest"
run: run:
using: mozharness using: mozharness
actions: [get-secrets build check-test update] actions: [get-secrets build check-test update]
@ -809,8 +772,6 @@ linux64-ccov/opt:
worker-type: aws-provisioner-v1/gecko-{level}-b-linux worker-type: aws-provisioner-v1/gecko-{level}-b-linux
worker: worker:
max-run-time: 36000 max-run-time: 36000
env:
TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/linux64/releng.manifest"
run: run:
using: mozharness using: mozharness
actions: [get-secrets build check-test update] actions: [get-secrets build check-test update]
@ -840,8 +801,6 @@ linux64-add-on-devel/opt:
worker-type: aws-provisioner-v1/gecko-{level}-b-linux worker-type: aws-provisioner-v1/gecko-{level}-b-linux
worker: worker:
max-run-time: 36000 max-run-time: 36000
env:
TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/linux64/releng.manifest"
run: run:
using: mozharness using: mozharness
actions: [get-secrets build check-test update] actions: [get-secrets build check-test update]

6
taskcluster/ci/hazard/kind.yml
Просмотреть файл

@ -31,9 +31,6 @@ jobs:
treeherder: treeherder:
platform: linux64/debug platform: linux64/debug
symbol: SM-tc(H) symbol: SM-tc(H)
worker:
env:
TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/linux64/releng.manifest"
run: run:
using: hazard using: hazard
command: > command: >
@ -57,9 +54,6 @@ jobs:
treeherder: treeherder:
platform: linux64/debug platform: linux64/debug
symbol: tc(H) symbol: tc(H)
worker:
env:
TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/linux64/releng.manifest"
run: run:
using: hazard using: hazard
mozconfig: "browser/config/mozconfigs/linux64/hazards" mozconfig: "browser/config/mozconfigs/linux64/hazards"

2
taskcluster/ci/searchfox/kind.yml
Просмотреть файл

@ -33,8 +33,6 @@ jobs:
worker: worker:
docker-image: {in-tree: desktop-build} docker-image: {in-tree: desktop-build}
max-run-time: 36000 max-run-time: 36000
env:
TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/linux64/releng.manifest"
run: run:
using: mozharness using: mozharness
actions: [clobber build] actions: [clobber build]

4
taskcluster/ci/spidermonkey/kind.yml
Просмотреть файл

@ -201,8 +201,6 @@ jobs:
worker: worker:
max-run-time: 36000 max-run-time: 36000
docker-image: {in-tree: desktop-build} docker-image: {in-tree: desktop-build}
env:
TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/linux32/releng.manifest"
run: run:
spidermonkey-variant: arm-sim spidermonkey-variant: arm-sim
@ -292,8 +290,6 @@ jobs:
worker: worker:
max-run-time: 36000 max-run-time: 36000
docker-image: {in-tree: desktop-build} docker-image: {in-tree: desktop-build}
env:
TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/linux64/tsan.manifest"
run: run:
spidermonkey-variant: tsan spidermonkey-variant: tsan

4
taskcluster/ci/static-analysis/kind.yml
Просмотреть файл

@ -32,8 +32,6 @@ jobs:
worker: worker:
docker-image: {in-tree: desktop-build} docker-image: {in-tree: desktop-build}
max-run-time: 36000 max-run-time: 36000
env:
TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/linux64/releng.manifest"
run: run:
using: mozharness using: mozharness
actions: [build] actions: [build]
@ -59,8 +57,6 @@ jobs:
worker: worker:
docker-image: {in-tree: desktop-build} docker-image: {in-tree: desktop-build}
max-run-time: 36000 max-run-time: 36000
env:
TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/linux64/releng.manifest"
run: run:
using: mozharness using: mozharness
actions: [build] actions: [build]

2
taskcluster/ci/valgrind/kind.yml
Просмотреть файл

@ -28,8 +28,6 @@ jobs:
worker: worker:
docker-image: {in-tree: valgrind-build} docker-image: {in-tree: valgrind-build}
max-run-time: 72000 max-run-time: 72000
env:
TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/linux64/releng.manifest"
run: run:
using: mozharness using: mozharness
actions: [get-secrets build valgrind-test] actions: [get-secrets build valgrind-test]

5
taskcluster/docker/desktop-build/Dockerfile
Просмотреть файл

@ -33,10 +33,13 @@ ADD topsrcdir/taskcluster/docker/recipes/install-cmake.sh /setup/install-cmake.s
# %include taskcluster/docker/recipes/centos6-build-system-setup.sh # %include taskcluster/docker/recipes/centos6-build-system-setup.sh
ADD topsrcdir/taskcluster/docker/recipes/centos6-build-system-setup.sh /setup/system-setup.sh ADD topsrcdir/taskcluster/docker/recipes/centos6-build-system-setup.sh /setup/system-setup.sh
# %include build/unix/build-gtk3/build-gtk3.sh
ADD topsrcdir/build/unix/build-gtk3/build-gtk3.sh /setup/build-gtk3.sh
# TODO remove once base image doesn't install Mercurial # TODO remove once base image doesn't install Mercurial
RUN pip uninstall -y Mercurial RUN pip uninstall -y Mercurial
RUN bash /setup/system-setup.sh RUN bash /setup/build-gtk3.sh && bash /setup/system-setup.sh
# Add wrapper scripts for xvfb allowing tasks to easily retry starting up xvfb # Add wrapper scripts for xvfb allowing tasks to easily retry starting up xvfb
# %include taskcluster/docker/recipes/xvfb.sh # %include taskcluster/docker/recipes/xvfb.sh

5
taskcluster/docker/valgrind-build/Dockerfile
Просмотреть файл

@ -39,10 +39,13 @@ ADD topsrcdir/taskcluster/docker/recipes/centos6-build-system-setup.sh /setup/sy
# %include taskcluster/docker/recipes/centos-install-debug-symbols.sh # %include taskcluster/docker/recipes/centos-install-debug-symbols.sh
ADD topsrcdir/taskcluster/docker/recipes/centos-install-debug-symbols.sh /setup/install-debug-symbols.sh ADD topsrcdir/taskcluster/docker/recipes/centos-install-debug-symbols.sh /setup/install-debug-symbols.sh
# %include build/unix/build-gtk3/build-gtk3.sh
ADD topsrcdir/build/unix/build-gtk3/build-gtk3.sh /setup/build-gtk3.sh
# TODO remove once base image doesn't install Mercurial # TODO remove once base image doesn't install Mercurial
RUN pip uninstall -y Mercurial RUN pip uninstall -y Mercurial
RUN bash /setup/system-setup.sh RUN bash /setup/build-gtk3.sh && bash /setup/system-setup.sh
# Add wrapper scripts for xvfb allowing tasks to easily retry starting up xvfb # Add wrapper scripts for xvfb allowing tasks to easily retry starting up xvfb
# %include taskcluster/docker/recipes/xvfb.sh # %include taskcluster/docker/recipes/xvfb.sh

2
taskcluster/scripts/builder/build-haz-linux.sh
Просмотреть файл

@ -53,7 +53,7 @@ export MOZ_OBJDIR="$WORKSPACE/obj-analyzed"
mkdir -p "$MOZ_OBJDIR" mkdir -p "$MOZ_OBJDIR"
if [ -n "$DO_TOOLTOOL" ]; then if [ -n "$DO_TOOLTOOL" ]; then
( cd $TOOLTOOL_DIR; $GECKO_DIR/mach artifact toolchain -v --tooltool-url https://tooltool.mozilla-releng.net/ --tooltool-manifest $GECKO_DIR/$TOOLTOOL_MANIFEST --cache-dir $TOOLTOOL_CACHE${MOZ_TOOLCHAINS:+ ${MOZ_TOOLCHAINS}} ) ( cd $TOOLTOOL_DIR; $GECKO_DIR/mach artifact toolchain -v${TOOLTOOL_MANIFEST:+ --tooltool-url https://tooltool.mozilla-releng.net/ --tooltool-manifest $GECKO_DIR/$TOOLTOOL_MANIFEST} --cache-dir $TOOLTOOL_CACHE${MOZ_TOOLCHAINS:+ ${MOZ_TOOLCHAINS}} )
fi fi
export NO_MERCURIAL_SETUP_CHECK=1 export NO_MERCURIAL_SETUP_CHECK=1

2
taskcluster/scripts/builder/sm-tooltool-config.sh
Просмотреть файл

@ -56,7 +56,7 @@ BROWSER_PLATFORM=$PLATFORM_OS$BITS
: ${TOOLTOOL_CHECKOUT:=$WORK} : ${TOOLTOOL_CHECKOUT:=$WORK}
export TOOLTOOL_CHECKOUT export TOOLTOOL_CHECKOUT
(cd $TOOLTOOL_CHECKOUT && ${SRCDIR}/mach artifact toolchain -v $TOOLTOOL_AUTH_FLAGS --tooltool-url $TOOLTOOL_SERVER --tooltool-manifest $SRCDIR/$TOOLTOOL_MANIFEST ${TOOLTOOL_CACHE:+ --cache-dir $TOOLTOOL_CACHE}${MOZ_TOOLCHAINS:+ ${MOZ_TOOLCHAINS}}) (cd $TOOLTOOL_CHECKOUT && ${SRCDIR}/mach artifact toolchain${TOOLTOOL_MANIFEST:+ -v $TOOLTOOL_AUTH_FLAGS --tooltool-url $TOOLTOOL_SERVER --tooltool-manifest $SRCDIR/$TOOLTOOL_MANIFEST}${TOOLTOOL_CACHE:+ --cache-dir $TOOLTOOL_CACHE}${MOZ_TOOLCHAINS:+ ${MOZ_TOOLCHAINS}})
# Add all the tooltool binaries to our $PATH. # Add all the tooltool binaries to our $PATH.
for bin in $TOOLTOOL_CHECKOUT/*/bin $TOOLTOOL_CHECKOUT/VC/bin/Hostx64/x86; do for bin in $TOOLTOOL_CHECKOUT/*/bin $TOOLTOOL_CHECKOUT/VC/bin/Hostx64/x86; do

35
testing/web-platform/meta/MANIFEST.json
Просмотреть файл

@ -52773,6 +52773,18 @@
{} {}
] ]
], ],
"css/CSS2/linebox/line-height-oof-descendants-001.html": [
[
"/css/CSS2/linebox/line-height-oof-descendants-001.html",
[
[
"/css/CSS2/linebox/line-height-oof-descendants-001-ref.html",
"=="
]
],
{}
]
],
"css/CSS2/linebox/vertical-align-004.xht": [ "css/CSS2/linebox/vertical-align-004.xht": [
[ [
"/css/CSS2/linebox/vertical-align-004.xht", "/css/CSS2/linebox/vertical-align-004.xht",
@ -215920,6 +215932,11 @@
{} {}
] ]
], ],
"css/CSS2/linebox/line-height-oof-descendants-001-ref.html": [
[
{}
]
],
"css/CSS2/linebox/support/1x1-green.png": [ "css/CSS2/linebox/support/1x1-green.png": [
[ [
{} {}
@ -429253,6 +429270,14 @@
"2927ed2a8c86f6a791db5d6eb670ad1961b17e9e", "2927ed2a8c86f6a791db5d6eb670ad1961b17e9e",
"visual" "visual"
], ],
"css/CSS2/linebox/line-height-oof-descendants-001-ref.html": [
"284fd0f610f5428bea7a5f9c0dee1bdde3a4670b",
"support"
],
"css/CSS2/linebox/line-height-oof-descendants-001.html": [
"bb8949f890f140305ac76beb3f3ae1f2d15b16a3",
"reftest"
],
"css/CSS2/linebox/support/1x1-green.png": [ "css/CSS2/linebox/support/1x1-green.png": [
"51e7b6974a09eda6cb31337717c5eaeb9c44b443", "51e7b6974a09eda6cb31337717c5eaeb9c44b443",
"support" "support"
@ -545838,7 +545863,7 @@
"testharness" "testharness"
], ],
"html/semantics/scripting-1/the-script-element/module/instantiation-error-1.html": [ "html/semantics/scripting-1/the-script-element/module/instantiation-error-1.html": [
"2b4fa3b558dccb50bf0aee12a78e3320501ea1b5", "b48335aa61dc13c34d2a77806f20663e2156bc6f",
"testharness" "testharness"
], ],
"html/semantics/scripting-1/the-script-element/module/instantiation-error-1.js": [ "html/semantics/scripting-1/the-script-element/module/instantiation-error-1.js": [
@ -545846,15 +545871,15 @@
"support" "support"
], ],
"html/semantics/scripting-1/the-script-element/module/instantiation-error-2.html": [ "html/semantics/scripting-1/the-script-element/module/instantiation-error-2.html": [
"70271ef6fbf9f6e4f6e61438691b6fce317137e9", "e2c860b1b348148fc6b9d77f918894b1bac42c94",
"testharness" "testharness"
], ],
"html/semantics/scripting-1/the-script-element/module/instantiation-error-3.html": [ "html/semantics/scripting-1/the-script-element/module/instantiation-error-3.html": [
"80fa90a214bb4839703c36f9db36e07f3a2ca7f2", "996d1aa45c5975e13ac0f1e9c9249b3d452ed2e2",
"testharness" "testharness"
], ],
"html/semantics/scripting-1/the-script-element/module/instantiation-error-4.html": [ "html/semantics/scripting-1/the-script-element/module/instantiation-error-4.html": [
"dbb8eb640576cd4f658e32dec441919e943f8d21", "224fe5510f09c3dd6d58f9dcf61b4d6fca04c96c",
"testharness" "testharness"
], ],
"html/semantics/scripting-1/the-script-element/module/instantiation-error-4a.js": [ "html/semantics/scripting-1/the-script-element/module/instantiation-error-4a.js": [
@ -545874,7 +545899,7 @@
"support" "support"
], ],
"html/semantics/scripting-1/the-script-element/module/instantiation-error-5.html": [ "html/semantics/scripting-1/the-script-element/module/instantiation-error-5.html": [
"fcc8da57e88ee87592a02888c54bb6d66e5172f6", "7239ae9f5705f7baf5630e67cf4bfdc6c25b108d",
"testharness" "testharness"
], ],
"html/semantics/scripting-1/the-script-element/module/instantiation-error-5a.js": [ "html/semantics/scripting-1/the-script-element/module/instantiation-error-5a.js": [

14
testing/web-platform/tests/css/CSS2/linebox/line-height-oof-descendants-001-ref.html Normal file
Просмотреть файл

@ -0,0 +1,14 @@
<!doctype html>
<meta charset="utf-8">
<title>CSS Test Reference</title>
<link rel="author" title="Emilio Cobos Álvarez" href="mailto:emilio@crisal.io">
<style>
p {
font-size: 20px;
line-height: 0;
}
</style>
<p>Some paragraph</p>
<p>Some paragraph</p>
<p>Some paragraph</p>
<p>Some other paragraph</p>

17
testing/web-platform/tests/css/CSS2/linebox/line-height-oof-descendants-001.html Normal file
Просмотреть файл

@ -0,0 +1,17 @@
<!doctype html>
<meta charset="utf-8">
<title>CSS Test: line-height is not affected by out-of-flow descendants</title>
<link rel="author" title="Emilio Cobos Álvarez" href="mailto:emilio@crisal.io">
<link rel="help" href="https://www.w3.org/TR/CSS21/visudet.html#line-height">
<link rel="help" href="https://bugzilla.mozilla.org/show_bug.cgi?id=1426760">
<link rel="match" href="line-height-oof-descendants-001-ref.html">
<style>
p {
font-size: 20px;
line-height: 0;
}
</style>
<p><span style="position: absolute;"></span>Some paragraph</p>
<p><span style="float: left;"></span>Some paragraph</p>
<p><span style="position: fixed;"></span>Some paragraph</p>
<p>Some other paragraph</p>