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

Bug 338122, Crash [@ nsIMEStateManager::IsActive] when window gets removed on mousedown at button, r+sr=roc

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@197990 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
Olli.Pettay%helsinki.fi
2006-05-19 10:26:44 +00:00
parent d34771b2e5
commit fe4e09853e
14 changed files with 49 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
mozilla/layout/base/nsDocumentViewer.cpp
View File

@@ -809,13 +809,15 @@ DocumentViewerImpl::InitInternal(nsIWidget* aParentWidget,
if (aParentWidget && !mPresContext) {
// Create presentation context
if (GetIsCreatingPrintPreview())
mPresContext = new nsPresContext(nsPresContext::eContext_PrintPreview);
mPresContext =
new nsPresContext(mDocument, nsPresContext::eContext_PrintPreview);
else
if (mIsPageMode) {
//Presentation context already created in SetPageMode which is calling this method
}
else
mPresContext = new nsPresContext(nsPresContext::eContext_Galley);
mPresContext =
new nsPresContext(mDocument, nsPresContext::eContext_Galley);
NS_ENSURE_TRUE(mPresContext, NS_ERROR_OUT_OF_MEMORY);
nsresult rv = mPresContext->Init(aDeviceContext);
@@ -1934,7 +1936,7 @@ DocumentViewerImpl::Show(void)
}
NS_ASSERTION(!mPresContext, "Shouldn't have a prescontext if we have no shell!");
mPresContext = new nsPresContext(nsPresContext::eContext_Galley);
mPresContext = new nsPresContext(mDocument, nsPresContext::eContext_Galley);
NS_ENSURE_TRUE(mPresContext, NS_ERROR_OUT_OF_MEMORY);
rv = mPresContext->Init(mDeviceContext);
@@ -4292,12 +4294,16 @@ NS_IMETHODIMP DocumentViewerImpl::SetPageMode(PRBool aPageMode, nsIPrintSettings
mViewManager = nsnull;
mWindow = nsnull;
NS_ENSURE_STATE(mDocument);
if (aPageMode)
{
mPresContext = new nsPresContext(nsPresContext::eContext_PageLayout);
mPresContext =
new nsPresContext(mDocument, nsPresContext::eContext_PageLayout);
NS_ENSURE_TRUE(mPresContext, NS_ERROR_OUT_OF_MEMORY);
mPresContext->SetPaginatedScrolling(PR_TRUE);
mPresContext->SetPrintSettings(aPrintSettings);
nsresult rv = mPresContext->Init(mDeviceContext);
NS_ENSURE_SUCCESS(rv, rv);
}
InitInternal(mParentWidget, nsnull, mDeviceContext, bounds, PR_TRUE, PR_FALSE, PR_FALSE);
mViewManager->EnableRefresh(NS_VMREFRESH_NO_SYNC);