Rename XRWebGLLayer m_IscompositionDisabled to m_IscompositionEnabled

commit-queue@webkit.org · commit-queue@webkit.org · commit 31ee6abd1740 · 2021-02-09T10:30:52.000Z
https://bugs.webkit.org/show_bug.cgi?id=221599 Patch by Imanol Fernandez <ifernandez@igalia.com> on 2021-02-09 Reviewed by Sergio Villar Senin. The spec agreed to rename this to avoid double negations in code. See immersive-web/webxr#1172. * Modules/webxr/WebXRWebGLLayer.cpp: (WebCore::WebXRWebGLLayer::create): (WebCore::WebXRWebGLLayer::WebXRWebGLLayer): * Modules/webxr/WebXRWebGLLayer.h: git-svn-id: http://svn.webkit.org/repository/webkit/trunk@272571 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
@@ -1,3 +1,18 @@
+2021-02-09  Imanol Fernandez  <ifernandez@igalia.com>
+
+        Rename XRWebGLLayer m_IscompositionDisabled to m_IscompositionEnabled
+        https://bugs.webkit.org/show_bug.cgi?id=221599
+
+        Reviewed by Sergio Villar Senin.
+
+        The spec agreed to rename this to avoid double negations in code.
+        See https://github.com/immersive-web/webxr/pull/1172.
+
+        * Modules/webxr/WebXRWebGLLayer.cpp:
+        (WebCore::WebXRWebGLLayer::create):
+        (WebCore::WebXRWebGLLayer::WebXRWebGLLayer):
+        * Modules/webxr/WebXRWebGLLayer.h:
+
 2021-02-08  Rob Buis  <rbuis@igalia.com>
 
         Make auto && <ratio> use content box-sizing
diff --git a/Source/WebCore/Modules/webxr/WebXRWebGLLayer.cpp b/Source/WebCore/Modules/webxr/WebXRWebGLLayer.cpp
@@ -74,7 +74,7 @@ ExceptionOr<Ref<WebXRWebGLLayer>> WebXRWebGLLayer::create(Ref<WebXRSession>&& se
             // 9. (see constructor except for the resources initialization step which is handled in the if block below)
             auto layer = adoptRef(*new WebXRWebGLLayer(WTFMove(session), WTFMove(context), init));
 
-            if (!layer->m_isCompositionDisabled) {
+            if (layer->m_isCompositionEnabled) {
                 // 9.4. Allocate and initialize resources compatible with session&rsquo;s XR device, including GPU accessible memory buffers,
                 //      as required to support the compositing of layer.
                 // 9.5. If layer&rsquo;s resources were unable to be created for any reason, throw an OperationError and abort these steps.
@@ -106,10 +106,10 @@ WebXRWebGLLayer::WebXRWebGLLayer(Ref<WebXRSession>&& session, WebXRRenderingCont
     // 8. Initialize layer's composition disabled boolean as follows:
     //  If session is an inline session -> Initialize layer's composition disabled to true
     //  Otherwise -> Initialize layer's composition disabled boolean to false
-    m_isCompositionDisabled = m_session->mode() == XRSessionMode::Inline;
+    m_isCompositionEnabled = m_session->mode() != XRSessionMode::Inline;
 
     // 9. If layer&rsquo;s composition disabled boolean is false:
-    if (!m_isCompositionDisabled) {
+    if (m_isCompositionEnabled) {
         //  1. Initialize layer&rsquo;s antialias to layerInit&rsquo;s antialias value.
         m_antialias = init.antialias;
 
diff --git a/Source/WebCore/Modules/webxr/WebXRWebGLLayer.h b/Source/WebCore/Modules/webxr/WebXRWebGLLayer.h
@@ -84,7 +84,7 @@ class WebXRWebGLLayer : public WebXRLayer {
     WebXRRenderingContext m_context;
     bool m_antialias { false };
     bool m_ignoreDepthValues { false };
-    bool m_isCompositionDisabled { false };
+    bool m_isCompositionEnabled { true };
 
     struct {
         RefPtr<WebGLFramebuffer> object;
