зеркало из https://github.com/mozilla/gecko-dev.git
Bug 1316661 part 6. Get rid of nsIObjectLoadingContent.hasRunningPlugin, since it's unused. r=smaug
This commit is contained in:
Родитель
b865966d97
Коммит
bc74bb03f3
|
@ -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.
|
||||
|
|
|
@ -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)
|
||||
{
|
||||
|
|
|
@ -166,10 +166,6 @@ HTMLObjectElement::OnFocusBlurPlugin(Element* aElement, bool aFocus)
|
|||
nsCOMPtr<nsIObjectLoadingContent> 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<nsObjectLoadingContent*>(olc.get())->HasRunningPlugin();
|
||||
}
|
||||
|
|
Загрузка…
Ссылка в новой задаче