Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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.

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@54042 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
sfraser%netscape.com
1999-11-20 06:42:24 +00:00
parent 01e5cb02a3
commit 612e5331ad
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
mozilla/content/xul/document/src/nsXULDocument.cpp
View File

@@ -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)) {

4
mozilla/rdf/content/src/nsXULDocument.cpp
View File

@@ -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)) {