Changeset 283346 in webkit

Timestamp:

Sep 30, 2021, 4:12:17 PM (5 years ago)

Author:

Russell Epstein

Message:

Cherry-pick r281613. rdar://problem/83369963

Crash in GraphicsContextGLOpenGL::reshapeDisplayBufferBacking
​https://bugs.webkit.org/show_bug.cgi?id=229309

Patch by Alex Christensen <​achristensen@webkit.org> on 2021-08-25
Reviewed by Myles C. Maxfield.

Source/WebCore:

Test: fast/canvas/xr-compatible-crash.html

Null check m_swapChain because reshapeDisplayBufferBacking can be called before it is set.

• html/canvas/WebGLRenderingContextBase.cpp: (WebCore::WebGLRenderingContextBase::addContextObject):
• platform/graphics/angle/GraphicsContextGLANGLE.cpp: (WebCore::GraphicsContextGLOpenGL::reshapeFBOs):
• platform/graphics/cocoa/GraphicsContextGLOpenGLCocoa.mm: (WebCore::GraphicsContextGLOpenGL::reshapeDisplayBufferBacking):

LayoutTests:

• fast/canvas/xr-compatible-crash.html: Added.
• fast/canvas/xr-compatible-crash-expected.txt: Added.

git-svn-id: ​https://svn.webkit.org/repository/webkit/trunk@281613 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Location:

branches/safari-611.4.2.0-branch

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/canvas/xr-compatible-crash-expected.txt (added)
• LayoutTests/fast/canvas/xr-compatible-crash.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/html/canvas/WebGLRenderingContextBase.cpp (modified) (1 diff)
• Source/WebCore/platform/graphics/angle/GraphicsContextGLANGLE.cpp (modified) (1 diff)
• Source/WebCore/platform/graphics/cocoa/GraphicsContextGLOpenGLCocoa.mm (modified) (1 diff)

branches/safari-611.4.2.0-branch/LayoutTests/ChangeLog

@@ +1 @@
+2021-09-30  Russell Epstein  <repstein@apple.com>
+
+        Cherry-pick r281613. rdar://problem/83369963
+
+    Crash in GraphicsContextGLOpenGL::reshapeDisplayBufferBacking
+    https://bugs.webkit.org/show_bug.cgi?id=229309
+    
+    Patch by Alex Christensen <achristensen@webkit.org> on 2021-08-25
+    Reviewed by Myles C. Maxfield.
+    
+    Source/WebCore:
+    
+    Test: fast/canvas/xr-compatible-crash.html
+    
+    Null check m_swapChain because reshapeDisplayBufferBacking can be called before it is set.
+    
+    * html/canvas/WebGLRenderingContextBase.cpp:
+    (WebCore::WebGLRenderingContextBase::addContextObject):
+    * platform/graphics/angle/GraphicsContextGLANGLE.cpp:
+    (WebCore::GraphicsContextGLOpenGL::reshapeFBOs):
+    * platform/graphics/cocoa/GraphicsContextGLOpenGLCocoa.mm:
+    (WebCore::GraphicsContextGLOpenGL::reshapeDisplayBufferBacking):
+    
+    LayoutTests:
+    
+    * fast/canvas/xr-compatible-crash.html: Added.
+    * fast/canvas/xr-compatible-crash-expected.txt: Added.
+    
+    git-svn-id: https://svn.webkit.org/repository/webkit/trunk@281613 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+    2021-08-25  Alex Christensen  <achristensen@webkit.org>
+
+            Crash in GraphicsContextGLOpenGL::reshapeDisplayBufferBacking
+            https://bugs.webkit.org/show_bug.cgi?id=229309
+
+            Reviewed by Myles C. Maxfield.
+
+            * fast/canvas/xr-compatible-crash.html: Added.
+            * fast/canvas/xr-compatible-crash-expected.txt: Added.
+
 2021-06-21  Alan Coon  <alancoon@apple.com>
 

branches/safari-611.4.2.0-branch/Source/WebCore/ChangeLog

