Changeset 278312 in webkit

Timestamp:

Jun 1, 2021, 10:19:04 AM (5 years ago)

Author:

dino@apple.com

Message:

[WebXR] Attach IOSurface to WebXROpaqueFramebuffer
​https://bugs.webkit.org/show_bug.cgi?id=225896
<rdar://problem/78128289>

Add a null check to fix a test crash.

• Modules/webxr/WebXROpaqueFramebuffer.cpp:

(WebCore::WebXROpaqueFramebuffer::startFrame):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• Modules/webxr/WebXROpaqueFramebuffer.cpp (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2021-06-01  Dean Jackson  <dino@apple.com>
+
+        [WebXR] Attach IOSurface to WebXROpaqueFramebuffer
+        https://bugs.webkit.org/show_bug.cgi?id=225896
+        <rdar://problem/78128289>
+
+        Add a null check to fix a test crash.
+
+        * Modules/webxr/WebXROpaqueFramebuffer.cpp:
+        (WebCore::WebXROpaqueFramebuffer::startFrame):
+
 2021-06-01  Sam Weinig  <weinig@apple.com>
 

trunk/Source/WebCore/Modules/webxr/WebXROpaqueFramebuffer.cpp

@@ -117 +117 @@
 
 #if USE(IOSURFACE_FOR_XR_LAYER_DATA)
+    if (!data.surface)
+        return;
+
     auto gCGL = static_cast<GraphicsContextGLOpenGL*>(m_context.graphicsContextGL());
     GCGLenum textureTarget = GraphicsContextGLOpenGL::drawingBufferTextureTarget();
 
     auto size = data.surface->size();
+    if (!size.width() || !size.height())
+        return;
 
     if (!m_opaqueTexture)