Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge trunk changes.

Browse Source 
git-svn-id: svn://10.0.0.236/branches/ZAP_20050610_BRANCH@195894 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
alex%croczilla.com
2006-05-03 08:22:54 +00:00
parent b333d71e96
commit a2aa337ec1
9 changed files with 819 additions and 679 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
mozilla/Makefile.in
View File

@@ -337,14 +337,16 @@ tier_99_dirs += extensions
endif
# axcontrol
ifndef LIBXUL_SDK
ifeq ($(OS_ARCH),WINNT)
ifndef MOZ_NO_ACTIVEX_SUPPORT
tier_99_dirs += \
embedding/browser/activex/src/control \
embedding/browser/activex/src/control_kicker \
$(NULL)
endif
endif
endif # MOZ_NO_ACTIVEX_SUPPORT
endif # WINNT
endif # LIBXUL_SDK
# Java Embedding Plugin
ifneq (,$(filter mac cocoa,$(MOZ_WIDGET_TOOLKIT)))
@@ -414,6 +416,8 @@ endif
endif
endif
ifndef LIBXUL_SDK
# winembed, mfcembed
ifeq ($(OS_ARCH),WINNT)
ifneq (,$(ENABLE_TESTS)$(MOZILLA_OFFICIAL))
@@ -428,6 +432,8 @@ tier_99_dirs += embedding/tests
endif
endif
endif # LIBXUL_SDK
ifeq ($(MOZ_BUILD_APP),macbrowser)
tier_99_dirs += \
embedding/config \
@@ -515,6 +521,7 @@ GARBAGE_DIRS += dist
DIST_GARBAGE = config.cache config.log config.status config-defs.h \
dependencies.beos config/autoconf.mk config/myrules.mk config/myconfig.mk \
unallmakefiles mozilla-config.h \
gfx/gfx-config.h netwerk/necko-config.h xpcom/xpcom-config.h xpcom/xpcom-private.h \
$(topsrcdir)/.mozconfig.mk $(topsrcdir)/.mozconfig.out
# Build pseudo-external modules first when export is explicitly called

4
mozilla/allmakefiles.sh
View File

@@ -464,6 +464,8 @@ netwerk/test/Makefile
netwerk/testserver/Makefile
netwerk/resources/Makefile
netwerk/locales/Makefile
netwerk/system/Makefile
netwerk/system/win32/Makefile
uriloader/exthandler/Makefile
intl/strres/public/Makefile
intl/locale/idl/Makefile
@@ -880,7 +882,9 @@ extensions/typeaheadfind/Makefile
MAKEFILES_metrics="
extensions/metrics/Makefile
extensions/metrics/public/Makefile
extensions/metrics/src/Makefile
extensions/metrics/test/Makefile
"
MAKEFILES_phoenix="

6
mozilla/client.mk
View File

@@ -313,6 +313,12 @@ MODULES_calendar := \
mozilla/storage \
mozilla/db/sqlite3 \
mozilla/calendar \
mozilla/other-licenses/branding/sunbird \
$(NULL)
LOCALES_calendar := \
$(LOCALES_toolkit) \
other-licenses/branding/sunbird \
$(NULL)
BOOTSTRAP_calendar := \

2
mozilla/config/autoconf.mk.in
View File

@@ -146,6 +146,8 @@ MOZ_PROFILELOCKING = @MOZ_PROFILELOCKING@
MOZ_FEEDS = @MOZ_FEEDS@
MOZ_PLACES = @MOZ_PLACES@
MOZ_STORAGE = @MOZ_STORAGE@
MOZ_SAFE_BROWSING = @MOZ_SAFE_BROWSING@
MOZ_URL_CLASSIFIER = @MOZ_URL_CLASSIFIER@
MOZ_MORK = @MOZ_MORK@
MOZ_MORKREADER = @MOZ_MORKREADER@
MOZ_NO_XPCOM_OBSOLETE = @MOZ_NO_XPCOM_OBSOLETE@

1398
mozilla/configure vendored
View File

File diff suppressed because it is too large Load Diff

41
mozilla/configure.in
View File

