diff options
| author | wolfbeast <mcwerewolf@wolfbeast.com> | 2019-09-06 10:29:38 +0200 |
|---|---|---|
| committer | wolfbeast <mcwerewolf@wolfbeast.com> | 2019-09-06 10:29:38 +0200 |
| commit | 9fdff854ebf1fe1a118061d57fd0a2d6c5c7dfd7 (patch) | |
| tree | 0f3678a1ed688c2f430b1cae5859916790908ac6 /dom/base/nsObjectLoadingContent.cpp | |
| parent | ab6242a93b849b0a3c7525b16bc01dd3172fc167 (diff) | |
| parent | 6db06749e2037029adc96660aafa5339ed609e60 (diff) | |
| download | UXP-9fdff854ebf1fe1a118061d57fd0a2d6c5c7dfd7.tar UXP-9fdff854ebf1fe1a118061d57fd0a2d6c5c7dfd7.tar.gz UXP-9fdff854ebf1fe1a118061d57fd0a2d6c5c7dfd7.tar.lz UXP-9fdff854ebf1fe1a118061d57fd0a2d6c5c7dfd7.tar.xz UXP-9fdff854ebf1fe1a118061d57fd0a2d6c5c7dfd7.zip | |
Merge branch 'master' into release
Diffstat (limited to 'dom/base/nsObjectLoadingContent.cpp')
| -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")) { |