diff options
| author | wolfbeast <mcwerewolf@wolfbeast.com> | 2019-09-01 18:21:00 +0200 |
|---|---|---|
| committer | wolfbeast <mcwerewolf@wolfbeast.com> | 2019-09-01 18:21:41 +0200 |
| commit | 7b986188c1c3331a80fe0fb4062a060050b85e2a (patch) | |
| tree | 9e302ed366574011329b125961c5f60252e739e9 /dom | |
| parent | 11965adc1debca20b7115802d4542aee747b3a1c (diff) | |
| parent | 8f7d40e854f2941c2ddd75fb6532407e07a72609 (diff) | |
| download | UXP-7b986188c1c3331a80fe0fb4062a060050b85e2a.tar UXP-7b986188c1c3331a80fe0fb4062a060050b85e2a.tar.gz UXP-7b986188c1c3331a80fe0fb4062a060050b85e2a.tar.lz UXP-7b986188c1c3331a80fe0fb4062a060050b85e2a.tar.xz UXP-7b986188c1c3331a80fe0fb4062a060050b85e2a.zip | |
Merge working copy branch
Diffstat (limited to 'dom')
| -rw-r--r-- | dom/base/nsObjectLoadingContent.cpp | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/dom/base/nsObjectLoadingContent.cpp b/dom/base/nsObjectLoadingContent.cpp index 3c850c4cd..4978744e8 100644 --- a/dom/base/nsObjectLoadingContent.cpp +++ b/dom/base/nsObjectLoadingContent.cpp @@ -718,9 +718,9 @@ nsObjectLoadingContent::UnbindFromTree(bool aDeep, bool aNullParent) 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); + nsCOMPtr<nsIRunnable> ev = new nsSimplePluginEvent(doc, + NS_LITERAL_STRING("PluginRemoved")); + NS_DispatchToCurrentThread(ev); } } } @@ -3628,6 +3628,14 @@ nsObjectLoadingContent::HasGoodFallback() { } } + // RULE "nosrc": + // Use fallback content if the object has not specified a src URI. + if (rulesList[i].EqualsLiteral("nosrc")) { + if (!mOriginalURI) { + return true; + } + } + // RULE "adobelink": // Don't use fallback content when it has a link to adobe's website. if (rulesList[i].EqualsLiteral("adobelink")) { |