@@ -2643,7 +2643,7 @@ EOF
ac_cv_have_visibility_class_bug=yes
fi
fi
# rm -rf conftest.{c,S}
rm -rf conftest.{c,S}
])
AC_CACHE_CHECK(For x86_64 gcc visibility bug with builtins (GCC bug 20297),
@@ -2660,10 +2660,14 @@ __attribute__ ((visibility ("default"))) void Func() {
}
EOF
ac_cv_have_visibility_builtin_bug=no
if ! ${CC-cc} ${CFLAGS} ${DSO_PIC_CFLAGS} ${DSO_LDOPTS} -O2 -o conftest.so conftest.c >/dev/null 2>&1; then
if ! ${CC-cc} ${CFLAGS} ${DSO_PIC_CFLAGS} ${DSO_LDOPTS} -O2 -S -o conftest.S conftest.c ; 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
fi
rm -f conftest.{c,so}
rm -f conftest.{c,S}
])
if test "$ac_cv_have_visibility_builtin_bug" = "no" -a \
"$ac_cv_have_visibility_class_bug" = "no"; then
@@ -4345,6 +4349,7 @@ MOZ_PYTHON_VER=
MOZ_PYTHON_VER_DOTTED=
MOZ_REFLOW_PERF=
MOZ_REORDER=
MOZ_SAFE_BROWSING=
MOZ_SINGLE_PROFILE=
MOZ_STATIC_MAIL_BUILD=
MOZ_SVG=1
@@ -4352,6 +4357,7 @@ MOZ_SVG_FOREIGNOBJECT=$MOZ_ENABLE_CAIRO_GFX
MOZ_TIMELINE=
MOZ_UI_LOCALE=en-US
MOZ_UNIVERSALCHARDET=1
MOZ_URL_CLASSIFIER=
MOZ_USE_NATIVE_UCONV=
MOZ_V1_STRING_ABI=1
MOZ_VIEW_SOURCE=1
@@ -4432,7 +4438,6 @@ basic)
AC_DEFINE(MOZ_EMBEDDING_LEVEL_BASIC)
AC_DEFINE(MOZ_EMBEDDING_LEVEL_MINIMAL)
ENABLE_TESTS=
MINIMO=1
MOZ_ACTIVEX_SCRIPTING_SUPPORT=
MOZ_COMPOSER=
MOZ_ENABLE_CANVAS=
@@ -5809,6 +5814,34 @@ if test -n "$MOZ_STORAGE"; then
AC_DEFINE(MOZ_STORAGE)
fi
dnl ========================================================
dnl = Enable safe browsing (anti-phishing)
dnl ========================================================
MOZ_ARG_ENABLE_BOOL(safe-browsing,
[ --enable-safe-browsing Enable safe browsing (anti-phishing) implementation],
MOZ_SAFE_BROWSING=1,
MOZ_SAFE_BROWSING= )
if test -n "$MOZ_SAFE_BROWSING"; then
AC_DEFINE(MOZ_SAFE_BROWSING)
fi
AC_SUBST(MOZ_SAFE_BROWSING)
dnl ========================================================
dnl = Enable url-classifier
dnl ========================================================
dnl Implicitly enabled by default if building with safe-browsing
if test -n "$MOZ_SAFE_BROWSING"; then
MOZ_URL_CLASSIFIER=1
fi
MOZ_ARG_ENABLE_BOOL(url-classifier,
[ --enable-url-classifier Enable url classifier module],
MOZ_URL_CLASSIFIER=1,
MOZ_URL_CLASSIFIER= )
if test -n "$MOZ_URL_CLASSIFIER"; then
AC_DEFINE(MOZ_URL_CLASSIFIER)
fi
AC_SUBST(MOZ_URL_CLASSIFIER)
dnl ========================================================
dnl = Enable Ultrasparc specific optimizations for JS
dnl ========================================================

1
mozilla/netwerk/base/public/Makefile.in
View File

@@ -102,6 +102,7 @@ XPIDLSRCS = \
nsISyncStreamListener.idl \
nsIUnicharStreamLoader.idl \
nsIStandardURL.idl \
nsINestedURI.idl \
nsIURLParser.idl \
nsIURIChecker.idl \
nsISecurityEventSink.idl \

13
mozilla/netwerk/build/nsNetCID.h
View File

@@ -769,6 +769,19 @@
#define NS_GENERIC_CONTENT_SNIFFER \
"@mozilla.org/network/content-sniffer;1"
/******************************************************************************
* netwerk/system classes
*/
// service implementing nsINetworkLinkService
#define NS_NETWORK_LINK_SERVICE_CLASSNAME "Network Link Status"
#define NS_NETWORK_LINK_SERVICE_CID \
{ 0x75a500a2, \
0x0030, \
0x40f7, \
{ 0x86, 0xf8, 0x63, 0xf2, 0x25, 0xb9, 0x40, 0xae } \
}
/******************************************************************************
* Contracts that can be implemented by necko users.
*/

22
mozilla/netwerk/build/nsNetModule.cpp
View File

@@ -229,6 +229,7 @@ NS_GENERIC_FACTORY_CONSTRUCTOR(nsGopherHandler)
#ifdef NECKO_PROTOCOL_viewsource
#include "nsViewSourceHandler.h"
NS_GENERIC_FACTORY_CONSTRUCTOR(nsViewSourceHandler)
NS_GENERIC_FACTORY_CONSTRUCTOR(nsViewSourceURI)
#endif
#ifdef NECKO_PROTOCOL_data
@@ -261,6 +262,12 @@ NS_GENERIC_AGGREGATED_CONSTRUCTOR(nsSimpleURI)
#include "nsIDNService.h"
NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(nsIDNService, Init)
///////////////////////////////////////////////////////////////////////////////
#ifdef XP_WIN
#include "nsNotifyAddrListener.h"
NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(nsNotifyAddrListener, Init)
#endif
///////////////////////////////////////////////////////////////////////////////
#ifdef NECKO_PROTOCOL_ftp
@@ -1133,7 +1140,20 @@ static const nsModuleComponentInfo gNetModuleInfo[] = {
NS_VIEWSOURCEHANDLER_CID,
NS_NETWORK_PROTOCOL_CONTRACTID_PREFIX "view-source",
nsViewSourceHandlerConstructor
}
},
{ "The ViewSource URI",
NS_VIEWSOURCEURI_CID,
nsnull,
nsViewSourceURIConstructor
},
#endif
#ifdef XP_WIN
{ NS_NETWORK_LINK_SERVICE_CLASSNAME,
NS_NETWORK_LINK_SERVICE_CID,
NS_NETWORK_LINK_SERVICE_CONTRACTID,
nsNotifyAddrListenerConstructor
},
#endif
};