corysanin/tubestation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug 314453 more ObjectURIChanged occurences; these got missed in the first

Browse Source 
checkin
This commit is contained in:
cbiesinger@web.de
2006-01-01 19:06:43 +00:00
parent d719bdd4e7
commit 3bd90c4340
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
content/base/src/nsObjectLoadingContent.cpp
View File

@@ -549,7 +549,7 @@ nsObjectLoadingContent::EnsureInstantiation(nsIPluginInstance** aInstance)
eventQ->RevokeEvents(this);
}
} else {
// mInstantiating is true if we're in ObjectURIChanged; we shouldn't
// mInstantiating is true if we're in LoadObject; we shouldn't
// recreate frames in that case, we'd confuse that function.
if (mInstantiating) {
return NS_OK;
@@ -708,7 +708,7 @@ nsObjectLoadingContent::LoadObject(const nsAString& aURI,
LOG(("OBJLC [%p]: Loading object: URI string=<%s> notify=%i type=<%s> forcetype=%i forceload=%i\n",
this, NS_ConvertUTF16toUTF8(aURI).get(), aNotify, aTypeHint.get(), aForceType, aForceLoad));
NS_ASSERTION(!mInstantiating, "ObjectURIChanged was reentered?");
NS_ASSERTION(!mInstantiating, "LoadObject was reentered?");
// Avoid StringToURI in order to use the codebase attribute as base URI
nsCOMPtr<nsIContent> thisContent =
@@ -767,7 +767,7 @@ nsObjectLoadingContent::LoadObject(nsIURI* aURI,
// AutoSetInstantiatingToFalse is instantiated after AutoNotifier, so that if
// the AutoNotifier triggers frame construction, events can be posted as
// appropriate.
NS_ASSERTION(!mInstantiating, "ObjectURIChanged was reentered?");
NS_ASSERTION(!mInstantiating, "LoadObject was reentered?");
mInstantiating = PR_TRUE;
AutoSetInstantiatingToFalse autoset(this);