зеркало из https://github.com/mozilla/pjs.git
stop the crash that causes #40306. the "first time start page" causes us
many problem on linux, not sure if it is related to that page, or the redirect. still investigating. other changes here remove the crap code that forces you to go to the checkin guidelines page and to see the account manager on start up on debug builds. this was preventing debug builds from seeing the problem. after this change debug behaves like optimized, which is what we want. r=mscott, a=granrose
This commit is contained in:
Родитель
51a773754f
Коммит
a4f6b90b20
|
@ -3244,6 +3244,9 @@ NS_IMETHODIMP nsDocShell::GetRootScrollableView(nsIScrollableView** aOutScrollVi
|
|||
NS_ENSURE_SUCCESS(viewManager->GetRootScrollableView(aOutScrollView),
|
||||
NS_ERROR_FAILURE);
|
||||
|
||||
NS_ASSERTION(*aOutScrollView, "no scroll view");
|
||||
if (!*aOutScrollView) return NS_ERROR_FAILURE;
|
||||
|
||||
return NS_OK;
|
||||
}
|
||||
|
||||
|
|
|
@ -613,16 +613,6 @@ nsProfile::ProcessArgs(nsICmdLineService *cmdLineArgs,
|
|||
}
|
||||
}
|
||||
|
||||
/* hack so we don't do this for tinderbox. otherwise the tree goes orange */
|
||||
#if !defined(DEBUG_cltbld) && !defined(MOZ_BYPASS_PROFILE_AT_STARTUP) && !defined(DEBUG_pavlov)
|
||||
#ifdef DEBUG
|
||||
if (profileURLStr.Length() == 0) {
|
||||
printf("DEBUG BUILDS ONLY: we are forcing you to use the profile manager to help smoke test it.\n");
|
||||
profileURLStr = PROFILE_MANAGER_URL;
|
||||
}
|
||||
#endif /* DEBUG */
|
||||
#endif /* !DEBUG_cltbld && !MOZ_BYPASS_PROFILE_AT_STARTUP */
|
||||
|
||||
#ifdef DEBUG_profile
|
||||
printf("Profile Manager : Command Line Options : End\n");
|
||||
#endif
|
||||
|
|
|
@ -125,13 +125,6 @@ static NS_DEFINE_CID(kDocumentCharsetInfoCID, NS_DOCUMENTCHARSETINFO_CID);
|
|||
static NS_DEFINE_CID(kCharsetConverterManagerCID, NS_ICHARSETCONVERTERMANAGER_CID);
|
||||
|
||||
|
||||
#ifdef DEBUG
|
||||
#ifndef DEBUG_pavlov
|
||||
#define FORCE_CHECKIN_GUIDELINES
|
||||
#endif /* DEBUG_pavlov */
|
||||
#endif /* DEBUG */
|
||||
|
||||
|
||||
// Stuff to implement find/findnext
|
||||
#include "nsIFindComponent.h"
|
||||
#ifdef DEBUG_warren
|
||||
|
@ -2004,11 +1997,6 @@ NS_IMETHODIMP nsBrowserContentHandler::GetDefaultArgs(PRUnichar **aDefaultArgs)
|
|||
|
||||
nsString args;
|
||||
|
||||
#ifdef FORCE_CHECKIN_GUIDELINES
|
||||
printf("FOR DEBUG BUILDS ONLY: we are forcing you to see the checkin guidelines when you open a browser window\n");
|
||||
args.AssignWithConversion("http://www.mozilla.org/quality/checkin-guidelines.html");
|
||||
#else
|
||||
|
||||
nsresult rv;
|
||||
nsXPIDLCString url;
|
||||
static PRBool timebombChecked = PR_FALSE;
|
||||
|
@ -2081,7 +2069,6 @@ NS_IMETHODIMP nsBrowserContentHandler::GetDefaultArgs(PRUnichar **aDefaultArgs)
|
|||
if (NS_SUCCEEDED(rv) && (const char *)url && (PL_strlen((const char *)url))) {
|
||||
args.AssignWithConversion((const char *) url);
|
||||
}
|
||||
#endif /* FORCE_CHECKIN_GUIDELINES */
|
||||
|
||||
*aDefaultArgs = args.ToNewUnicode();
|
||||
return NS_OK;
|
||||
|
|
Загрузка…
Ссылка в новой задаче