Changeset 291750 in webkit

Timestamp:

Mar 23, 2022, 10:39:12 AM (5 years ago)

Author:

Russell Epstein

Message:

Cherry-pick r291566. rdar://problem/90346629

Accessing WebGL content crashes in macOS Recovery OS
​https://bugs.webkit.org/show_bug.cgi?id=238139

Patch by Kimmo Kinnunen <​kkinnunen@apple.com> on 2022-03-21
Reviewed by Antti Koivisto.

Add a quick fix trying to circumvent a Recovery OS crash.
Parts of this will be reverted once the true source is found.

• platform/graphics/cocoa/GraphicsContextGLCocoa.mm: (WebCore::platformSupportsMetal):

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

Location:

branches/safari-614.1.7-branch/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/graphics/cocoa/GraphicsContextGLCocoa.mm (modified) (3 diffs)

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

@@ +1 @@
+2022-03-23  Russell Epstein  <repstein@apple.com>
+
+        Cherry-pick r291566. rdar://problem/90346629
+
+    Accessing WebGL content crashes in macOS Recovery OS
+    https://bugs.webkit.org/show_bug.cgi?id=238139
+    
+    Patch by Kimmo Kinnunen <kkinnunen@apple.com> on 2022-03-21
+    Reviewed by Antti Koivisto.
+    
+    Add a quick fix trying to circumvent a Recovery OS crash.
+    Parts of this will be reverted once the true source is found.
+    
+    * platform/graphics/cocoa/GraphicsContextGLCocoa.mm:
+    (WebCore::platformSupportsMetal):
+    
+    git-svn-id: https://svn.webkit.org/repository/webkit/trunk@291566 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+    2022-03-21  Kimmo Kinnunen  <kkinnunen@apple.com>
+
+            Accessing WebGL content crashes in macOS Recovery OS
+            https://bugs.webkit.org/show_bug.cgi?id=238139
+
+            Reviewed by Antti Koivisto.
+
+            Add a quick fix trying to circumvent a Recovery OS crash.
+            Parts of this will be reverted once the true source is found.
+
+            * platform/graphics/cocoa/GraphicsContextGLCocoa.mm:
+            (WebCore::platformSupportsMetal):
+
 2022-03-22  Russell Epstein  <repstein@apple.com>
 

branches/safari-614.1.7-branch/Source/WebCore/platform/graphics/cocoa/GraphicsContextGLCocoa.mm

@@ -42 +42 @@
 #import <pal/spi/cocoa/MetalSPI.h>
 #import <wtf/BlockObjCExceptions.h>
+#import <wtf/darwin/WeakLinking.h>
 #import <wtf/text/CString.h>
 
@@ -57 +58 @@
 #import "ImageRotationSessionVT.h"
 #endif
+
+// Metal may not be available, for example in recovery OS.
+WTF_WEAK_LINK_FORCE_IMPORT(MTLCreateSystemDefaultDevice);
 
 namespace WebCore {
@@ -97 +101 @@
 static bool platformSupportsMetal(bool isWebGL2)
 {
+    // FIXME: Figure out why WebKit runs in recovery system using -framework Metal, but seemingly cannot call into Metal.
+    // The hunk about runnningInRecoverySystem should be removed once it is clear how WebKit can link strongly to Metal
+    // but run without Metal.
+    static bool runningInRecoverySystem = [] {
+        if (getenv("__OSINSTALL_ENVIRONMENT")) {
+            WTFLogAlways("WebGL: Running in recovery. Has access to Metal: %s", !MTLCreateSystemDefaultDevice ? "no" : "yes");
+            return true;
+        }
+        return false;
+    }();
+    if (runningInRecoverySystem)
+        return false;
+
+    if (!MTLCreateSystemDefaultDevice)
+        return false;
+
     auto device = adoptNS(MTLCreateSystemDefaultDevice());