Systems with no NSScreens hitting assertion in rendererIDForDisplay when creating...
authorcommit-queue@webkit.org <commit-queue@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 26 Jul 2018 00:34:10 +0000 (00:34 +0000)
committercommit-queue@webkit.org <commit-queue@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 26 Jul 2018 00:34:10 +0000 (00:34 +0000)
https://bugs.webkit.org/show_bug.cgi?id=188023
<rdar://problem/42476622>

Patch by Justin Fan <justin_fan@apple.com> on 2018-07-25
Reviewed by Simon Fraser.

On systems with no NSScreens, PlatformScreenMac's screenData map is not populated; rendererIDForDisplay
will thus hit an assertion rather than returning 0. Removing the assertion for now.

Covered by existing tests.

* platform/mac/PlatformScreenMac.mm:
(WebCore::rendererIDForDisplay):

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

Source/WebCore/ChangeLog
Source/WebCore/platform/mac/PlatformScreenMac.mm

index 8909e21..81c20c0 100644 (file)
@@ -1,3 +1,19 @@
+2018-07-25  Justin Fan  <justin_fan@apple.com>
+
+        Systems with no NSScreens hitting assertion in rendererIDForDisplay when creating WebGL context
+        https://bugs.webkit.org/show_bug.cgi?id=188023
+        <rdar://problem/42476622>
+
+        Reviewed by Simon Fraser.
+
+        On systems with no NSScreens, PlatformScreenMac's screenData map is not populated; rendererIDForDisplay
+        will thus hit an assertion rather than returning 0. Removing the assertion for now. 
+
+        Covered by existing tests.
+
+        * platform/mac/PlatformScreenMac.mm:
+        (WebCore::rendererIDForDisplay):
+
 2018-07-25  Zalan Bujtas  <zalan@apple.com>
 
         Build fix after r234215. Unreviewed.
index b3ae988..147f26a 100644 (file)
@@ -204,7 +204,6 @@ GLint rendererIDForDisplay(PlatformDisplayID displayID)
 #else
     return rendererIDForDisplayMask(CGDisplayIDToOpenGLDisplayMask(displayID));
 #endif
-    ASSERT_NOT_REACHED();
     return 0;
 }