From 612e5331ad80495698128ef8a6da6a5fe876e0a0 Mon Sep 17 00:00:00 2001 From: "sfraser%netscape.com" Date: Sat, 20 Nov 1999 06:42:24 +0000 Subject: [PATCH] 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. git-svn-id: svn://10.0.0.236/trunk@54042 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/content/xul/document/src/nsXULDocument.cpp | 4 ++-- mozilla/rdf/content/src/nsXULDocument.cpp | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/mozilla/content/xul/document/src/nsXULDocument.cpp b/mozilla/content/xul/document/src/nsXULDocument.cpp index 4b624597011..6b345b04e5b 100644 --- a/mozilla/content/xul/document/src/nsXULDocument.cpp +++ b/mozilla/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?"); mCurrentScriptProto = aScriptProto; - if (aScriptProto->mSrcLoading) { + if (0 && aScriptProto->mSrcLoading) { // Another XULDocument load has started, which is still in progress. // Remember to ResumeWalk this document when the load completes. mNextSrcLoadWaiter = aScriptProto->mSrcLoadWaiters; @@ -4624,7 +4624,7 @@ nsXULDocument::OnUnicharStreamComplete(nsIUnicharStreamLoader* aLoader, // from the prototype. nsresult rv; - NS_ASSERTION(mCurrentScriptProto && mCurrentScriptProto->mSrcLoading, + NS_ASSERTION(mCurrentScriptProto /* && mCurrentScriptProto->mSrcLoading */, "script source not loading on unichar stream complete?"); if (NS_SUCCEEDED(aStatus)) { diff --git a/mozilla/rdf/content/src/nsXULDocument.cpp b/mozilla/rdf/content/src/nsXULDocument.cpp index 4b624597011..6b345b04e5b 100644 --- a/mozilla/rdf/content/src/nsXULDocument.cpp +++ b/mozilla/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?"); mCurrentScriptProto = aScriptProto; - if (aScriptProto->mSrcLoading) { + if (0 && aScriptProto->mSrcLoading) { // Another XULDocument load has started, which is still in progress. // Remember to ResumeWalk this document when the load completes. mNextSrcLoadWaiter = aScriptProto->mSrcLoadWaiters; @@ -4624,7 +4624,7 @@ nsXULDocument::OnUnicharStreamComplete(nsIUnicharStreamLoader* aLoader, // from the prototype. nsresult rv; - NS_ASSERTION(mCurrentScriptProto && mCurrentScriptProto->mSrcLoading, + NS_ASSERTION(mCurrentScriptProto /* && mCurrentScriptProto->mSrcLoading */, "script source not loading on unichar stream complete?"); if (NS_SUCCEEDED(aStatus)) {