зеркало из https://github.com/mozilla/pjs.git
Fix for 78741. r=saari, sr=ben
This commit is contained in:
Родитель
5a0fb842cf
Коммит
e88c067d05
|
@ -413,6 +413,7 @@ PluginViewerImpl::CreatePlugin(nsIRequest* request, nsIPluginHost* aHost, const
|
||||||
channel->GetContentType(&ct);
|
channel->GetContentType(&ct);
|
||||||
if (NS_FAILED(rv)) return rv;
|
if (NS_FAILED(rv)) return rv;
|
||||||
rv = aHost->InstantiateFullPagePlugin(ct, str, aResult, mOwner);
|
rv = aHost->InstantiateFullPagePlugin(ct, str, aResult, mOwner);
|
||||||
|
|
||||||
delete[] ct;
|
delete[] ct;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -517,6 +518,7 @@ PluginViewerImpl::MakeWindow(nsNativeWidget aParent,
|
||||||
|
|
||||||
mWindow->Create(aParent, aBounds,HandlePluginEvent, aDeviceContext);
|
mWindow->Create(aParent, aBounds,HandlePluginEvent, aDeviceContext);
|
||||||
mWindow->SetClientData(this);
|
mWindow->SetClientData(this);
|
||||||
|
Show();
|
||||||
return rv;
|
return rv;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -536,13 +538,14 @@ PluginViewerImpl::GetBounds(nsRect& aResult)
|
||||||
NS_IMETHODIMP
|
NS_IMETHODIMP
|
||||||
PluginViewerImpl::GetPreviousViewer(nsIContentViewer** aViewer)
|
PluginViewerImpl::GetPreviousViewer(nsIContentViewer** aViewer)
|
||||||
{
|
{
|
||||||
return NS_ERROR_NOT_IMPLEMENTED;
|
*aViewer = nsnull;
|
||||||
|
return NS_OK;
|
||||||
}
|
}
|
||||||
|
|
||||||
NS_IMETHODIMP
|
NS_IMETHODIMP
|
||||||
PluginViewerImpl::SetPreviousViewer(nsIContentViewer* aViewer)
|
PluginViewerImpl::SetPreviousViewer(nsIContentViewer* aViewer)
|
||||||
{
|
{
|
||||||
return NS_ERROR_NOT_IMPLEMENTED;
|
return NS_OK;
|
||||||
}
|
}
|
||||||
|
|
||||||
NS_IMETHODIMP
|
NS_IMETHODIMP
|
||||||
|
|
|
@ -413,6 +413,7 @@ PluginViewerImpl::CreatePlugin(nsIRequest* request, nsIPluginHost* aHost, const
|
||||||
channel->GetContentType(&ct);
|
channel->GetContentType(&ct);
|
||||||
if (NS_FAILED(rv)) return rv;
|
if (NS_FAILED(rv)) return rv;
|
||||||
rv = aHost->InstantiateFullPagePlugin(ct, str, aResult, mOwner);
|
rv = aHost->InstantiateFullPagePlugin(ct, str, aResult, mOwner);
|
||||||
|
|
||||||
delete[] ct;
|
delete[] ct;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -517,6 +518,7 @@ PluginViewerImpl::MakeWindow(nsNativeWidget aParent,
|
||||||
|
|
||||||
mWindow->Create(aParent, aBounds,HandlePluginEvent, aDeviceContext);
|
mWindow->Create(aParent, aBounds,HandlePluginEvent, aDeviceContext);
|
||||||
mWindow->SetClientData(this);
|
mWindow->SetClientData(this);
|
||||||
|
Show();
|
||||||
return rv;
|
return rv;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -536,13 +538,14 @@ PluginViewerImpl::GetBounds(nsRect& aResult)
|
||||||
NS_IMETHODIMP
|
NS_IMETHODIMP
|
||||||
PluginViewerImpl::GetPreviousViewer(nsIContentViewer** aViewer)
|
PluginViewerImpl::GetPreviousViewer(nsIContentViewer** aViewer)
|
||||||
{
|
{
|
||||||
return NS_ERROR_NOT_IMPLEMENTED;
|
*aViewer = nsnull;
|
||||||
|
return NS_OK;
|
||||||
}
|
}
|
||||||
|
|
||||||
NS_IMETHODIMP
|
NS_IMETHODIMP
|
||||||
PluginViewerImpl::SetPreviousViewer(nsIContentViewer* aViewer)
|
PluginViewerImpl::SetPreviousViewer(nsIContentViewer* aViewer)
|
||||||
{
|
{
|
||||||
return NS_ERROR_NOT_IMPLEMENTED;
|
return NS_OK;
|
||||||
}
|
}
|
||||||
|
|
||||||
NS_IMETHODIMP
|
NS_IMETHODIMP
|
||||||
|
|
Загрузка…
Ссылка в новой задаче