зеркало из https://github.com/mozilla/pjs.git
Changes for qnx(photon) platform only. It should not affect runtime/building other platforms.
Mostly compile fixes due to changed interfaces.
This commit is contained in:
Родитель
e593d6848b
Коммит
37d5442c36
|
@ -62,7 +62,10 @@ class EmbedEventListener : public nsIDOMKeyListener,
|
|||
NS_IMETHOD MouseOut(nsIDOMEvent* aDOMEvent);
|
||||
|
||||
// nsIDOMUIListener
|
||||
NS_DECL_NSIDOMUILISTENER
|
||||
|
||||
NS_IMETHOD Activate(nsIDOMEvent* aDOMEvent);
|
||||
NS_IMETHOD FocusIn(nsIDOMEvent* aDOMEvent);
|
||||
NS_IMETHOD FocusOut(nsIDOMEvent* aDOMEvent);
|
||||
|
||||
private:
|
||||
|
||||
|
|
|
@ -866,14 +866,8 @@ EmbedPrivate::GetPIDOMWindow(nsPIDOMWindow **aPIWin)
|
|||
// get the private DOM window
|
||||
nsCOMPtr<nsPIDOMWindow> domWindowPrivate = do_QueryInterface(domWindow);
|
||||
// and the root window for that DOM window
|
||||
nsCOMPtr<nsIDOMWindowInternal> rootWindow;
|
||||
domWindowPrivate->GetPrivateRoot(getter_AddRefs(rootWindow));
|
||||
*aPIWin = domWindowPrivate->GetPrivateRoot();
|
||||
|
||||
nsCOMPtr<nsIChromeEventHandler> chromeHandler;
|
||||
nsCOMPtr<nsPIDOMWindow> piWin(do_QueryInterface(rootWindow));
|
||||
|
||||
*aPIWin = piWin.get();
|
||||
|
||||
if (*aPIWin) {
|
||||
NS_ADDREF(*aPIWin);
|
||||
return NS_OK;
|
||||
|
|
|
@ -99,9 +99,8 @@ NS_IMETHODIMP nsUnknownContentTypeHandler::PromptForSaveToFile( nsIHelperAppLaun
|
|||
/* get the mime type */
|
||||
nsCOMPtr<nsIMIMEInfo> mimeInfo;
|
||||
aLauncher->GetMIMEInfo( getter_AddRefs(mimeInfo) );
|
||||
char *mimeType;
|
||||
mimeInfo->GetMIMEType( &mimeType );
|
||||
|
||||
nsCAutoString mimeType;
|
||||
mimeInfo->GetMIMEType( mimeType );
|
||||
|
||||
PtCallbackInfo_t cbinfo;
|
||||
PtWebUnknownWithNameCallback_t cb;
|
||||
|
@ -110,7 +109,7 @@ NS_IMETHODIMP nsUnknownContentTypeHandler::PromptForSaveToFile( nsIHelperAppLaun
|
|||
cbinfo.reason = Pt_CB_MOZ_UNKNOWN;
|
||||
cbinfo.cbdata = &cb;
|
||||
cb.action = Pt_WEB_ACTION_OK;
|
||||
cb.content_type = mimeType;
|
||||
cb.content_type = (char*)mimeType.get();
|
||||
cb.url = (char *)url;
|
||||
cb.content_length = strlen( cb.url );
|
||||
cb.suggested_filename = (char*)filename;
|
||||
|
|
Загрузка…
Ссылка в новой задаче