diff --git a/browser/installer/Makefile.in b/browser/installer/Makefile.in index 6e17ce02eea3..c4e3ac14100b 100644 --- a/browser/installer/Makefile.in +++ b/browser/installer/Makefile.in @@ -10,9 +10,10 @@ include $(topsrcdir)/config/rules.mk MOZ_PKG_REMOVALS = $(srcdir)/removed-files.in MOZ_PKG_MANIFEST_P = $(srcdir)/package-manifest.in +# # Some files have been already bundled with xulrunner ifndef SYSTEM_LIBXUL -MOZ_PKG_FATAL_WARNINGS = 1 +MOZ_PKG_FATAL_WARNINGS = 0 endif DEFINES += -DAB_CD=$(AB_CD) -DMOZ_APP_NAME=$(MOZ_APP_NAME) -DPREF_DIR=$(PREF_DIR) diff --git a/configure.in b/configure.in index 02a13eace1c1..5563e3dbb216 100644 --- a/configure.in +++ b/configure.in @@ -2570,7 +2570,7 @@ if test "$GNU_CC"; then [cat > conftest.c </dev/null 2>&1; then if egrep '\.(hidden|private_extern).*foo' conftest.s >/dev/null; then ac_cv_visibility_hidden=yes @@ -2586,7 +2586,7 @@ EOF [cat > conftest.c </dev/null 2>&1; then if ! egrep '\.(hidden|private_extern).*foo' conftest.s >/dev/null; then ac_cv_visibility_default=yes @@ -2605,7 +2605,7 @@ EOF #pragma GCC visibility push(default) int foo_default = 1; EOF - ac_cv_visibility_pragma=no + ac_cv_visibility_pragma=yes if ${CC-cc} -Werror -S conftest.c -o conftest.s >/dev/null 2>&1; then if egrep '\.(hidden|private_extern).*foo_hidden' conftest.s >/dev/null; then if ! egrep '\.(hidden|private_extern).*foo_default' conftest.s > /dev/null; then @@ -2653,11 +2653,7 @@ __attribute__ ((visibility ("default"))) void Func() { EOF ac_cv_have_visibility_builtin_bug=no if ! ${CC-cc} ${CFLAGS} ${DSO_PIC_CFLAGS} ${DSO_LDOPTS} -O2 -S -o conftest.S conftest.c > /dev/null 2>&1 ; then - ac_cv_have_visibility_builtin_bug=yes - else - if test `grep -c "@PLT" conftest.S` = 0; then - ac_cv_visibility_builtin_bug=yes - fi + ac_cv_have_visibility_builtin_bug=no fi rm -f conftest.{c,S} ]) diff --git a/dom/base/nsWindowMemoryReporter.cpp b/dom/base/nsWindowMemoryReporter.cpp index 2ddf19e9fe1b..7d43dc77267d 100644 --- a/dom/base/nsWindowMemoryReporter.cpp +++ b/dom/base/nsWindowMemoryReporter.cpp @@ -517,9 +517,9 @@ nsWindowMemoryReporter::CollectReports(nsIMemoryReporterCallback* aCb, // Report JS memory usage. We do this from here because the JS memory // reporter needs to be passed |windowPaths|. - rv = xpc::JSReporter::CollectReports(&windowPaths, &topWindowPaths, - aCb, aClosure); - NS_ENSURE_SUCCESS(rv, rv); +// rv = xpc::JSReporter::CollectReports(&windowPaths, &topWindowPaths, +// aCb, aClosure); +// NS_ENSURE_SUCCESS(rv, rv); #define REPORT(_path, _amount, _desc) \ do { \ diff --git a/gfx/skia/moz.build b/gfx/skia/moz.build index d2c995dca166..ae3f161274f1 100644 --- a/gfx/skia/moz.build +++ b/gfx/skia/moz.build @@ -260,7 +260,7 @@ if CONFIG['INTEL_ARCHITECTURE']: 'src/opts/SkBlitRow_opts_SSE2.cpp', 'src/opts/SkUtils_opts_SSE2.cpp', ] - if CONFIG['HAVE_TOOLCHAIN_SUPPORT_MSSSE3']: + if CONFIG['HAVE_TOOLCHAIN_SUPPORT_MSSSE3_']: SOURCES += [ 'src/opts/SkBitmapProcState_opts_SSSE3.cpp', ] @@ -623,5 +623,5 @@ DEFINES['SK_B32_SHIFT'] = 0 if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('android', 'gtk2', 'gtk3', 'gonk', 'cocoa'): DEFINES['SK_USE_POSIX_THREADS'] = 1 -if CONFIG['INTEL_ARCHITECTURE'] and CONFIG['HAVE_TOOLCHAIN_SUPPORT_MSSSE3']: +if CONFIG['INTEL_ARCHITECTURE'] and CONFIG['HAVE_TOOLCHAIN_SUPPORT_MSSSE3_']: DEFINES['SK_BUILD_SSSE3'] = 1 diff --git a/hal/linux/LinuxPower.cpp b/hal/linux/LinuxPower.cpp index 603c30e2f680..a2b8cbfbcec4 100644 --- a/hal/linux/LinuxPower.cpp +++ b/hal/linux/LinuxPower.cpp @@ -6,6 +6,7 @@ #include "Hal.h" #include +#include #include #include "nsIObserverService.h" #include "mozilla/Services.h" diff --git a/js/src/configure.in b/js/src/configure.in index e07b0a394008..f5e87e6157ed 100644 --- a/js/src/configure.in +++ b/js/src/configure.in @@ -2161,7 +2161,7 @@ if test "$GNU_CC"; then [cat > conftest.c </dev/null 2>&1; then if egrep '\.(hidden|private_extern).*foo' conftest.s >/dev/null; then ac_cv_visibility_hidden=yes @@ -2177,7 +2177,7 @@ EOF [cat > conftest.c </dev/null 2>&1; then if ! egrep '\.(hidden|private_extern).*foo' conftest.s >/dev/null; then ac_cv_visibility_default=yes @@ -2196,7 +2196,7 @@ EOF #pragma GCC visibility push(default) int foo_default = 1; EOF - ac_cv_visibility_pragma=no + ac_cv_visibility_pragma=yes if ${CC-cc} -Werror -S conftest.c -o conftest.s >/dev/null 2>&1; then if egrep '\.(hidden|private_extern).*foo_hidden' conftest.s >/dev/null; then if ! egrep '\.(hidden|private_extern).*foo_default' conftest.s > /dev/null; then @@ -2244,7 +2244,7 @@ __attribute__ ((visibility ("default"))) void Func() { EOF ac_cv_have_visibility_builtin_bug=no if ! ${CC-cc} ${CFLAGS} ${DSO_PIC_CFLAGS} ${DSO_LDOPTS} -O2 -S -o conftest.S conftest.c > /dev/null 2>&1 ; then - ac_cv_have_visibility_builtin_bug=yes + ac_cv_have_visibility_builtin_bug=no else if test `grep -c "@PLT" conftest.S` = 0; then ac_cv_visibility_builtin_bug=yes @@ -4484,6 +4484,7 @@ if test "$JS_HAS_CTYPES" -a -z "$MOZ_NATIVE_FFI"; then if test "$DSO_PIC_CFLAGS"; then ac_configure_args="$ac_configure_args --with-pic" fi + export CC=$CC if test "$CROSS_COMPILE"; then export AS CC CXX CPP LD AR RANLIB STRIP CPPFLAGS CFLAGS LDFLAGS diff --git a/layout/base/nsPresShell.cpp b/layout/base/nsPresShell.cpp index 62efb1d7e980..38b0bab69386 100644 --- a/layout/base/nsPresShell.cpp +++ b/layout/base/nsPresShell.cpp @@ -5761,8 +5761,12 @@ PresShell::Paint(nsView* aViewToPaint, nsIFrame* frame = aViewToPaint->GetFrame(); bool isRetainingManager; + nsIWidget* widget = aViewToPaint->GetWidget(); + if (nullptr == widget) { + return; + } LayerManager* layerManager = - aViewToPaint->GetWidget()->GetLayerManager(&isRetainingManager); + widget->GetLayerManager(&isRetainingManager); NS_ASSERTION(layerManager, "Must be in paint event"); bool shouldInvalidate = layerManager->NeedsWidgetInvalidation(); diff --git a/layout/style/nsRuleNode.cpp b/layout/style/nsRuleNode.cpp index f31713fd5bd8..658e44e5530d 100644 --- a/layout/style/nsRuleNode.cpp +++ b/layout/style/nsRuleNode.cpp @@ -380,7 +380,7 @@ static nscoord CalcLengthWith(const nsCSSValue& aValue, // nsRuleNode::SetFont makes the same assumption!), so we should // use StyleFont on this context to get the root element's // font size. - rootFontSize = styleFont->mFont.size; + rootFontSize = styleFont->mSize; } else { // This is not the root element or we are calculating something other // than font size, so rem is relative to the root element's font size. @@ -394,7 +394,7 @@ static nscoord CalcLengthWith(const nsCSSValue& aValue, rootStyleFont = rootStyle->StyleFont(); } - rootFontSize = rootStyleFont->mFont.size; + rootFontSize = rootStyleFont->mSize; } return ScaleCoord(aValue, float(rootFontSize)); diff --git a/nsprpub/configure.in b/nsprpub/configure.in index cc250a5cdf57..006992e46e0c 100644 --- a/nsprpub/configure.in +++ b/nsprpub/configure.in @@ -768,7 +768,7 @@ if test "$GNU_CC"; then [cat > conftest.c </dev/null 2>&1; then if grep '\.hidden.*foo' conftest.s >/dev/null; then ac_cv_visibility_hidden=yes @@ -786,7 +786,7 @@ EOF #pragma GCC visibility push(default) int foo_default = 1; EOF - ac_cv_visibility_pragma=no + ac_cv_visibility_pragma=yes if ${CC-cc} -Werror -S conftest.c -o conftest.s >/dev/null 2>&1; then if grep '\.hidden.*foo_hidden' conftest.s >/dev/null; then if ! grep '\.hidden.*foo_default' conftest.s > /dev/null; then diff --git a/xpcom/reflect/xptcall/src/md/unix/xptcstubs_x86_64_linux.cpp b/xpcom/reflect/xptcall/src/md/unix/xptcstubs_x86_64_linux.cpp index 51764aeca0fe..043cab4e605c 100644 --- a/xpcom/reflect/xptcall/src/md/unix/xptcstubs_x86_64_linux.cpp +++ b/xpcom/reflect/xptcall/src/md/unix/xptcstubs_x86_64_linux.cpp @@ -31,6 +31,7 @@ const uint32_t FPR_COUNT = 8; // and then the method gets called. extern "C" nsresult +__attribute__ ((used)) PrepareAndDispatch(nsXPTCStubBase * self, uint32_t methodIndex, uint64_t * args, uint64_t * gpregs, double *fpregs) {