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

Bug 912606 - Warn on webgl context requests with mismatched ids. - r=bjacob

Browse Source
This commit is contained in:
Jeff Gilbert 2013-09-06 11:48:18 -07:00
parent a650c85e02
commit 40da9960b1
1 changed files with 22 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
content/html/content/src/HTMLCanvasElement.cpp
View File

@ -671,6 +671,14 @@ HTMLCanvasElement::GetContext(const nsAString& aContextId,
return rv.ErrorCode(); return rv.ErrorCode();
} }
static bool
IsContextIdWebGL(const nsAString& str)
{
return str.EqualsLiteral("webgl") ||
str.EqualsLiteral("experimental-webgl") ||
str.EqualsLiteral("moz-webgl");
}
already_AddRefed<nsISupports> already_AddRefed<nsISupports>
HTMLCanvasElement::GetContext(JSContext* aCx, HTMLCanvasElement::GetContext(JSContext* aCx,
const nsAString& aContextId, const nsAString& aContextId,
@ -702,6 +710,20 @@ HTMLCanvasElement::GetContext(JSContext* aCx,
} }
if (!mCurrentContextId.Equals(aContextId)) { if (!mCurrentContextId.Equals(aContextId)) {
if (IsContextIdWebGL(aContextId) &&
IsContextIdWebGL(mCurrentContextId))
{
// Warn when we get a request for a webgl context with an id that differs
// from the id it was created with.
nsCString creationId = NS_LossyConvertUTF16toASCII(mCurrentContextId);
nsCString requestId = NS_LossyConvertUTF16toASCII(aContextId);
JS_ReportWarning(aCx, "WebGL: Retrieving a WebGL context from a canvas "
"via a request id ('%s') different from the id used "
"to create the context ('%s') is not allowed.",
requestId.get(),
creationId.get());
}
//XXX eventually allow for more than one active context on a given canvas //XXX eventually allow for more than one active context on a given canvas
return nullptr; return nullptr;
} }