зеркало из https://github.com/mozilla/gecko-dev.git
Merge mozilla-central to mozilla-inbound on a CLOSED TREE.
This commit is contained in:
Bobby Holley
Коммит
b10f347193
|
|
@ -1292,13 +1292,13 @@ WIN_TOP_SRC=
|
|||
MOZ_USER_DIR=".mozilla"
|
||||
|
||||
MOZ_JPEG_CFLAGS=
|
||||
MOZ_JPEG_LIBS='$(call EXPAND_LIBNAME_PATH,mozjpeg,$(DEPTH)/jpeg)'
|
||||
MOZ_JPEG_LIBS='$(call EXPAND_LIBNAME_PATH,mozjpeg,$(DEPTH)/media/libjpeg)'
|
||||
MOZ_ZLIB_CFLAGS=
|
||||
MOZ_ZLIB_LIBS='$(call EXPAND_LIBNAME_PATH,mozz,$(DEPTH)/modules/zlib/src)'
|
||||
MOZ_BZ2_CFLAGS=
|
||||
MOZ_BZ2_LIBS='$(call EXPAND_LIBNAME_PATH,bz2,$(DEPTH)/modules/libbz2/src)'
|
||||
MOZ_PNG_CFLAGS=
|
||||
MOZ_PNG_LIBS='$(call EXPAND_LIBNAME_PATH,mozpng,$(DEPTH)/modules/libimg/png)'
|
||||
MOZ_PNG_LIBS='$(call EXPAND_LIBNAME_PATH,mozpng,$(DEPTH)/media/libpng)'
|
||||
|
||||
MOZ_JS_STATIC_LIBS='$(call EXPAND_LIBNAME_PATH,js_static,$(LIBXUL_DIST)/lib)'
|
||||
MOZ_JS_SHARED_LIBS='$(call EXPAND_LIBNAME_PATH,mozjs,$(LIBXUL_DIST)/lib)'
|
||||
|
|
@ -2291,8 +2291,8 @@ ia64*-hpux*)
|
|||
LDFLAGS="$LDFLAGS -DYNAMICBASE"
|
||||
fi
|
||||
fi
|
||||
MOZ_JPEG_LIBS='$(call EXPAND_LIBNAME_PATH,jpeg32$(VERSION_NUMBER),$(DEPTH)/jpeg)'
|
||||
MOZ_PNG_LIBS='$(call EXPAND_LIBNAME_PATH,png,$(DEPTH)/modules/libimg/png)'
|
||||
MOZ_JPEG_LIBS='$(call EXPAND_LIBNAME_PATH,jpeg32$(VERSION_NUMBER),$(DEPTH)/media/libjpeg)'
|
||||
MOZ_PNG_LIBS='$(call EXPAND_LIBNAME_PATH,png,$(DEPTH)/media/libpng)'
|
||||
AC_DEFINE(HAVE_SNPRINTF)
|
||||
AC_DEFINE(_WINDOWS)
|
||||
AC_DEFINE(WIN32)
|
||||
|
|
|
|||
|
|
@ -127,7 +127,7 @@ nsSetDocumentOptionsCommand::DoCommandParams(const char *aCommandName,
|
|||
if (NS_SUCCEEDED(rv))
|
||||
{
|
||||
// for possible values of animation mode, see:
|
||||
// http://lxr.mozilla.org/seamonkey/source/modules/libpr0n/public/imgIContainer.idl
|
||||
// http://lxr.mozilla.org/seamonkey/source/image/public/imgIContainer.idl
|
||||
presContext->SetImageAnimationMode(animationMode);
|
||||
}
|
||||
|
||||
|
|
@ -178,7 +178,7 @@ nsSetDocumentOptionsCommand::GetCommandStateParams(const char *aCommandName,
|
|||
if (NS_SUCCEEDED(rv))
|
||||
{
|
||||
// for possible values of animation mode, see
|
||||
// http://lxr.mozilla.org/seamonkey/source/modules/libpr0n/public/imgIContainer.idl
|
||||
// http://lxr.mozilla.org/seamonkey/source/image/public/imgIContainer.idl
|
||||
rv = aParams->SetLongValue("imageAnimation",
|
||||
presContext->ImageAnimationMode());
|
||||
NS_ENSURE_SUCCESS(rv, rv);
|
||||
|
|
|
|||
|
|
@ -35,7 +35,7 @@
|
|||
#
|
||||
# ***** END LICENSE BLOCK *****
|
||||
|
||||
DEPTH = ../..
|
||||
DEPTH = ..
|
||||
topsrcdir = @top_srcdir@
|
||||
srcdir = @srcdir@
|
||||
VPATH = @srcdir@
|
||||
|
|
@ -35,7 +35,7 @@
|
|||
#
|
||||
# ***** END LICENSE BLOCK *****
|
||||
|
||||
DEPTH = ../../..
|
||||
DEPTH = ../..
|
||||
topsrcdir = @top_srcdir@
|
||||
srcdir = @srcdir@
|
||||
VPATH = @srcdir@
|
||||
|
|
@ -35,7 +35,7 @@
|
|||
#
|
||||
# ***** END LICENSE BLOCK *****
|
||||
|
||||
DEPTH = ../../..
|
||||
DEPTH = ../..
|
||||
topsrcdir = @top_srcdir@
|
||||
srcdir = @srcdir@
|
||||
VPATH = @srcdir@
|
||||
|
|
@ -57,7 +57,7 @@ CSRCS = iccjpeg.c \
|
|||
$(NULL)
|
||||
|
||||
# Decoders need RasterImage.h
|
||||
LOCAL_INCLUDES += -I$(topsrcdir)/modules/libpr0n/src/
|
||||
LOCAL_INCLUDES += -I$(topsrcdir)/image/src/
|
||||
|
||||
# PNG read/write stuff
|
||||
DEFINES += -DMOZ_PNG_WRITE \
|
||||
|
|
@ -35,7 +35,7 @@
|
|||
#
|
||||
# ***** END LICENSE BLOCK *****
|
||||
|
||||
DEPTH = ../../../..
|
||||
DEPTH = ../../..
|
||||
topsrcdir = @top_srcdir@
|
||||
srcdir = @srcdir@
|
||||
VPATH = @srcdir@
|
||||
|
|
@ -35,7 +35,7 @@
|
|||
#
|
||||
# ***** END LICENSE BLOCK *****
|
||||
|
||||
DEPTH = ../../../../..
|
||||
DEPTH = ../../../..
|
||||
topsrcdir = @top_srcdir@
|
||||
srcdir = @srcdir@
|
||||
VPATH = @srcdir@
|
||||
|
|
@ -35,7 +35,7 @@
|
|||
# ***** END LICENSE BLOCK *****
|
||||
|
||||
|
||||
DEPTH = ../../../../..
|
||||
DEPTH = ../../../..
|
||||
topsrcdir = @top_srcdir@
|
||||
srcdir = @srcdir@
|
||||
VPATH = @srcdir@
|
||||
|
|
@ -35,7 +35,7 @@
|
|||
#
|
||||
# ***** END LICENSE BLOCK *****
|
||||
|
||||
DEPTH = ../../../../..
|
||||
DEPTH = ../../../..
|
||||
topsrcdir = @top_srcdir@
|
||||
srcdir = @srcdir@
|
||||
VPATH = @srcdir@
|
||||
|
|
@ -35,7 +35,7 @@
|
|||
#
|
||||
# ***** END LICENSE BLOCK *****
|
||||
|
||||
DEPTH = ../../../../..
|
||||
DEPTH = ../../../..
|
||||
topsrcdir = @top_srcdir@
|
||||
srcdir = @srcdir@
|
||||
VPATH = @srcdir@
|
||||
|
|
@ -34,7 +34,7 @@
|
|||
#
|
||||
# ***** END LICENSE BLOCK *****
|
||||
|
||||
DEPTH = ../../../../..
|
||||
DEPTH = ../../../..
|
||||
topsrcdir = @top_srcdir@
|
||||
srcdir = @srcdir@
|
||||
VPATH = @srcdir@
|
||||
|
|
@ -34,7 +34,7 @@
|
|||
#
|
||||
# ***** END LICENSE BLOCK *****
|
||||
|
||||
DEPTH = ../../../../../..
|
||||
DEPTH = ../../../../..
|
||||
topsrcdir = @top_srcdir@
|
||||
srcdir = @srcdir@
|
||||
VPATH = @srcdir@
|
||||
|
|
@ -35,7 +35,7 @@
|
|||
#
|
||||
# ***** END LICENSE BLOCK *****
|
||||
|
||||
DEPTH = ../../../../..
|
||||
DEPTH = ../../../..
|
||||
topsrcdir = @top_srcdir@
|
||||
srcdir = @srcdir@
|
||||
VPATH = @srcdir@
|
||||
|
|
@ -33,7 +33,7 @@
|
|||
#
|
||||
# ***** END LICENSE BLOCK *****
|
||||
|
||||
DEPTH = ../../..
|
||||
DEPTH = ../..
|
||||
topsrcdir = @top_srcdir@
|
||||
srcdir = @srcdir@
|
||||
VPATH = @srcdir@
|
||||
|
|
@ -35,7 +35,7 @@
|
|||
#
|
||||
# ***** END LICENSE BLOCK *****
|
||||
|
||||
DEPTH = ../../../..
|
||||
DEPTH = ../../..
|
||||
topsrcdir = @top_srcdir@
|
||||
srcdir = @srcdir@
|
||||
VPATH = @srcdir@
|
||||
|
|
@ -48,7 +48,7 @@ FORCE_STATIC_LIB = 1
|
|||
MODULE_NAME = imgEncoderBMPModule
|
||||
LIBXUL_LIBRARY = 1
|
||||
|
||||
LOCAL_INCLUDES += -I$(topsrcdir)/modules/libpr0n/src/
|
||||
LOCAL_INCLUDES += -I$(topsrcdir)/image/src/
|
||||
|
||||
CPPSRCS = nsBMPEncoder.cpp
|
||||
|
||||
|
|
@ -35,7 +35,7 @@
|
|||
#
|
||||
# ***** END LICENSE BLOCK *****
|
||||
|
||||
DEPTH = ../../../..
|
||||
DEPTH = ../../..
|
||||
topsrcdir = @top_srcdir@
|
||||
srcdir = @srcdir@
|
||||
VPATH = @srcdir@
|
||||
|
|
@ -49,9 +49,9 @@ MODULE_NAME = imgEncoderICOModule
|
|||
LIBXUL_LIBRARY = 1
|
||||
|
||||
# Decoders need RasterImage.h
|
||||
LOCAL_INCLUDES += -I$(topsrcdir)/modules/libpr0n/src/
|
||||
LOCAL_INCLUDES += -I$(topsrcdir)/modules/libpr0n/encoders/bmp/
|
||||
LOCAL_INCLUDES += -I$(topsrcdir)/modules/libpr0n/encoders/png/
|
||||
LOCAL_INCLUDES += -I$(topsrcdir)/image/src/
|
||||
LOCAL_INCLUDES += -I$(topsrcdir)/image/encoders/bmp/
|
||||
LOCAL_INCLUDES += -I$(topsrcdir)/image/encoders/png/
|
||||
|
||||
CPPSRCS = nsICOEncoder.cpp
|
||||
|
||||
|
|
@ -33,7 +33,7 @@
|
|||
#
|
||||
# ***** END LICENSE BLOCK *****
|
||||
|
||||
DEPTH = ../../../..
|
||||
DEPTH = ../../..
|
||||
topsrcdir = @top_srcdir@
|
||||
srcdir = @srcdir@
|
||||
VPATH = @srcdir@
|
||||
|
|
@ -33,7 +33,7 @@
|
|||
#
|
||||
# ***** END LICENSE BLOCK *****
|
||||
|
||||
DEPTH = ../../../..
|
||||
DEPTH = ../../..
|
||||
topsrcdir = @top_srcdir@
|
||||
srcdir = @srcdir@
|
||||
VPATH = @srcdir@
|
||||
|
|
@ -50,7 +50,7 @@ DEFINES += -DMOZ_PNG_WRITE \
|
|||
-DMOZ_PNG_READ \
|
||||
$(NULL)
|
||||
|
||||
LOCAL_INCLUDES += -I$(topsrcdir)/modules/libpr0n/src/
|
||||
LOCAL_INCLUDES += -I$(topsrcdir)/image/src/
|
||||
|
||||
CPPSRCS = nsPNGEncoder.cpp
|
||||
|
||||
|
|
@ -35,7 +35,7 @@
|
|||
#
|
||||
# ***** END LICENSE BLOCK *****
|
||||
|
||||
DEPTH = ../../..
|
||||
DEPTH = ../..
|
||||
topsrcdir = @top_srcdir@
|
||||
srcdir = @srcdir@
|
||||
VPATH = @srcdir@
|
||||
|
|
@ -35,7 +35,7 @@
|
|||
#
|
||||
# ***** END LICENSE BLOCK *****
|
||||
|
||||
DEPTH = ../../..
|
||||
DEPTH = ../..
|
||||
topsrcdir = @top_srcdir@
|
||||
srcdir = @srcdir@
|
||||
VPATH = @srcdir@
|
||||
|
|
@ -66,7 +66,7 @@ CPPSRCS = \
|
|||
$(NULL)
|
||||
|
||||
# We need to instantiate the decoders
|
||||
LOCAL_INCLUDES += -I$(topsrcdir)/modules/libpr0n/decoders
|
||||
LOCAL_INCLUDES += -I$(topsrcdir)/image/decoders
|
||||
|
||||
# Because SVGDocumentWrapper.cpp includes "nsSVGSVGElement.h"
|
||||
LOCAL_INCLUDES += \
|
||||
Некоторые файлы не были показаны из-за слишком большого количества измененных файлов Показать больше
Загрузка…
Ссылка в новой задаче