diff --git a/browser/app/Makefile.in b/browser/app/Makefile.in index 73fbef17886..5f44c9d43ef 100644 --- a/browser/app/Makefile.in +++ b/browser/app/Makefile.in @@ -205,13 +205,6 @@ libs:: $(INSTALL) $(IFLAGS1) $(DIST)/branding/default48.png $(DIST)/bin/chrome/icons/default endif -ifdef MOZ_SPLASHSCREEN -ifeq ($(MOZ_WIDGET_TOOLKIT),windows) -libs:: - $(INSTALL) $(IFLAGS1) $(DIST)/branding/splash.bmp $(DIST)/bin -endif -endif - libs:: $(srcdir)/profile/prefs.js $(INSTALL) $(IFLAGS1) $^ $(DIST)/bin/defaults/profile diff --git a/browser/branding/aurora/Makefile.in b/browser/branding/aurora/Makefile.in index bab3f7d80c0..8b179e94610 100644 --- a/browser/branding/aurora/Makefile.in +++ b/browser/branding/aurora/Makefile.in @@ -60,10 +60,6 @@ WINDOWS_BRANDING_FILES = \ wizWatermark.bmp \ $(NULL) -ifdef MOZ_SPLASHSCREEN -WINDOWS_BRANDING_FILES += splash.bmp -endif - OSX_BRANDING_FILES = \ background.png \ firefox.icns \ diff --git a/browser/branding/aurora/splash.bmp b/browser/branding/aurora/splash.bmp deleted file mode 100644 index 2ba119890cd..00000000000 Binary files a/browser/branding/aurora/splash.bmp and /dev/null differ diff --git a/browser/branding/nightly/Makefile.in b/browser/branding/nightly/Makefile.in index bab3f7d80c0..8b179e94610 100644 --- a/browser/branding/nightly/Makefile.in +++ b/browser/branding/nightly/Makefile.in @@ -60,10 +60,6 @@ WINDOWS_BRANDING_FILES = \ wizWatermark.bmp \ $(NULL) -ifdef MOZ_SPLASHSCREEN -WINDOWS_BRANDING_FILES += splash.bmp -endif - OSX_BRANDING_FILES = \ background.png \ firefox.icns \ diff --git a/browser/branding/nightly/splash.bmp b/browser/branding/nightly/splash.bmp deleted file mode 100644 index 2ba119890cd..00000000000 Binary files a/browser/branding/nightly/splash.bmp and /dev/null differ diff --git a/browser/branding/official/Makefile.in b/browser/branding/official/Makefile.in index bab3f7d80c0..8b179e94610 100644 --- a/browser/branding/official/Makefile.in +++ b/browser/branding/official/Makefile.in @@ -60,10 +60,6 @@ WINDOWS_BRANDING_FILES = \ wizWatermark.bmp \ $(NULL) -ifdef MOZ_SPLASHSCREEN -WINDOWS_BRANDING_FILES += splash.bmp -endif - OSX_BRANDING_FILES = \ background.png \ firefox.icns \ diff --git a/browser/branding/official/splash.bmp b/browser/branding/official/splash.bmp deleted file mode 100644 index a2b5e8b0867..00000000000 Binary files a/browser/branding/official/splash.bmp and /dev/null differ diff --git a/browser/branding/unofficial/Makefile.in b/browser/branding/unofficial/Makefile.in index bab3f7d80c0..8b179e94610 100644 --- a/browser/branding/unofficial/Makefile.in +++ b/browser/branding/unofficial/Makefile.in @@ -60,10 +60,6 @@ WINDOWS_BRANDING_FILES = \ wizWatermark.bmp \ $(NULL) -ifdef MOZ_SPLASHSCREEN -WINDOWS_BRANDING_FILES += splash.bmp -endif - OSX_BRANDING_FILES = \ background.png \ firefox.icns \ diff --git a/browser/branding/unofficial/splash.bmp b/browser/branding/unofficial/splash.bmp deleted file mode 100644 index d2afefdf82e..00000000000 Binary files a/browser/branding/unofficial/splash.bmp and /dev/null differ diff --git a/browser/installer/package-manifest.in b/browser/installer/package-manifest.in index 335d61e9b36..7b1aef415f4 100644 --- a/browser/installer/package-manifest.in +++ b/browser/installer/package-manifest.in @@ -108,9 +108,6 @@ @BINPATH@/mozilla-xremote-client #endif #endif -#ifdef MOZ_SPLASHSCREEN -@BINPATH@/splash.bmp -#endif ; [Components] @BINPATH@/components/components.manifest diff --git a/config/autoconf.mk.in b/config/autoconf.mk.in index 890242d5f35..f0c2ca56de3 100644 --- a/config/autoconf.mk.in +++ b/config/autoconf.mk.in @@ -676,8 +676,6 @@ HAVE_ARM_SIMD = @HAVE_ARM_SIMD@ HAVE_ARM_NEON = @HAVE_ARM_NEON@ HAVE_GCC_ALIGN_ARG_POINTER = @HAVE_GCC_ALIGN_ARG_POINTER@ -MOZ_SPLASHSCREEN = @MOZ_SPLASHSCREEN@ - MOZ_THEME_FASTSTRIPE = @MOZ_THEME_FASTSTRIPE@ MOZ_SERVICES_SYNC = @MOZ_SERVICES_SYNC@ diff --git a/configure.in b/configure.in index 8929178f1c0..cb830bd0b7c 100644 --- a/configure.in +++ b/configure.in @@ -4854,7 +4854,6 @@ MOZ_REFLOW_PERF= MOZ_SAFE_BROWSING= MOZ_HELP_VIEWER= MOZ_SPELLCHECK=1 -MOZ_SPLASHSCREEN= MOZ_STORAGE=1 MOZ_SVG_DLISTS= MOZ_TOOLKIT_SEARCH=1 @@ -6048,18 +6047,6 @@ linux*) esac fi -dnl ======================================================== -dnl Splashscreen -dnl ======================================================== -AC_ARG_ENABLE(splashscreen, - [ --enable-splashscreen display splashscreen while loading (default=no)], - [enable_splash="yes"],[enable_splash=""]) -if test "x$enable_splash" = "xyes"; then - MOZ_SPLASHSCREEN=1 - AC_DEFINE(MOZ_SPLASHSCREEN) -fi -AC_SUBST(MOZ_SPLASHSCREEN) - dnl ======================================================== dnl Permissions System dnl ======================================================== diff --git a/mobile/app/Makefile.in b/mobile/app/Makefile.in index 37791f998f6..50c1758ddde 100644 --- a/mobile/app/Makefile.in +++ b/mobile/app/Makefile.in @@ -90,7 +90,6 @@ else APP_BUILDID = $(MOZ_BUILD_DATE) endif APP_ICON = mobile -APP_SPLASH = splash DEFINES += -DGRE_MILESTONE=$(GRE_MILESTONE) \ -DGRE_BUILDID=$(GRE_BUILDID) \ @@ -183,7 +182,6 @@ endif # SKIP_COPY_XULRUNNER ifeq ($(OS_ARCH),WINNT) cp $(srcdir)/$(APP_ICON).ico $(DIST)/bin/chrome/icons/default/$(APP_ICON).ico - cp $(srcdir)/$(APP_SPLASH).bmp $(DIST)/bin/$(APP_SPLASH).bmp $(REDIT_PATH)/redit$(HOST_BIN_SUFFIX) $(DIST)/bin/$(APP_BINARY) $(srcdir)/$(APP_ICON).ico endif diff --git a/mobile/app/splash.bmp b/mobile/app/splash.bmp deleted file mode 100644 index c616b6599c1..00000000000 Binary files a/mobile/app/splash.bmp and /dev/null differ diff --git a/mobile/installer/package-manifest.in b/mobile/installer/package-manifest.in index 747b3c61da7..b4410ccd1f1 100644 --- a/mobile/installer/package-manifest.in +++ b/mobile/installer/package-manifest.in @@ -110,9 +110,6 @@ @BINPATH@/mozilla-xremote-client #endif #endif -#ifdef MOZ_SPLASHSCREEN -@BINPATH@/splash.bmp -#endif ; [Components] @BINPATH@/components/components.manifest diff --git a/toolkit/xre/Makefile.in b/toolkit/xre/Makefile.in index fa037012cef..0082e448eb4 100644 --- a/toolkit/xre/Makefile.in +++ b/toolkit/xre/Makefile.in @@ -77,10 +77,6 @@ ifdef MOZ_INSTRUMENT_EVENT_LOOP CPPSRCS += EventTracer.cpp endif -ifdef MOZ_SPLASHSCREEN -CPPSRCS += nsSplashScreenDummy.cpp -endif - DEFINES += -DIMPL_XREAPI -DMOZ_APP_NAME='"$(MOZ_APP_NAME)"' ifdef MOZ_UPDATER diff --git a/toolkit/xre/nsAppRunner.cpp b/toolkit/xre/nsAppRunner.cpp index 4a7f9306949..e6f791bd335 100644 --- a/toolkit/xre/nsAppRunner.cpp +++ b/toolkit/xre/nsAppRunner.cpp @@ -155,10 +155,6 @@ #include -#if defined(MOZ_SPLASHSCREEN) -#include "nsSplashScreen.h" -#endif - #ifdef XP_UNIX #include #include @@ -2538,12 +2534,6 @@ static void MOZ_gdk_display_close(GdkDisplay *display) */ NS_VISIBILITY_DEFAULT PRBool nspr_use_zone_allocator = PR_FALSE; -#ifdef MOZ_SPLASHSCREEN -#define MOZ_SPLASHSCREEN_UPDATE(_i) do { if (splashScreen) splashScreen->Update(_i); } while(0) -#else -#define MOZ_SPLASHSCREEN_UPDATE(_i) do { } while(0) -#endif - #ifdef CAIRO_HAS_DWRITE_FONT #include @@ -2621,10 +2611,6 @@ XRE_main(int argc, char* argv[], const nsXREAppData* aAppData) gXRE_mainTimestamp = PR_Now(); -#ifdef MOZ_SPLASHSCREEN - nsSplashScreen *splashScreen = nsnull; -#endif - nsresult rv; ArgResult ar; @@ -2748,21 +2734,6 @@ XRE_main(int argc, char* argv[], const nsXREAppData* aAppData) return 1; } -#ifdef MOZ_SPLASHSCREEN - // check to see if we need to do a splash screen - PRBool wantsSplash = PR_TRUE; - PRBool isNoSplash = (CheckArg("nosplash", PR_FALSE, NULL, PR_FALSE) == ARG_FOUND); - isNoSplash |= (PR_GetEnv("NO_SPLASH") != 0); - PRBool isNoRemote = (CheckArg("no-remote", PR_FALSE, NULL, PR_FALSE) == ARG_FOUND); - - if (wantsSplash && !isNoSplash) - splashScreen = nsSplashScreen::GetOrCreate(); - - if (splashScreen) - splashScreen->Open(); -#endif //MOZ_SPLASHSCREEN - - ScopedLogging log; if (!appData.xreDirectory) { @@ -2976,8 +2947,6 @@ XRE_main(int argc, char* argv[], const nsXREAppData* aAppData) gArgc = argc = NS_TraceMallocStartupArgs(gArgc, gArgv); #endif - MOZ_SPLASHSCREEN_UPDATE(20); - rv = XRE_InitCommandLine(gArgc, gArgv); NS_ENSURE_SUCCESS(rv, 1); @@ -3320,8 +3289,6 @@ XRE_main(int argc, char* argv[], const nsXREAppData* aAppData) PRBool appInitiatedRestart = PR_FALSE; - MOZ_SPLASHSCREEN_UPDATE(30); - NS_TIME_FUNCTION_MARK("Next: ScopedXPCOMStartup"); NS_TIME_FUNCTION_MARK("ScopedXPCOMStartup"); @@ -3497,8 +3464,6 @@ XRE_main(int argc, char* argv[], const nsXREAppData* aAppData) rv = appStartup->CreateHiddenWindow(); NS_ENSURE_SUCCESS(rv, 1); - MOZ_SPLASHSCREEN_UPDATE(50); - #if defined(HAVE_DESKTOP_STARTUP_ID) && defined(MOZ_WIDGET_GTK2) nsRefPtr toolkit = GetGTKToolkit(); if (toolkit && !desktopStartupID.IsEmpty()) { @@ -3526,8 +3491,6 @@ XRE_main(int argc, char* argv[], const nsXREAppData* aAppData) NS_ENSURE_SUCCESS(rv, 1); #endif - MOZ_SPLASHSCREEN_UPDATE(70); - nsCOMPtr obsService = mozilla::services::GetObserverService(); if (obsService) @@ -3572,7 +3535,6 @@ XRE_main(int argc, char* argv[], const nsXREAppData* aAppData) NS_TIME_FUNCTION_MARK("appStartup->Run"); - MOZ_SPLASHSCREEN_UPDATE(90); { rv = appStartup->Run(); if (NS_FAILED(rv)) { @@ -3612,8 +3574,6 @@ XRE_main(int argc, char* argv[], const nsXREAppData* aAppData) // Restart the app after XPCOM has been shut down cleanly. if (appInitiatedRestart) { - MOZ_SPLASHSCREEN_UPDATE(90); - RestoreStateForAppInitiatedRestart(); // Ensure that these environment variables are set: diff --git a/toolkit/xre/nsSplashScreen.h b/toolkit/xre/nsSplashScreen.h deleted file mode 100644 index f430546dbb9..00000000000 --- a/toolkit/xre/nsSplashScreen.h +++ /dev/null @@ -1,77 +0,0 @@ -/* -*- Mode: C++; tab-width: 40; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* ***** BEGIN LICENSE BLOCK ***** - * Version: MPL 1.1/GPL 2.0/LGPL 2.1 - * - * The contents of this file are subject to the Mozilla Public License Version - * 1.1 (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * http://www.mozilla.org/MPL/ - * - * Software distributed under the License is distributed on an "AS IS" basis, - * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License - * for the specific language governing rights and limitations under the - * License. - * - * The Original Code is Mozilla code. - * - * The Initial Developer of the Original Code is - * mozilla.org - * Portions created by the Initial Developer are Copyright (C) 2009 - * the Initial Developer. All Rights Reserved. - * - * Contributor(s): - * Vladimir Vukicevic - * - * Alternatively, the contents of this file may be used under the terms of - * either the GNU General Public License Version 2 or later (the "GPL"), or - * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), - * in which case the provisions of the GPL or the LGPL are applicable instead - * of those above. If you wish to allow use of your version of this file only - * under the terms of either the GPL or the LGPL, and not to allow others to - * use your version of this file under the terms of the MPL, indicate your - * decision by deleting the provisions above and replace them with the notice - * and other provisions required by the GPL or the LGPL. If you do not delete - * the provisions above, a recipient may use your version of this file under - * the terms of any one of the MPL, the GPL or the LGPL. - * - * ***** END LICENSE BLOCK ***** */ - -#ifndef NS_SPLASHSCREEN_H_ -#define NS_SPLASHSCREEN_H_ - -#include "prtypes.h" - -/* Note: This is not XPCOM! This class is used before any Gecko/XPCOM - * support has been initialized, so any implementations should take care - * to use platform-native methods as much as possible. - */ - -class nsSplashScreen { -public: - // An implementation needs to provide these, to either get - // an existing splash screen, or create a new one if GetOrCreate is - // used. - static nsSplashScreen* GetOrCreate(); - static nsSplashScreen* Get(); -public: - // Display the splash screen if it's not already displayed. - // Also resets progress to 0 and the message to empty. - virtual void Open() = 0; - virtual void Close() = 0; - - /* Update the splash screen to the given progress value (0..100) */ - virtual void Update(PRInt32 progress) = 0; - - PRBool IsOpen() { return mIsOpen; } - -protected: - nsSplashScreen() : mIsOpen(PR_FALSE) { } - PRBool mIsOpen; -}; - -extern "C" { - nsSplashScreen *NS_GetSplashScreen(PRBool create); - typedef nsSplashScreen* (*NS_GetSplashScreenPtr) (PRBool); -} - -#endif /* NS_SPLASHSCREEN_H_ */ diff --git a/toolkit/xre/nsSplashScreenDummy.cpp b/toolkit/xre/nsSplashScreenDummy.cpp deleted file mode 100644 index 3709883b5ee..00000000000 --- a/toolkit/xre/nsSplashScreenDummy.cpp +++ /dev/null @@ -1,51 +0,0 @@ -/* -*- Mode: C++; tab-width: 40; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* ***** BEGIN LICENSE BLOCK ***** - * Version: MPL 1.1/GPL 2.0/LGPL 2.1 - * - * The contents of this file are subject to the Mozilla Public License Version - * 1.1 (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * http://www.mozilla.org/MPL/ - * - * Software distributed under the License is distributed on an "AS IS" basis, - * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License - * for the specific language governing rights and limitations under the - * License. - * - * The Original Code is Mozilla code. - * - * The Initial Developer of the Original Code is - * mozilla.org - * Portions created by the Initial Developer are Copyright (C) 2009 - * the Initial Developer. All Rights Reserved. - * - * Contributor(s): - * Vladimir Vukicevic - * - * Alternatively, the contents of this file may be used under the terms of - * either the GNU General Public License Version 2 or later (the "GPL"), or - * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), - * in which case the provisions of the GPL or the LGPL are applicable instead - * of those above. If you wish to allow use of your version of this file only - * under the terms of either the GPL or the LGPL, and not to allow others to - * use your version of this file under the terms of the MPL, indicate your - * decision by deleting the provisions above and replace them with the notice - * and other provisions required by the GPL or the LGPL. If you do not delete - * the provisions above, a recipient may use your version of this file under - * the terms of any one of the MPL, the GPL or the LGPL. - * - * ***** END LICENSE BLOCK ***** */ - -#include "nsSplashScreen.h" - -nsSplashScreen* -nsSplashScreen::Get() -{ - return NULL; -} - -nsSplashScreen* -nsSplashScreen::GetOrCreate() -{ - return NULL; -} diff --git a/widget/src/windows/nsWindow.cpp b/widget/src/windows/nsWindow.cpp index 4efe2ca0d62..8a4086ef258 100644 --- a/widget/src/windows/nsWindow.cpp +++ b/widget/src/windows/nsWindow.cpp @@ -194,10 +194,6 @@ #include "nsTextStore.h" #endif // defined(NS_ENABLE_TSF) -#if defined(MOZ_SPLASHSCREEN) -#include "nsSplashScreen.h" -#endif // defined(MOZ_SPLASHSCREEN) - // Windowless plugin support #include "npapi.h" @@ -1123,19 +1119,6 @@ nsWindow::EnumAllWindows(WindowEnumCallback aCallback) NS_METHOD nsWindow::Show(PRBool bState) { -#if defined(MOZ_SPLASHSCREEN) - // we're about to show the first toplevel window, - // so kill off any splash screen if we had one - nsSplashScreen *splash = nsSplashScreen::Get(); - if (splash && splash->IsOpen() && mWnd && bState && - (mWindowType == eWindowType_toplevel || - mWindowType == eWindowType_dialog || - mWindowType == eWindowType_popup)) - { - splash->Close(); - } -#endif - if (mWindowType == eWindowType_popup) { // See bug 603793. When we try to draw D3D9/10 windows with a drop shadow // without the DWM on a secondary monitor, windows fails to composite