corysanin/tubestation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug 1215072 - throw in case dictionary initialization fails in canvas.getContext, r=baku

Browse Source
This commit is contained in:
Olli Pettay
2015-10-18 14:14:22 +03:00
parent df29beac26
commit c5e7d8e13a
11 changed files with 84 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
dom/html/HTMLCanvasElement.cpp
View File

@@ -449,7 +449,8 @@ HTMLCanvasElement::SetAttr(int32_t aNameSpaceID, nsIAtom* aName,
aNameSpaceID == kNameSpaceID_None &&
(aName == nsGkAtoms::width || aName == nsGkAtoms::height || aName == nsGkAtoms::moz_opaque))
{
rv = UpdateContext(nullptr, JS::NullHandleValue);
ErrorResult dummy;
rv = UpdateContext(nullptr, JS::NullHandleValue, dummy);
NS_ENSURE_SUCCESS(rv, rv);
}
@@ -465,7 +466,8 @@ HTMLCanvasElement::UnsetAttr(int32_t aNameSpaceID, nsIAtom* aName,
aNameSpaceID == kNameSpaceID_None &&
(aName == nsGkAtoms::width || aName == nsGkAtoms::height || aName == nsGkAtoms::moz_opaque))
{
rv = UpdateContext(nullptr, JS::NullHandleValue);
ErrorResult dummy;
rv = UpdateContext(nullptr, JS::NullHandleValue, dummy);
NS_ENSURE_SUCCESS(rv, rv);
}
return rv;
@@ -911,7 +913,8 @@ HTMLCanvasElement::MozGetIPCContext(const nsAString& aContextId,
mCurrentContext->SetIsIPC(true);
mCurrentContextType = contextType;
nsresult rv = UpdateContext(nullptr, JS::NullHandleValue);
ErrorResult dummy;
nsresult rv = UpdateContext(nullptr, JS::NullHandleValue, dummy);
NS_ENSURE_SUCCESS(rv, rv);
} else {
// We already have a context of some type.