Backed out changeset b14b975aa6d7 (bug 1785925) for causing build bus…

…tages on GLBlitHelper.cpp CLOSED TREE
Brli · Sep 3, 2022 · d0b127e · d0b127e
1 parent 699486f
commit d0b127e
Show file tree

Hide file tree

Showing 39 changed files with 322 additions and 2,669 deletions.
diff --git a/dom/canvas/ClientWebGLContext.cpp b/dom/canvas/ClientWebGLContext.cpp
@@ -896,11 +896,13 @@ ClientWebGLContext::SetContextOptions(JSContext* cx,
   if (attributes.mAntialias.WasPassed()) {
     newOpts.antialias = attributes.mAntialias.Value();
   }
-  newOpts.ignoreColorSpace = true;
+
   if (attributes.mColorSpace.WasPassed()) {
-    newOpts.ignoreColorSpace = false;
     newOpts.colorSpace = attributes.mColorSpace.Value();
   }
+  if (StaticPrefs::gfx_color_management_native_srgb()) {
+    newOpts.ignoreColorSpace = false;
+  }
 
   // Don't do antialiasing if we've disabled MSAA.
   if (!StaticPrefs::webgl_msaa_samples()) {

diff --git a/dom/canvas/WebGLContext.cpp b/dom/canvas/WebGLContext.cpp
@@ -898,14 +898,10 @@ constexpr auto MakeArray(Args... args) -> std::array<T, sizeof...(Args)> {
 }
 
 inline gfx::ColorSpace2 ToColorSpace2(const WebGLContextOptions& options) {
-  auto ret = gfx::ColorSpace2::UNKNOWN;
-  if (StaticPrefs::gfx_color_management_native_srgb()) {
-    ret = gfx::ColorSpace2::SRGB;
+  if (options.ignoreColorSpace) {
+    return gfx::ColorSpace2::UNKNOWN;
   }
-  if (!options.ignoreColorSpace) {
-    ret = gfx::ToColorSpace2(options.colorSpace);
-  }
-  return ret;
+  return gfx::ToColorSpace2(options.colorSpace);
 }
 
 // -

diff --git a/dom/canvas/WebGLIpdl.h b/dom/canvas/WebGLIpdl.h
@@ -247,10 +247,7 @@ struct ParamTraits<mozilla::WebGLContextOptions> final
   using T = mozilla::WebGLContextOptions;
 
   static bool Validate(const T& val) {
-    bool ok = true;
-    ok &= ValidateParam(val.powerPreference);
-    ok &= ValidateParam(val.colorSpace);
-    return ok;
+    return ValidateParam(val.powerPreference) && ValidateParam(val.colorSpace);
   }
 };
 

diff --git a/dom/canvas/WebGLTypes.h b/dom/canvas/WebGLTypes.h
@@ -359,7 +359,7 @@ struct FloatOrInt final  // For TexParameter[fi] and friends.
 
 // -
 
-struct WebGLContextOptions final {
+struct WebGLContextOptions {
   bool alpha = true;
   bool depth = true;
   bool stencil = false;
@@ -372,8 +372,8 @@ struct WebGLContextOptions final {
 
   dom::WebGLPowerPreference powerPreference =
       dom::WebGLPowerPreference::Default;
-  bool ignoreColorSpace = true;
   dom::PredefinedColorSpace colorSpace = dom::PredefinedColorSpace::Srgb;
+  bool ignoreColorSpace = true;  // Our legacy behavior.
   bool shouldResistFingerprinting = true;
 
   bool enableDebugRendererInfo = false;
@@ -400,8 +400,6 @@ struct WebGLContextOptions final {
     // clang-format on
   }
 
-  // -
-
   WebGLContextOptions();
   WebGLContextOptions(const WebGLContextOptions&) = default;
 

diff --git a/dom/canvas/test/reftest/color_quads.html b/dom/canvas/test/reftest/color_quads.html