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 779535 - defaultNoAlpha preference is not used in case if nsIPropertyBag argument is 0. r=vlad

Browse Source
This commit is contained in:
Oleg Romashin 2012-08-01 11:58:44 -07:00
parent 5c1ea56db9
commit 7a20b9b98b
2 changed files with 11 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
content/canvas/src/WebGLContext.cpp
View File

@ -73,6 +73,15 @@ NS_NewCanvasRenderingContextWebGL(nsIDOMWebGLRenderingContext** aResult)
return NS_OK;
}
WebGLContextOptions::WebGLContextOptions()
: depth(true), stencil(false),
premultipliedAlpha(true), antialias(true),
preserveDrawingBuffer(false)
{
// Set default alpha state based on preference.
alpha = Preferences::GetBool("webgl.default-no-alpha", false) ? 0 : 1;
}
WebGLContext::WebGLContext()
: gl(nullptr)
{
@ -289,9 +298,6 @@ WebGLContext::SetContextOptions(nsIPropertyBag *aOptions)
if (!aOptions)
return NS_OK;
bool defaultNoAlpha =
Preferences::GetBool("webgl.default-no-alpha", false);
WebGLContextOptions newOpts;
GetBoolFromPropertyBag(aOptions, "stencil", &newOpts.stencil);
@ -299,12 +305,7 @@ WebGLContext::SetContextOptions(nsIPropertyBag *aOptions)
GetBoolFromPropertyBag(aOptions, "premultipliedAlpha", &newOpts.premultipliedAlpha);
GetBoolFromPropertyBag(aOptions, "antialias", &newOpts.antialias);
GetBoolFromPropertyBag(aOptions, "preserveDrawingBuffer", &newOpts.preserveDrawingBuffer);
// alpha defaults to true as per the spec, but we want to evaluate
// what will happen if it were to default to false based on a pref
if (!GetBoolFromPropertyBag(aOptions, "alpha", &newOpts.alpha) && defaultNoAlpha) {
newOpts.alpha = false;
}
GetBoolFromPropertyBag(aOptions, "alpha", &newOpts.alpha);
// enforce that if stencil is specified, we also give back depth
newOpts.depth |= newOpts.stencil;

6
content/canvas/src/WebGLContext.h
View File

@ -424,11 +424,7 @@ protected:
struct WebGLContextOptions {
// these are defaults
WebGLContextOptions()
: alpha(true), depth(true), stencil(false),
premultipliedAlpha(true), antialias(true),
preserveDrawingBuffer(false)
{ }
WebGLContextOptions();
bool operator==(const WebGLContextOptions& other) const {
return