Don't forget to remove the observer when dtor is running (fixes a sometimes crash in viewer); also fixed a memory leak of a style context

This commit is contained in:
kipp%netscape.com 1999-10-07 00:30:20 +00:00
parent 4b19ca3266
commit 7eec6a495e

View File

@ -204,6 +204,13 @@ nsGfxTextControlFrame::~nsGfxTextControlFrame()
nsresult result;
if (mTempObserver)
{
if (mWebShell) {
nsCOMPtr<nsIDocumentLoader> docLoader;
mWebShell->GetDocumentLoader(*getter_AddRefs(docLoader));
if (docLoader) {
docLoader->RemoveObserver(mTempObserver);
}
}
mTempObserver->SetFrame(nsnull);
NS_RELEASE(mTempObserver);
}
@ -1414,10 +1421,10 @@ nsGfxTextControlFrame::InitializeTextControl(nsIPresShell *aPresShell, nsIDOMDoc
* The above code for setting presContext data should happen on a presContext that
* I create and pass into the webshell, rather than having the webshell create its own
*/
nsIStyleContext* sc = nsnull;
result = frame->GetStyleContext(&sc);
nsCOMPtr<nsIStyleContext> sc;
result = frame->GetStyleContext(getter_AddRefs(sc));
if (NS_FAILED(result)) { return result; }
if (nsnull==sc) { return NS_ERROR_NULL_POINTER; }
if (sc) { return NS_ERROR_NULL_POINTER; }
sc->RemapStyle(presContext);
// end HACK