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

Fix crash in some icky document.write() cases.. We gotta stop blocking the 

parser.  Bug 183784, r=sicking, sr=peterv, a=asa
This commit is contained in:
bzbarsky%mit.edu 2002-12-06 01:27:37 +00:00
Родитель c650e6f4c7
Коммит 0bd1bf929d
2 изменённых файлов: 30 добавлений и 16 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

19
content/html/style/src/nsCSSLoader.cpp
Просмотреть файл

@ -1111,7 +1111,7 @@ SheetLoadData::OnStreamComplete(nsIUnicharStreamLoader* aLoader,
} }
if (NS_FAILED(aStatus) || !aDataStream) { if (NS_FAILED(aStatus) || !aDataStream) {
LOG_WARN((" Load failed: status %d, data stream %p", LOG_WARN((" Load failed: status %u, data stream %p",
aStatus, aDataStream)); aStatus, aDataStream));
mLoader->SheetComplete(this, PR_FALSE); mLoader->SheetComplete(this, PR_FALSE);
return NS_OK; return NS_OK;
@ -1761,9 +1761,15 @@ CSSLoaderImpl::SheetComplete(SheetLoadData* aLoadData, PRBool aSucceeded)
} }
#ifdef DEBUG // This is a mess. If we have a document.write() that writes out
// two <link> elements pointing to the same url, we will actually
// end up blocking the same parser twice. This seems very wrong --
// if we blocked it the first time, why is more stuff getting
// written?? In any case, we only want to unblock it once.
// Otherwise we get icky things like crashes in layout... We need
// to stop blocking the parser. We really do.
PRBool seenParser = PR_FALSE; PRBool seenParser = PR_FALSE;
#endif
// Go through and deal with the whole linked list. // Go through and deal with the whole linked list.
SheetLoadData* data = aLoadData; SheetLoadData* data = aLoadData;
while (data) { while (data) {
@ -1775,11 +1781,12 @@ CSSLoaderImpl::SheetComplete(SheetLoadData* aLoadData, PRBool aSucceeded)
} }
if (data->mParserToUnblock) { if (data->mParserToUnblock) {
#ifdef DEBUG LOG(("Parser to unblock: %p", data->mParserToUnblock.get()));
NS_ASSERTION(!seenParser, "Should not have multiple parsers involved!"); if (!seenParser) {
LOG(("Unblocking parser: %p", data->mParserToUnblock.get()));
seenParser = PR_TRUE; seenParser = PR_TRUE;
#endif
data->mParserToUnblock->ContinueParsing(); data->mParserToUnblock->ContinueParsing();
}
data->mParserToUnblock = nsnull; // drop the ref, just in case data->mParserToUnblock = nsnull; // drop the ref, just in case
} }

19
layout/style/nsCSSLoader.cpp
Просмотреть файл

@ -1111,7 +1111,7 @@ SheetLoadData::OnStreamComplete(nsIUnicharStreamLoader* aLoader,
} }
if (NS_FAILED(aStatus) || !aDataStream) { if (NS_FAILED(aStatus) || !aDataStream) {
LOG_WARN((" Load failed: status %d, data stream %p", LOG_WARN((" Load failed: status %u, data stream %p",
aStatus, aDataStream)); aStatus, aDataStream));
mLoader->SheetComplete(this, PR_FALSE); mLoader->SheetComplete(this, PR_FALSE);
return NS_OK; return NS_OK;
@ -1761,9 +1761,15 @@ CSSLoaderImpl::SheetComplete(SheetLoadData* aLoadData, PRBool aSucceeded)
} }
#ifdef DEBUG // This is a mess. If we have a document.write() that writes out
// two <link> elements pointing to the same url, we will actually
// end up blocking the same parser twice. This seems very wrong --
// if we blocked it the first time, why is more stuff getting
// written?? In any case, we only want to unblock it once.
// Otherwise we get icky things like crashes in layout... We need
// to stop blocking the parser. We really do.
PRBool seenParser = PR_FALSE; PRBool seenParser = PR_FALSE;
#endif
// Go through and deal with the whole linked list. // Go through and deal with the whole linked list.
SheetLoadData* data = aLoadData; SheetLoadData* data = aLoadData;
while (data) { while (data) {
@ -1775,11 +1781,12 @@ CSSLoaderImpl::SheetComplete(SheetLoadData* aLoadData, PRBool aSucceeded)
} }
if (data->mParserToUnblock) { if (data->mParserToUnblock) {
#ifdef DEBUG LOG(("Parser to unblock: %p", data->mParserToUnblock.get()));
NS_ASSERTION(!seenParser, "Should not have multiple parsers involved!"); if (!seenParser) {
LOG(("Unblocking parser: %p", data->mParserToUnblock.get()));
seenParser = PR_TRUE; seenParser = PR_TRUE;
#endif
data->mParserToUnblock->ContinueParsing(); data->mParserToUnblock->ContinueParsing();
}
data->mParserToUnblock = nsnull; // drop the ref, just in case data->mParserToUnblock = nsnull; // drop the ref, just in case
} }