mozilla
/
pjs
зеркало из https://github.com/mozilla/pjs.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

Bug 16516. Doh! Fix use of NS_RELEASE()-ed pointer that was causing load handlers to not run on brutally shared docs.

This commit is contained in:
waterson%netscape.com 1999-11-30 22:47:41 +00:00
Родитель 30516ea248
Коммит 085f9b7165
2 изменённых файлов: 42 добавлений и 16 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

29
content/xul/document/src/nsXULDocument.cpp
Просмотреть файл

@ -2026,6 +2026,10 @@ nsXULDocument::CreateFromPrototype(const char* aCommand,
if (NS_FAILED(rv)) return rv;
{
// This scope restricts the lifetime of our reference to the
// loadgroup. Specifically, we don't want to have a reference
// to the load group on the stack when we call
// ResumeWalk().
nsCOMPtr<nsILoadGroup> loadgroup;
rv = nsComponentManager::CreateInstance(kLoadGroupCID,
nsnull,
@ -2033,15 +2037,23 @@ nsXULDocument::CreateFromPrototype(const char* aCommand,
getter_AddRefs(loadgroup));
if (NS_FAILED(rv)) return rv;
CachedChromeLoader* loader = new CachedChromeLoader(this);
if (! loader)
return NS_ERROR_OUT_OF_MEMORY;
// Create our own "document loader" that will fire the onload
// handlers when everything is finished. When this scope is
// closed, the loadgroup will be the only object with a
// reference to the loader.
nsCOMPtr<nsIStreamObserver> loader;
NS_ADDREF(loader);
nsCOMPtr<nsIStreamObserver> anchor = do_QueryInterface(loader, &rv);
NS_RELEASE(loader);
{
CachedChromeLoader* l = new CachedChromeLoader(this);
if (! l)
return NS_ERROR_OUT_OF_MEMORY;
if (NS_FAILED(rv)) return rv;
NS_ADDREF(l);
loader = do_QueryInterface(l, &rv);
NS_RELEASE(l);
if (NS_FAILED(rv)) return rv;
}
rv = loadgroup->Init(loader);
if (NS_FAILED(rv)) return rv;
@ -2057,7 +2069,8 @@ nsXULDocument::CreateFromPrototype(const char* aCommand,
if (NS_FAILED(rv)) return rv;
// Closing this scope will result in the placeholder channel
// being the only reference to the load group.
// created in PrepareToWalk() being the only reference to the
// load group.
}
rv = ResumeWalk();

29
rdf/content/src/nsXULDocument.cpp
Просмотреть файл

@ -2026,6 +2026,10 @@ nsXULDocument::CreateFromPrototype(const char* aCommand,
if (NS_FAILED(rv)) return rv;
{
// This scope restricts the lifetime of our reference to the
// loadgroup. Specifically, we don't want to have a reference
// to the load group on the stack when we call
// ResumeWalk().
nsCOMPtr<nsILoadGroup> loadgroup;
rv = nsComponentManager::CreateInstance(kLoadGroupCID,
nsnull,
@ -2033,15 +2037,23 @@ nsXULDocument::CreateFromPrototype(const char* aCommand,
getter_AddRefs(loadgroup));
if (NS_FAILED(rv)) return rv;
CachedChromeLoader* loader = new CachedChromeLoader(this);
if (! loader)
return NS_ERROR_OUT_OF_MEMORY;
// Create our own "document loader" that will fire the onload
// handlers when everything is finished. When this scope is
// closed, the loadgroup will be the only object with a
// reference to the loader.
nsCOMPtr<nsIStreamObserver> loader;
NS_ADDREF(loader);
nsCOMPtr<nsIStreamObserver> anchor = do_QueryInterface(loader, &rv);
NS_RELEASE(loader);
{
CachedChromeLoader* l = new CachedChromeLoader(this);
if (! l)
return NS_ERROR_OUT_OF_MEMORY;
if (NS_FAILED(rv)) return rv;
NS_ADDREF(l);
loader = do_QueryInterface(l, &rv);
NS_RELEASE(l);
if (NS_FAILED(rv)) return rv;
}
rv = loadgroup->Init(loader);
if (NS_FAILED(rv)) return rv;
@ -2057,7 +2069,8 @@ nsXULDocument::CreateFromPrototype(const char* aCommand,
if (NS_FAILED(rv)) return rv;
// Closing this scope will result in the placeholder channel
// being the only reference to the load group.
// created in PrepareToWalk() being the only reference to the
// load group.
}
rv = ResumeWalk();