C++ side of fix for bug 100212 - move consumers of nsIFile.URL into nsIIOService. r=dougt, sr=darin
git-svn-id: svn://10.0.0.236/trunk@111529 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
@@ -2462,12 +2462,6 @@ nsPluginHostImpl::~nsPluginHostImpl()
|
||||
#ifdef NS_DEBUG
|
||||
printf("nsPluginHostImpl dtor\n");
|
||||
#endif
|
||||
nsCOMPtr<nsIObserverService> obsService = do_GetService("@mozilla.org/observer-service;1");
|
||||
if (obsService)
|
||||
{
|
||||
obsService->RemoveObserver(this, "quit-application");
|
||||
obsService->RemoveObserver(this, NS_XPCOM_SHUTDOWN_OBSERVER_ID);
|
||||
}
|
||||
Destroy();
|
||||
}
|
||||
|
||||
@@ -5326,7 +5320,7 @@ NS_IMETHODIMP nsPluginHostImpl::NewPluginURLStream(const nsString& aURL,
|
||||
if (aIsFile) {
|
||||
// convert file:///c:/ to c:
|
||||
nsCOMPtr<nsILocalFile> aFile = do_CreateInstance(NS_LOCAL_FILE_CONTRACTID);
|
||||
if (NS_SUCCEEDED(aFile->SetURL(dataToPost)))
|
||||
if (NS_SUCCEEDED(NS_InitFileFromURLSpec(aFile,dataToPost)))
|
||||
if (NS_SUCCEEDED(aFile->GetPath(getter_Copies(filename)))) {
|
||||
// tell the listener about it so it will delete the file later
|
||||
listenerPeer->SetLocalFile(filename);
|
||||
|
||||
Reference in New Issue
Block a user