wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Merge mozilla-central to mozilla-inbound

Browse Source
This commit is contained in:
Matt Brubeck 2012-02-29 09:37:54 -08:00
commit ee21934243
20 changed files with 71 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
browser/config/mozconfigs/linux32/debug
View File

@ -1,5 +1,6 @@
ac_add_options --enable-debug
ac_add_options --enable-trace-malloc
ac_add_options --enable-signmar
. $topsrcdir/build/unix/mozconfig.linux

1
browser/config/mozconfigs/linux32/nightly
View File

@ -1,6 +1,7 @@
ac_add_options --enable-update-channel=${MOZ_UPDATE_CHANNEL}
ac_add_options --enable-update-packaging
ac_add_options --enable-codesighs
ac_add_options --enable-signmar
# Nightlies only since this has a cost in performance
ac_add_options --enable-js-diagnostics

1
browser/config/mozconfigs/linux64/debug
View File

@ -1,5 +1,6 @@
ac_add_options --enable-debug
ac_add_options --enable-trace-malloc
ac_add_options --enable-signmar
. $topsrcdir/build/unix/mozconfig.linux

1
browser/config/mozconfigs/linux64/nightly
View File

@ -1,6 +1,7 @@
ac_add_options --enable-update-channel=${MOZ_UPDATE_CHANNEL}
ac_add_options --enable-update-packaging
ac_add_options --enable-codesighs
ac_add_options --enable-signmar
# Nightlies only since this has a cost in performance
ac_add_options --enable-js-diagnostics

1
browser/config/mozconfigs/macosx-lion-universal/nightly
View File

@ -7,6 +7,7 @@ ac_add_options --enable-update-channel=${MOZ_UPDATE_CHANNEL}
ac_add_options --enable-update-packaging
ac_add_options --enable-codesighs
ac_add_options --disable-install-strip
ac_add_options --enable-signmar
# Nightlies only since this has a cost in performance
ac_add_options --enable-js-diagnostics

1
browser/config/mozconfigs/macosx-universal/nightly
View File

@ -7,6 +7,7 @@ ac_add_options --enable-update-channel=${MOZ_UPDATE_CHANNEL}
ac_add_options --enable-update-packaging
ac_add_options --enable-codesighs
ac_add_options --disable-install-strip
ac_add_options --enable-signmar
# Nightlies only since this has a cost in performance
ac_add_options --enable-js-diagnostics

1
browser/config/mozconfigs/macosx32-lion/debug
View File

@ -1,6 +1,7 @@
. $topsrcdir/build/macosx/mozconfig.leopard
ac_add_options --enable-debug
ac_add_options --enable-trace-malloc
ac_add_options --enable-signmar
# Enable parallel compiling
mk_add_options MOZ_MAKE_FLAGS="-j12"

1
browser/config/mozconfigs/macosx32/debug
View File

@ -1,6 +1,7 @@
. $topsrcdir/build/macosx/mozconfig.leopard
ac_add_options --enable-debug
ac_add_options --enable-trace-malloc
ac_add_options --enable-signmar
# Enable parallel compiling
mk_add_options MOZ_MAKE_FLAGS="-j4"

1
browser/config/mozconfigs/macosx64-lion/debug
View File

@ -3,6 +3,7 @@
ac_add_options --enable-debug
ac_add_options --enable-trace-malloc
ac_add_options --enable-accessibility
ac_add_options --enable-signmar
# Enable parallel compiling
mk_add_options MOZ_MAKE_FLAGS="-j12"

1
browser/config/mozconfigs/macosx64/debug
View File

@ -3,6 +3,7 @@
ac_add_options --enable-debug
ac_add_options --enable-trace-malloc
ac_add_options --enable-accessibility
ac_add_options --enable-signmar
# Enable parallel compiling
mk_add_options MOZ_MAKE_FLAGS="-j4"

1
browser/config/mozconfigs/win32/debug
View File

@ -1,5 +1,6 @@
ac_add_options --enable-debug
ac_add_options --enable-trace-malloc
ac_add_options --enable-signmar
# Needed to enable breakpad in application.ini
export MOZILLA_OFFICIAL=1

