diff options
| author | Moonchild <moonchild@palemoon.org> | 2021-04-30 21:22:08 +0000 |
|---|---|---|
| committer | Moonchild <moonchild@palemoon.org> | 2021-04-30 21:22:08 +0000 |
| commit | 0dd3424f774954627d6f53df9fb47379d9b5c871 (patch) | |
| tree | d8c303bac59a5bbbbc6c6f5e541a01dec1a5ae49 /dom/base/nsObjectLoadingContent.cpp | |
| parent | 5e705bd5059da5b7a39e3a096b7c7f59cb466730 (diff) | |
| download | uxp-0dd3424f774954627d6f53df9fb47379d9b5c871.tar.gz | |
Issue #1751 -- Remove XP_MACOSX conditionals from /dom
Diffstat (limited to 'dom/base/nsObjectLoadingContent.cpp')
| -rw-r--r-- | dom/base/nsObjectLoadingContent.cpp | 19 |
1 files changed, 0 insertions, 19 deletions
diff --git a/dom/base/nsObjectLoadingContent.cpp b/dom/base/nsObjectLoadingContent.cpp index e508a22f3e..27e4e7b7e9 100644 --- a/dom/base/nsObjectLoadingContent.cpp +++ b/dom/base/nsObjectLoadingContent.cpp @@ -95,13 +95,6 @@ #endif #endif // XP_WIN -#ifdef XP_MACOSX -// HandlePluginCrashed() and HandlePluginInstantiated() needed from here to -// fix bug 1147521. Should later be replaced by proper interface methods, -// maybe on nsIObjectLoadingContext. -#include "mozilla/dom/HTMLObjectElement.h" -#endif - static NS_DEFINE_CID(kAppShellCID, NS_APPSHELL_CID); static const char *kPrefJavaMIME = "plugin.java.mime"; @@ -916,10 +909,6 @@ nsObjectLoadingContent::InstantiatePluginInstance(bool aIsLoading) NS_LITERAL_STRING("PluginInstantiated")); NS_DispatchToCurrentThread(ev); -#ifdef XP_MACOSX - HTMLObjectElement::HandlePluginInstantiated(thisContent->AsElement()); -#endif - return NS_OK; } @@ -2948,10 +2937,6 @@ nsObjectLoadingContent::PluginCrashed(nsIPluginTag* aPluginTag, nsCOMPtr<nsIContent> thisContent = do_QueryInterface(static_cast<nsIImageLoadingContent*>(this)); -#ifdef XP_MACOSX - HTMLObjectElement::HandlePluginCrashed(thisContent->AsElement()); -#endif - PluginDestroyed(); // Switch to fallback/crashed state, notify @@ -3190,10 +3175,6 @@ nsObjectLoadingContent::DoStopPlugin(nsPluginInstanceOwner* aInstanceOwner, return; } -#if defined(XP_MACOSX) - aInstanceOwner->HidePluginWindow(); -#endif - RefPtr<nsPluginHost> pluginHost = nsPluginHost::GetInst(); NS_ASSERTION(pluginHost, "No plugin host?"); pluginHost->StopPluginInstance(inst); |