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

Workaround for bug 19421 -- no menus on mac. This is a problem with brutal sharing of overlays that waterson needs to fix. For now, turn off brutal sharing of scripts. r=brendan, saari.

This commit is contained in:
sfraser%netscape.com 1999-11-20 06:42:24 +00:00
Родитель 18e16961d7
Коммит 78aa804bcf
2 изменённых файлов: 4 добавлений и 4 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

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

@ -4588,7 +4588,7 @@ nsXULDocument::LoadScript(nsXULPrototypeScript* aScriptProto, PRBool* aBlock)
NS_ASSERTION(!mCurrentScriptProto, "still loading a script when starting another load?"); NS_ASSERTION(!mCurrentScriptProto, "still loading a script when starting another load?");
mCurrentScriptProto = aScriptProto; mCurrentScriptProto = aScriptProto;
if (aScriptProto->mSrcLoading) { if (0 && aScriptProto->mSrcLoading) {
// Another XULDocument load has started, which is still in progress. // Another XULDocument load has started, which is still in progress.
// Remember to ResumeWalk this document when the load completes. // Remember to ResumeWalk this document when the load completes.
mNextSrcLoadWaiter = aScriptProto->mSrcLoadWaiters; mNextSrcLoadWaiter = aScriptProto->mSrcLoadWaiters;
@ -4624,7 +4624,7 @@ nsXULDocument::OnUnicharStreamComplete(nsIUnicharStreamLoader* aLoader,
// from the prototype. // from the prototype.
nsresult rv; nsresult rv;
NS_ASSERTION(mCurrentScriptProto && mCurrentScriptProto->mSrcLoading, NS_ASSERTION(mCurrentScriptProto /* && mCurrentScriptProto->mSrcLoading */,
"script source not loading on unichar stream complete?"); "script source not loading on unichar stream complete?");
if (NS_SUCCEEDED(aStatus)) { if (NS_SUCCEEDED(aStatus)) {

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

@ -4588,7 +4588,7 @@ nsXULDocument::LoadScript(nsXULPrototypeScript* aScriptProto, PRBool* aBlock)
NS_ASSERTION(!mCurrentScriptProto, "still loading a script when starting another load?"); NS_ASSERTION(!mCurrentScriptProto, "still loading a script when starting another load?");
mCurrentScriptProto = aScriptProto; mCurrentScriptProto = aScriptProto;
if (aScriptProto->mSrcLoading) { if (0 && aScriptProto->mSrcLoading) {
// Another XULDocument load has started, which is still in progress. // Another XULDocument load has started, which is still in progress.
// Remember to ResumeWalk this document when the load completes. // Remember to ResumeWalk this document when the load completes.
mNextSrcLoadWaiter = aScriptProto->mSrcLoadWaiters; mNextSrcLoadWaiter = aScriptProto->mSrcLoadWaiters;
@ -4624,7 +4624,7 @@ nsXULDocument::OnUnicharStreamComplete(nsIUnicharStreamLoader* aLoader,
// from the prototype. // from the prototype.
nsresult rv; nsresult rv;
NS_ASSERTION(mCurrentScriptProto && mCurrentScriptProto->mSrcLoading, NS_ASSERTION(mCurrentScriptProto /* && mCurrentScriptProto->mSrcLoading */,
"script source not loading on unichar stream complete?"); "script source not loading on unichar stream complete?");
if (NS_SUCCEEDED(aStatus)) { if (NS_SUCCEEDED(aStatus)) {