@@ +1 @@
+2021-09-30  Russell Epstein  <repstein@apple.com>
+
+        Cherry-pick r281613. rdar://problem/83369963
+
+    Crash in GraphicsContextGLOpenGL::reshapeDisplayBufferBacking
+    https://bugs.webkit.org/show_bug.cgi?id=229309
+    
+    Patch by Alex Christensen <achristensen@webkit.org> on 2021-08-25
+    Reviewed by Myles C. Maxfield.
+    
+    Source/WebCore:
+    
+    Test: fast/canvas/xr-compatible-crash.html
+    
+    Null check m_swapChain because reshapeDisplayBufferBacking can be called before it is set.
+    
+    * html/canvas/WebGLRenderingContextBase.cpp:
+    (WebCore::WebGLRenderingContextBase::addContextObject):
+    * platform/graphics/angle/GraphicsContextGLANGLE.cpp:
+    (WebCore::GraphicsContextGLOpenGL::reshapeFBOs):
+    * platform/graphics/cocoa/GraphicsContextGLOpenGLCocoa.mm:
+    (WebCore::GraphicsContextGLOpenGL::reshapeDisplayBufferBacking):
+    
+    LayoutTests:
+    
+    * fast/canvas/xr-compatible-crash.html: Added.
+    * fast/canvas/xr-compatible-crash-expected.txt: Added.
+    
+    git-svn-id: https://svn.webkit.org/repository/webkit/trunk@281613 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+    2021-08-25  Alex Christensen  <achristensen@webkit.org>
+
+            Crash in GraphicsContextGLOpenGL::reshapeDisplayBufferBacking
+            https://bugs.webkit.org/show_bug.cgi?id=229309
+
+            Reviewed by Myles C. Maxfield.
+
+            Test: fast/canvas/xr-compatible-crash.html
+
+            Null check m_swapChain because reshapeDisplayBufferBacking can be called before it is set.
+
+            * html/canvas/WebGLRenderingContextBase.cpp:
+            (WebCore::WebGLRenderingContextBase::addContextObject):
+            * platform/graphics/angle/GraphicsContextGLANGLE.cpp:
+            (WebCore::GraphicsContextGLOpenGL::reshapeFBOs):
+            * platform/graphics/cocoa/GraphicsContextGLOpenGLCocoa.mm:
+            (WebCore::GraphicsContextGLOpenGL::reshapeDisplayBufferBacking):
+
 2021-09-30  Russell Epstein  <repstein@apple.com>
 

branches/safari-611.4.2.0-branch/Source/WebCore/html/canvas/WebGLRenderingContextBase.cpp

@@ -6248 +6248 @@
         return;
 
-    ASSERT(!isContextLost());
     m_contextObjects.add(&object);
 }

branches/safari-611.4.2.0-branch/Source/WebCore/platform/graphics/angle/GraphicsContextGLANGLE.cpp

@@ -166 +166 @@
     // resize regular FBO
     gl::BindFramebuffer(GL_FRAMEBUFFER, m_fbo);
-    ASSERT(m_texture);
 
 #if PLATFORM(COCOA)

branches/safari-611.4.2.0-branch/Source/WebCore/platform/graphics/cocoa/GraphicsContextGLOpenGLCocoa.mm

@@ -519 +519 @@
     }
     // Reset the future recycled buffer now, because it most likely will not be reusable at the time it will be reused.
-    auto recycledBuffer = m_swapChain->recycleBuffer();
-    if (recycledBuffer.handle)
-        EGL_DestroySurface(m_displayObj, recycledBuffer.handle);
-    recycledBuffer.surface.reset();
+    if (m_swapChain) {
+        auto recycledBuffer = m_swapChain->recycleBuffer();
+        if (recycledBuffer.handle)
+            EGL_DestroySurface(m_displayObj, recycledBuffer.handle);
+        recycledBuffer.surface.reset();
+    }
     return allocateAndBindDisplayBufferBacking();
 }