summaryrefslogtreecommitdiffstats
path: root/dom
diff options
context:
space:
mode:
authorMoonchild <moonchild@palemoon.org>2019-07-15 13:52:52 +0000
committerGitHub <noreply@github.com>2019-07-15 13:52:52 +0000
commit3a772b2fcc008ca40e47df86618b938b6a6a55c7 (patch)
tree0274aeedde64b12105c373711259f8a762cb7d8d /dom
parentb0ab634bd80bd1384ce0f1d59a6ee29ddcef5e7e (diff)
parent6b9d8adeb337d4fb73c1eba4eaea84e753a0e797 (diff)
downloadUXP-3a772b2fcc008ca40e47df86618b938b6a6a55c7.tar
UXP-3a772b2fcc008ca40e47df86618b938b6a6a55c7.tar.gz
UXP-3a772b2fcc008ca40e47df86618b938b6a6a55c7.tar.lz
UXP-3a772b2fcc008ca40e47df86618b938b6a6a55c7.tar.xz
UXP-3a772b2fcc008ca40e47df86618b938b6a6a55c7.zip
Merge pull request #1182 from win7-7/fix-one-hang
Dispatch a PluginRemoved event for actual plugins, not images/unknown/iframe-type <objects>
Diffstat (limited to 'dom')
-rw-r--r--dom/base/nsObjectLoadingContent.cpp6
1 files changed, 4 insertions, 2 deletions
diff --git a/dom/base/nsObjectLoadingContent.cpp b/dom/base/nsObjectLoadingContent.cpp
index c1b732258..3c850c4cd 100644
--- a/dom/base/nsObjectLoadingContent.cpp
+++ b/dom/base/nsObjectLoadingContent.cpp
@@ -715,11 +715,13 @@ nsObjectLoadingContent::UnbindFromTree(bool aDeep, bool aNullParent)
/// would keep the docshell around, but trash the frameloader
UnloadObject();
}
- nsIDocument* doc = thisContent->GetComposedDoc();
- if (doc && doc->IsActive()) {
+ if (mType == eType_Plugin) {
+ nsIDocument* doc = thisContent->GetComposedDoc();
+ if (doc && doc->IsActive()) {
nsCOMPtr<nsIRunnable> ev = new nsSimplePluginEvent(doc,
NS_LITERAL_STRING("PluginRemoved"));
NS_DispatchToCurrentThread(ev);
+ }
}
}