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

Don't try to enable global history if we were told not to. Bug 334846,

Browse Source 
r=bsmedberg, sr=darin


git-svn-id: svn://10.0.0.236/trunk@195754 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
bzbarsky%mit.edu 2006-05-01 03:47:12 +00:00
parent bc40f32cfe
commit 5de35807e9
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
mozilla/embedding/browser/webBrowser/nsWebBrowser.cpp
View File

@ -107,6 +107,7 @@ nsWebBrowser::nsWebBrowser() : mDocShellTreeOwner(nsnull),
mInitInfo(nsnull),
mContentType(typeContentWrapper),
mActivating(PR_FALSE),
mShouldEnableHistory(PR_TRUE),
mParentNativeWindow(nsnull),
mProgressListener(nsnull),
mBackgroundColor(0),
@ -789,6 +790,7 @@ NS_IMETHODIMP nsWebBrowser::SetProperty(PRUint32 aId, PRUint32 aValue)
NS_ENSURE_STATE(mDocShell);
NS_ENSURE_TRUE((aValue == PR_TRUE || aValue == PR_FALSE), NS_ERROR_INVALID_ARG);
rv = EnableGlobalHistory(aValue);
mShouldEnableHistory = aValue;
}
break;
case nsIWebBrowserSetup::SETUP_FOCUS_DOC_BEFORE_CONTENT:
@ -1215,9 +1217,9 @@ NS_IMETHODIMP nsWebBrowser::Create()
NS_ENSURE_TRUE(mInitInfo->sessionHistory, NS_ERROR_FAILURE);
mDocShellAsNav->SetSessionHistory(mInitInfo->sessionHistory);
// Hook up global history. Do not fail if we can't - just assert.
nsresult rv = EnableGlobalHistory(PR_TRUE);
NS_ASSERTION(NS_SUCCEEDED(rv), "EnableGlobalHistory() failed");
// Hook up global history. Do not fail if we can't - just warn.
nsresult rv = EnableGlobalHistory(mShouldEnableHistory);
NS_WARN_IF_FALSE(NS_SUCCEEDED(rv), "EnableGlobalHistory() failed");
NS_ENSURE_SUCCESS(mDocShellAsWin->Create(), NS_ERROR_FAILURE);

3
mozilla/embedding/browser/webBrowser/nsWebBrowser.h
View File

@ -164,7 +164,8 @@ protected:
nsCOMPtr<nsIWindowWatcher> mWWatch;
nsWebBrowserInitInfo* mInitInfo;
PRUint32 mContentType;
PRBool mActivating;
PRPackedBool mActivating;
PRPackedBool mShouldEnableHistory;
nativeWindow mParentNativeWindow;
nsIWebProgressListener *mProgressListener;
nsCOMPtr<nsIWebProgress> mWebProgress;