wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

b=578215; crash with canvas getContext; r=jonas

Browse Source
This commit is contained in:
ms2ger@gmail.com 2010-07-15 13:39:31 -07:00
parent cadd86f1ea
commit 44ac2ac21f
1 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
content/html/content/src/nsHTMLCanvasElement.cpp
View File

@ -231,6 +231,10 @@ nsHTMLCanvasElement::ToDataURLImpl(const nsAString& aMimeType,
nsCOMPtr<nsICanvasRenderingContextInternal> context;
nsresult rv = GetContext(NS_LITERAL_STRING("2d"), getter_AddRefs(context));
NS_ENSURE_SUCCESS(rv, rv);
if (!context) {
// XXX bug 578349
return NS_ERROR_NOT_IMPLEMENTED;
}
// get image bytes
nsCOMPtr<nsIInputStream> imgStream;
@ -353,9 +357,10 @@ nsHTMLCanvasElement::GetContext(const nsAString& aContextId,
if (mCurrentContextId.IsEmpty()) {
rv = GetContextHelper(aContextId, getter_AddRefs(mCurrentContext));
if (NS_FAILED(rv))
// XXX ERRMSG we need to report an error to developers here! (bug 329026)
return NS_ERROR_INVALID_ARG;
NS_ENSURE_SUCCESS(rv, rv);
if (!mCurrentContext) {
return NS_OK;
}
// Ensure that the context participates in CC. Note that returning a
// CC participant from QI doesn't addref.
@ -406,8 +411,10 @@ nsHTMLCanvasElement::MozGetIPCContext(const nsAString& aContextId,
if (mCurrentContextId.IsEmpty()) {
rv = GetContextHelper(aContextId, getter_AddRefs(mCurrentContext));
if (NS_FAILED(rv))
return rv;
NS_ENSURE_SUCCESS(rv, rv);
if (!mCurrentContext) {
return NS_OK;
}
mCurrentContext->SetIsIPC(PR_TRUE);