Missing EnabledBySetting=WebXREnabled where Conditional=WEBXR exists
https://bugs.webkit.org/show_bug.cgi?id=235527
Reviewed by Darin Adler.
Manually tested.
* Modules/webxr/XRFrameRequestCallback.idl:
* html/canvas/WebGLContextAttributes.idl:
* html/canvas/WebGLRenderingContextBase.idl:
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@288553 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
index ec2853f..6b072e4 100644
--- a/Source/WebCore/ChangeLog
+++ b/Source/WebCore/ChangeLog
@@ -1,3 +1,16 @@
+2022-01-25 Sam Sneddon <gsnedders@apple.com>
+
+ Missing EnabledBySetting=WebXREnabled where Conditional=WEBXR exists
+ https://bugs.webkit.org/show_bug.cgi?id=235527
+
+ Reviewed by Darin Adler.
+
+ Manually tested.
+
+ * Modules/webxr/XRFrameRequestCallback.idl:
+ * html/canvas/WebGLContextAttributes.idl:
+ * html/canvas/WebGLRenderingContextBase.idl:
+
2022-01-25 Lauro Moura <lmoura@igalia.com>
Non-unified buildfix after r288546/246378@main
diff --git a/Source/WebCore/Modules/webxr/XRFrameRequestCallback.idl b/Source/WebCore/Modules/webxr/XRFrameRequestCallback.idl
index 6a26dc4..452e90f 100644
--- a/Source/WebCore/Modules/webxr/XRFrameRequestCallback.idl
+++ b/Source/WebCore/Modules/webxr/XRFrameRequestCallback.idl
@@ -27,5 +27,6 @@
// https://immersive-web.github.io/webxr/#callbackdef-xrframerequestcallback
[
- Conditional=WEBXR
+ Conditional=WEBXR,
+ EnabledBySetting=WebXREnabled
] callback XRFrameRequestCallback = undefined (DOMHighResTimeStamp time, WebXRFrame frame);
diff --git a/Source/WebCore/html/canvas/WebGLContextAttributes.idl b/Source/WebCore/html/canvas/WebGLContextAttributes.idl
index 3902bae..c52181c 100644
--- a/Source/WebCore/html/canvas/WebGLContextAttributes.idl
+++ b/Source/WebCore/html/canvas/WebGLContextAttributes.idl
@@ -45,5 +45,5 @@
GLboolean preserveDrawingBuffer = false;
WebGLPowerPreference powerPreference = "default";
GLboolean failIfMajorPerformanceCaveat = false;
- [Conditional=WEBXR] boolean xrCompatible = false;
+ [Conditional=WEBXR, EnabledBySetting=WebXREnabled] boolean xrCompatible = false;
};
diff --git a/Source/WebCore/html/canvas/WebGLRenderingContextBase.idl b/Source/WebCore/html/canvas/WebGLRenderingContextBase.idl
index bfe4f42..dfe83aa 100644
--- a/Source/WebCore/html/canvas/WebGLRenderingContextBase.idl
+++ b/Source/WebCore/html/canvas/WebGLRenderingContextBase.idl
@@ -604,7 +604,7 @@
undefined lineWidth(GLfloat width);
undefined linkProgram(WebGLProgram program);
- [NewObject, Conditional=WEBXR] Promise<undefined> makeXRCompatible();
+ [NewObject, Conditional=WEBXR, EnabledBySetting=WebXREnabled] Promise<undefined> makeXRCompatible();
undefined pixelStorei(GLenum pname, GLint param);
undefined polygonOffset(GLfloat factor, GLfloat units);