1
browser/config/mozconfigs/win32/nightly
View File

@ -4,6 +4,7 @@ mk_add_options PROFILE_GEN_SCRIPT='$(PYTHON) $(MOZ_OBJDIR)/_profile/pgo/profiles
ac_add_options --enable-update-channel=${MOZ_UPDATE_CHANNEL}
ac_add_options --enable-update-packaging
ac_add_options --enable-jemalloc
ac_add_options --enable-signmar
# Nightlies only since this has a cost in performance
ac_add_options --enable-js-diagnostics

1
browser/config/mozconfigs/win64/debug
View File

@ -3,6 +3,7 @@ ac_add_options --host=x86_64-pc-mingw32
ac_add_options --enable-debug
ac_add_options --enable-trace-malloc
ac_add_options --enable-signmar
# Needed to enable breakpad in application.ini
export MOZILLA_OFFICIAL=1

1
browser/config/mozconfigs/win64/nightly
View File

@ -7,6 +7,7 @@ mk_add_options PROFILE_GEN_SCRIPT='$(PYTHON) $(MOZ_OBJDIR)/_profile/pgo/profiles
ac_add_options --enable-update-channel=${MOZ_UPDATE_CHANNEL}
ac_add_options --enable-update-packaging
ac_add_options --enable-jemalloc
ac_add_options --enable-signmar
# Nightlies only since this has a cost in performance
ac_add_options --enable-js-diagnostics

1
config/autoconf.mk.in
View File

@ -143,6 +143,7 @@ XPCOM_USE_LEA = @XPCOM_USE_LEA@
MOZ_INSTALLER = @MOZ_INSTALLER@
MOZ_MAINTENANCE_SERVICE = @MOZ_MAINTENANCE_SERVICE@
MOZ_VERIFY_MAR_SIGNATURE = @MOZ_VERIFY_MAR_SIGNATURE@
MOZ_ENABLE_SIGNMAR = @MOZ_ENABLE_SIGNMAR@
MOZ_UPDATER = @MOZ_UPDATER@
MOZ_UPDATE_CHANNEL = @MOZ_UPDATE_CHANNEL@
MOZ_UPDATE_PACKAGING = @MOZ_UPDATE_PACKAGING@

18
configure.in
View File

@ -6499,6 +6499,23 @@ if test -n "$MOZ_VERIFY_MAR_SIGNATURE"; then
fi
fi
dnl ========================================================
dnl Enable building the signmar program.
dnl This option is much different than the --enable-verify-mar option.
dnl --enable-verify-mar is for enabling the verification check on MAR
dnl files in the updater. The --enable-signmar option is for building
dnl the signmar program.
dnl ========================================================
MOZ_ARG_ENABLE_BOOL(sign-mar,
[ --enable-signmar Enable building the signmar program],
MOZ_ENABLE_SIGNMAR=1,
MOZ_ENABLE_SIGNMAR= )
if test -n "$MOZ_ENABLE_SIGNMAR"; then
AC_DEFINE(MOZ_ENABLE_SIGNMAR)
fi
dnl ========================================================
dnl Updater
dnl ========================================================
@ -8601,6 +8618,7 @@ AC_SUBST(MOZ_USER_DIR)
AC_SUBST(MOZ_CRASHREPORTER)
AC_SUBST(MOZ_MAINTENANCE_SERVICE)
AC_SUBST(MOZ_VERIFY_MAR_SIGNATURE)
AC_SUBST(MOZ_ENABLE_SIGNMAR)
AC_SUBST(MOZ_UPDATER)
AC_SUBST(MOZ_ANGLE)
AC_SUBST(MOZ_DIRECTX_SDK_PATH)

5
dom/tests/mochitest/bugs/test_resize_move_windows.html
View File

