Commit 8d62d22b authored Apr 19, 2022 by criss

Backed out 10 changesets (bug 1661450) for causing build bustages on nsWindow.cpp. CLOSED TREE

Backed out changeset 2c41d82de0c5 (bug 1661450)
Backed out changeset 5f58fcd7ac0b (bug 1661450)
Backed out changeset 62e56a6dcd22 (bug 1661450)
Backed out changeset 4b422ffa729f (bug 1661450)
Backed out changeset 6ca4705772da (bug 1661450)
Backed out changeset 031a6313459f (bug 1661450)
Backed out changeset 06ddf05e97d6 (bug 1661450)
Backed out changeset 4388b1b9aafd (bug 1661450)
Backed out changeset 600f9fd09fa6 (bug 1661450)
Backed out changeset cc5e8efe3ebf (bug 1661450)

parent f674f553

build/gn.mozbuild

+0 −6

Original line number	Diff line number	Diff line
		@@ -13,12 +13,6 @@ else:

		os = CONFIG['OS_TARGET']

		if os == "Linux":
		if CONFIG['MOZ_X11']:
		gn_vars['use_x11'] = True
		else:
		gn_vars['use_x11'] = False

		flavors = {
		'WINNT': 'win',
		'Android': 'android',

build/unix/mozconfig.linux

+1 −1

Original line number	Diff line number	Diff line
		@@ -8,7 +8,7 @@ x11)
		ac_add_options --enable-default-toolkit=cairo-gtk3
		;;
		*)
		ac_add_options --enable-default-toolkit=cairo-gtk3-x11-wayland
		ac_add_options --enable-default-toolkit=cairo-gtk3-wayland
		;;
		esac

dom/base/nsDOMWindowUtils.cpp

+2 −4

Original line number	Diff line number	Diff line
		@@ -75,12 +75,10 @@
		#include "mozilla/dom/DOMRect.h"
		#include <algorithm>

		#if defined(MOZ_WIDGET_GTK)
		#if defined(MOZ_X11) && defined(MOZ_WIDGET_GTK)
		# include <gdk/gdk.h>
		# if defined(MOZ_X11)
		# include <gdk/gdkx.h>
		#endif
		#endif

		#include "Layers.h"

dom/media/webrtc/third_party_build/gn-configs/generate-gn-build-files.sh

+3 −6

Original line number	Diff line number	Diff line
		@@ -83,12 +83,9 @@ else
		rustup target add aarch64-unknown-linux-gnu
		rustup target add i686-unknown-linux-gnu

		CONFIGS="x64_False_x64_linux_False x64_True_x64_linux_False"
		CONFIGS="$CONFIGS x64_False_x64_linux_True x64_True_x64_linux_True"
		CONFIGS="$CONFIGS x64_False_x86_linux_False x64_True_x86_linux_False"
		CONFIGS="$CONFIGS x64_False_x86_linux_True x64_True_x86_linux_True"
		CONFIGS="$CONFIGS x64_False_arm64_linux_False x64_True_arm64_linux_False"
		CONFIGS="$CONFIGS x64_False_arm64_linux_True x64_True_arm64_linux_True"
		CONFIGS="x64_False_x64_linux x64_True_x64_linux"
		CONFIGS="$CONFIGS x64_False_x86_linux x64_True_x86_linux"
		CONFIGS="$CONFIGS x64_False_arm64_linux x64_True_arm64_linux"
		CONFIGS="$CONFIGS x64_False_arm_android x64_True_arm_android"
		CONFIGS="$CONFIGS x64_False_x64_android x64_True_x64_android"
		CONFIGS="$CONFIGS x64_False_x86_android x64_True_x86_android"

dom/media/webrtc/third_party_build/gn-configs/x64_False_arm64_android.json

+0 −1

Original line number	Diff line number	Diff line
		@@ -9,7 +9,6 @@
		"CPU_ARCH": "aarch64",
		"HOST_CPU_ARCH": "x86_64",
		"MOZ_DEBUG": null,
		"MOZ_X11": null,
		"OS_TARGET": "Android"
		},
		"sandbox_vars": {