Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-26 14:22:01 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 314452

Browse Source 
- In HandleEvent, verify that the type/URI of the plugin didn't change before
  calling instantiate
- Revoke pending instantiate events when a new plugin is loading
r+sr=bz
This commit is contained in:
cbiesinger%web.de 2005-11-01 15:38:55 +00:00
parent b8b82d31f9
commit 177f4f0db6
1 changed files with 20 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -127,21 +127,28 @@ nsAsyncInstantiateEvent::HandleEvent(PLEvent* event)
event);
nsObjectLoadingContent* con = NS_STATIC_CAST(nsObjectLoadingContent*,
PL_GetEventOwner(event));
// Make sure that we still have the right frame
if (con->GetFrame() == ev->mFrame) {
// Make sure that we still have the right frame (NOTE: we don't need to check
// the type here - GetFrame() only returns object frames, and that means we're
// a plugin)
// Also make sure that we still refer to the same data.
if (con->GetFrame() == ev->mFrame &&
con->mURI == ev->mURI &&
con->mContentType.Equals(ev->mContentType)) {
if (LOG_ENABLED()) {
nsCAutoString spec;
if (ev->mURI) {
ev->mURI->GetSpec(spec);
}
LOG(("OBJLC [%p]: Handling Instantiate event: Type=<%s> URI=%p<%s>\n",
con, ev->mContentType.get(), ev->mURI, spec.get()));
con, ev->mContentType.get(), ev->mURI.get(), spec.get()));
}
nsresult rv = con->Instantiate(ev->mContentType, ev->mURI);
if (NS_FAILED(rv)) {
con->Fallback(PR_TRUE);
}
} else {
LOG(("OBJLC [%p]: Discarding event, data changed\n", con));
}
return nsnull;
}
@ -599,6 +606,16 @@ nsObjectLoadingContent::ObjectURIChanged(nsIURI* aURI,
}
}
// Need to revoke any potentially pending instantiate events
if (mType == eType_Plugin) {
nsCOMPtr<nsIEventQueue> eventQ;
NS_GetCurrentEventQ(getter_AddRefs(eventQ));
if (eventQ) {
LOG(("OBJLC [%p]: Revoking events\n", this));
eventQ->RevokeEvents(this);
}
}
AutoNotifier notifier(this, aNotify);
mUserDisabled = mSuppressed = PR_FALSE;