diff --git a/dom/base/nsIObjectLoadingContent.idl b/dom/base/nsIObjectLoadingContent.idl index 953a2591187c..172cb63a2d11 100644 --- a/dom/base/nsIObjectLoadingContent.idl +++ b/dom/base/nsIObjectLoadingContent.idl @@ -175,12 +175,6 @@ interface nsIObjectLoadingContent : nsISupports */ readonly attribute unsigned long pluginFallbackType; - /** - * If this object currently owns a running plugin, regardless of whether or - * not one is pending spawn/despawn. - */ - readonly attribute bool hasRunningPlugin; - /** * If this plugin runs out-of-process, it has a runID to differentiate * between different times the plugin process has been instantiated. diff --git a/dom/base/nsObjectLoadingContent.cpp b/dom/base/nsObjectLoadingContent.cpp index 74a53328d079..e3eef626d741 100644 --- a/dom/base/nsObjectLoadingContent.cpp +++ b/dom/base/nsObjectLoadingContent.cpp @@ -3347,14 +3347,6 @@ nsObjectLoadingContent::DefaultFallbackType() return reason; } -NS_IMETHODIMP -nsObjectLoadingContent::GetHasRunningPlugin(bool *aHasPlugin) -{ - NS_ENSURE_TRUE(nsContentUtils::IsCallerChrome(), NS_ERROR_NOT_AVAILABLE); - *aHasPlugin = HasRunningPlugin(); - return NS_OK; -} - NS_IMETHODIMP nsObjectLoadingContent::GetRunID(uint32_t* aRunID) { diff --git a/dom/html/HTMLObjectElement.cpp b/dom/html/HTMLObjectElement.cpp index 65f4078892b8..2c69070d1357 100644 --- a/dom/html/HTMLObjectElement.cpp +++ b/dom/html/HTMLObjectElement.cpp @@ -166,10 +166,6 @@ HTMLObjectElement::OnFocusBlurPlugin(Element* aElement, bool aFocus) nsCOMPtr olc = do_QueryInterface(aElement); bool hasRunningPlugin = false; if (olc) { - // nsIObjectLoadingContent::GetHasRunningPlugin() fails when - // nsContentUtils::IsCallerChrome() returns false (which it can do even - // when we're processing a trusted focus event). We work around this by - // calling nsObjectLoadingContent::HasRunningPlugin() directly. hasRunningPlugin = static_cast(olc.get())->HasRunningPlugin(); }