зеркало из https://github.com/mozilla/gecko-dev.git
Fix for 14768 -- turn off animated GIFs in editor. r=pnunn a=beppe
This commit is contained in:
Родитель
1985b5bcad
Коммит
c2ea91a9df
|
@ -456,6 +456,12 @@ nsEditorShell::PrepareDocumentForEditing(nsIDocumentLoader* aLoader, nsIURI *aUr
|
||||||
return NS_ERROR_UNEXPECTED;
|
return NS_ERROR_UNEXPECTED;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// turn off animated GIFs
|
||||||
|
nsCOMPtr<nsIPresContext> presContext;
|
||||||
|
containerAsDocShell->GetPresContext(getter_AddRefs(presContext));
|
||||||
|
if (presContext)
|
||||||
|
presContext->SetImageAnimationMode(eImageAnimation_None);
|
||||||
|
|
||||||
nsresult rv = DoEditorMode(containerAsDocShell);
|
nsresult rv = DoEditorMode(containerAsDocShell);
|
||||||
if (NS_FAILED(rv)) return rv;
|
if (NS_FAILED(rv)) return rv;
|
||||||
|
|
||||||
|
@ -4671,7 +4677,7 @@ nsEditorShell::OnStartDocumentLoad(nsIDocumentLoader* loader, nsIURI* aURL, cons
|
||||||
scriptContext->SetScriptsEnabled(PR_FALSE);
|
scriptContext->SetScriptsEnabled(PR_FALSE);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// set up a parser observer
|
// set up a parser observer
|
||||||
if (!mParserObserver)
|
if (!mParserObserver)
|
||||||
{
|
{
|
||||||
|
|
|
@ -456,6 +456,12 @@ nsEditorShell::PrepareDocumentForEditing(nsIDocumentLoader* aLoader, nsIURI *aUr
|
||||||
return NS_ERROR_UNEXPECTED;
|
return NS_ERROR_UNEXPECTED;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// turn off animated GIFs
|
||||||
|
nsCOMPtr<nsIPresContext> presContext;
|
||||||
|
containerAsDocShell->GetPresContext(getter_AddRefs(presContext));
|
||||||
|
if (presContext)
|
||||||
|
presContext->SetImageAnimationMode(eImageAnimation_None);
|
||||||
|
|
||||||
nsresult rv = DoEditorMode(containerAsDocShell);
|
nsresult rv = DoEditorMode(containerAsDocShell);
|
||||||
if (NS_FAILED(rv)) return rv;
|
if (NS_FAILED(rv)) return rv;
|
||||||
|
|
||||||
|
@ -4671,7 +4677,7 @@ nsEditorShell::OnStartDocumentLoad(nsIDocumentLoader* loader, nsIURI* aURL, cons
|
||||||
scriptContext->SetScriptsEnabled(PR_FALSE);
|
scriptContext->SetScriptsEnabled(PR_FALSE);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// set up a parser observer
|
// set up a parser observer
|
||||||
if (!mParserObserver)
|
if (!mParserObserver)
|
||||||
{
|
{
|
||||||
|
|
Загрузка…
Ссылка в новой задаче