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

Fix for necko crash trying to load pages with images.

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@38268 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
warren%netscape.com
1999-07-03 08:56:26 +00:00
parent 67c889be32
commit 5d1d4c98c0
2 changed files with 32 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
mozilla/layout/base/nsPresContext.cpp
View File

@@ -27,7 +27,9 @@
#include "nsIRenderingContext.h"
#include "nsEventStateManager.h"
#include "nsIURL.h"
#ifndef NECKO
#ifdef NECKO
#include "nsILoadGroup.h"
#else
#include "nsIURLGroup.h"
#endif
#include "nsIDocument.h"
@@ -701,16 +703,24 @@ nsPresContext::GetImageGroup(nsIImageGroup** aResult)
return rv;
}
#ifndef NECKO
// Initialize the image group
nsCOMPtr<nsILoadGroup> LoadGroup;
rv = mBaseURL->GetLoadGroup(getter_AddRefs(LoadGroup));
nsCOMPtr<nsILoadGroup> loadGroup;
#ifdef NECKO
nsCOMPtr<nsIDocument> doc;
if (NS_SUCCEEDED(mShell->GetDocument(getter_AddRefs(doc)))) {
NS_ASSERTION(doc, "expect document here");
if (doc) {
loadGroup = doc->GetDocumentLoadGroup();
}
}
#else
rv = mBaseURL->GetLoadGroup(getter_AddRefs(loadGroup));
#endif
if (rv == NS_OK)
rv = mImageGroup->Init(mDeviceContext, LoadGroup);
rv = mImageGroup->Init(mDeviceContext, loadGroup);
if (NS_OK != rv) {
return rv;
}
#endif
}
*aResult = mImageGroup;

22
mozilla/layout/base/src/nsPresContext.cpp
View File

@@ -27,7 +27,9 @@
#include "nsIRenderingContext.h"
#include "nsEventStateManager.h"
#include "nsIURL.h"
#ifndef NECKO
#ifdef NECKO
#include "nsILoadGroup.h"
#else
#include "nsIURLGroup.h"
#endif
#include "nsIDocument.h"
@@ -701,16 +703,24 @@ nsPresContext::GetImageGroup(nsIImageGroup** aResult)
return rv;
}
#ifndef NECKO
// Initialize the image group
nsCOMPtr<nsILoadGroup> LoadGroup;
rv = mBaseURL->GetLoadGroup(getter_AddRefs(LoadGroup));
nsCOMPtr<nsILoadGroup> loadGroup;
#ifdef NECKO
nsCOMPtr<nsIDocument> doc;
if (NS_SUCCEEDED(mShell->GetDocument(getter_AddRefs(doc)))) {
NS_ASSERTION(doc, "expect document here");
if (doc) {
loadGroup = doc->GetDocumentLoadGroup();
}
}
#else
rv = mBaseURL->GetLoadGroup(getter_AddRefs(loadGroup));
#endif
if (rv == NS_OK)
rv = mImageGroup->Init(mDeviceContext, LoadGroup);
rv = mImageGroup->Init(mDeviceContext, loadGroup);
if (NS_OK != rv) {
return rv;
}
#endif
}
*aResult = mImageGroup;