@ -262,10 +262,12 @@ function checkChangeIsEnabled(aWindow, aNext)
});
}
SpecialPowers.pushPrefEnv({"set": [["dom.disable_window_move_resize", false]]}, function() {
SimpleTest.waitForFocus(function() {
if (screen.width <= 200 || screen.height <= 200) {
todo(false, "The screen is too small to run this test.");
todo(false, "The screen needs to be bigger than 200px*200px to run this test.");
SimpleTest.finish();
return;
}
backValues();
@ -318,6 +320,7 @@ SimpleTest.waitForFocus(function() {
}, w, false);
});
});
}); // SpecialPowers.pushPrefEnv()
</script>
</pre>

16
modules/libmar/Makefile.in
View File

@ -43,11 +43,25 @@ VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
DIRS = sign verify src tool
DIRS = src
MODULE = libmar_test
ifdef MOZ_ENABLE_SIGNMAR
DIRS += sign verify
else
ifeq ($(OS_ARCH),WINNT)
# On Windows we don't verify with NSS and updater needs to link to it
DIRS += verify
endif
endif
# If we are building ./sign and ./verify then ./tool must come after it
DIRS += tool
ifdef ENABLE_TESTS
ifdef MOZ_ENABLE_SIGNMAR
DIRS += tests
endif
endif
include $(topsrcdir)/config/rules.mk

17
modules/libmar/tool/Makefile.in
View File

@ -52,7 +52,10 @@ endif
# would only be used by our build system and should not itself be included in a
# Mozilla distribution.
HOST_PROGRAM = mar$(HOST_BIN_SUFFIX)
ifdef MOZ_ENABLE_SIGNMAR
PROGRAM = signmar$(BIN_SUFFIX)
endif
# Don't link the against libmozglue because we don't need it.
MOZ_GLUE_LDFLAGS =
@ -63,6 +66,12 @@ DEFINES += \
-DMOZ_APP_VERSION='"$(MOZ_APP_VERSION)"' \
$(NULL)
ifndef MOZ_ENABLE_SIGNMAR
DEFINES += \
-DNO_SIGN_VERIFY \
$(NULL)
endif
HOST_CFLAGS += \
-DNO_SIGN_VERIFY \
$(DEFINES) \
@ -74,20 +83,26 @@ HOST_CSRCS = \
CSRCS = $(HOST_CSRCS)
HOST_LIBS = $(DIST)/host/lib/$(LIB_PREFIX)hostmar.$(LIB_SUFFIX)
LIBS = $(DEPTH)/modules/libmar/src/$(LIB_PREFIX)mar.$(LIB_SUFFIX) \
LIBS = $(DEPTH)/modules/libmar/src/$(LIB_PREFIX)mar.$(LIB_SUFFIX)
ifdef MOZ_ENABLE_SIGNMAR
LIBS += \
$(DEPTH)/modules/libmar/sign/$(LIB_PREFIX)signmar.$(LIB_SUFFIX) \
$(DEPTH)/modules/libmar/verify/$(LIB_PREFIX)verifymar.$(LIB_SUFFIX) \
$(DIST)/lib/$(LIB_PREFIX)nss3.$(LIB_SUFFIX) \
$(DIST)/lib/$(LIB_PREFIX)nssutil3.$(LIB_SUFFIX) \
$(NSPR_LIBS) \
$(NULL)
endif
ifeq ($(HOST_OS_ARCH),WINNT)
HOST_EXTRA_LIBS += $(call EXPAND_LIBNAME,ws2_32)
EXTRA_LIBS += $(call EXPAND_LIBNAME,ws2_32)
ifdef MOZ_ENABLE_SIGNMAR
EXTRA_LIBS += $(call EXPAND_LIBNAME,crypt32)
EXTRA_LIBS += $(call EXPAND_LIBNAME,advapi32)
endif
endif
include $(topsrcdir)/config/rules.mk

3
toolkit/mozapps/update/nsUpdateService.js
View File

@ -2464,6 +2464,7 @@ Checker.prototype = {
this._callback.onError(request, update);
}
this._callback = null;
this._request = null;
},
@ -2513,6 +2514,8 @@ Checker.prototype = {
Services.prefs.setBoolPref(PREF_APP_UPDATE_ENABLED, this._enabled);
break;
}
this._callback = null;
},
classID: Components.ID("{898CDC9B-E43F-422F-9CC4-2F6291B415A3}"),