mirror of
https://github.com/mozilla/gecko-dev.git
synced 2024-10-13 21:35:39 +00:00
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:
parent
79ddaa641e
commit
5065e2a283
@ -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)) {
|
||||
|
@ -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)) {
|
||||
|
Loading…
Reference in New Issue
Block a user