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

Bug 542263 for real! Deallocate shouldn't invalidate plugin scriptable objects because they may be resurrected. This supposedly landed in mozilla-central revision 4c6d4be91aaa but that was an empty revision, probably due to some transplant error. r=bent

Browse Source 
--HG--
extra : rebase_source : da3efd3d0e602194d8741d0623a885566e798e28
This commit is contained in:
Benjamin Smedberg 2010-02-17 13:30:27 -05:00
parent 9538d62dfb
commit a75eba7421
2 changed files with 1 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
dom/plugins/PluginScriptableObjectChild.cpp
View File

@ -86,11 +86,6 @@ PluginScriptableObjectChild::ScriptableDeallocate(NPObject* aObject)
}
ChildNPObject* object = reinterpret_cast<ChildNPObject*>(aObject);
if (!object->invalidated) {
ScriptableInvalidate(aObject);
}
NS_ASSERTION(object->invalidated, "Should have invalidated already!");
PluginScriptableObjectChild* actor = object->parent;
if (actor) {
NS_ASSERTION(actor->Type() == Proxy, "Bad type!");

9
dom/plugins/PluginScriptableObjectParent.cpp
View File

@ -128,11 +128,6 @@ PluginScriptableObjectParent::ScriptableDeallocate(NPObject* aObject)
}
ParentNPObject* object = reinterpret_cast<ParentNPObject*>(aObject);
if (!object->invalidated) {
ScriptableInvalidate(aObject);
}
NS_ASSERTION(object->invalidated, "Should have invalidated already!");
PluginScriptableObjectParent* actor = object->parent;
if (actor) {
NS_ASSERTION(actor->Type() == Proxy, "Bad type!");
@ -730,9 +725,7 @@ PluginScriptableObjectParent::DropNPObject()
instance->UnregisterNPObject(mObject);
mObject = nsnull;
if (!CallUnprotect()) {
NS_WARNING("Failed to send message!");
}
(void) CallUnprotect();
}
bool