Title: [276425] trunk/Source/WebCore
Revision
276425
Author
[email protected]
Date
2021-04-22 00:40:36 -0700 (Thu, 22 Apr 2021)

Log Message

GraphicsContextGLOpenGLCocoa should check that ANGLE is loaded in WK1 releaseCurrentContext
https://bugs.webkit.org/show_bug.cgi?id=224532
<rdar://problem/76632149>

Patch by Kimmo Kinnunen <[email protected]> on 2021-04-22
Reviewed by Kenneth Russell.

Avoid crashing in case WK1 is used but ANGLE library is not present.
There are some cases where ANGLE could be omitted for size savings.

* platform/graphics/cocoa/GraphicsContextGLOpenGLCocoa.mm:
(WebCore::GraphicsContextGLOpenGL::releaseCurrentContext):

Modified Paths

Diff

Modified: trunk/Source/WebCore/ChangeLog (276424 => 276425)


--- trunk/Source/WebCore/ChangeLog	2021-04-22 06:03:45 UTC (rev 276424)
+++ trunk/Source/WebCore/ChangeLog	2021-04-22 07:40:36 UTC (rev 276425)
@@ -1,3 +1,17 @@
+2021-04-22  Kimmo Kinnunen  <[email protected]>
+
+        GraphicsContextGLOpenGLCocoa should check that ANGLE is loaded in WK1 releaseCurrentContext
+        https://bugs.webkit.org/show_bug.cgi?id=224532
+        <rdar://problem/76632149>
+
+        Reviewed by Kenneth Russell.
+
+        Avoid crashing in case WK1 is used but ANGLE library is not present.
+        There are some cases where ANGLE could be omitted for size savings.
+
+        * platform/graphics/cocoa/GraphicsContextGLOpenGLCocoa.mm:
+        (WebCore::GraphicsContextGLOpenGL::releaseCurrentContext):
+
 2021-04-21  Fujii Hironori  <[email protected]>
 
         [Win] GetDoubleClickTime() returns 0 in the non-interactive window station on Windows 10 version 2004

Modified: trunk/Source/WebCore/platform/graphics/cocoa/GraphicsContextGLOpenGLCocoa.mm (276424 => 276425)


--- trunk/Source/WebCore/platform/graphics/cocoa/GraphicsContextGLOpenGLCocoa.mm	2021-04-22 06:03:45 UTC (rev 276424)
+++ trunk/Source/WebCore/platform/graphics/cocoa/GraphicsContextGLOpenGLCocoa.mm	2021-04-22 07:40:36 UTC (rev 276425)
@@ -467,6 +467,9 @@
 #if PLATFORM(IOS_FAMILY)
 bool GraphicsContextGLOpenGL::releaseCurrentContext(ReleaseBehavior releaseBehavior)
 {
+    if (!isANGLEAvailable())
+        return true;
+
     // At the moment this function is relevant only when web thread lock owns the GraphicsContextGLOpenGL current context.
     ASSERT(!isCurrentContextPredictable());
 
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to