Title: [234224] trunk/Source/WebCore
Revision
234224
Author
commit-qu...@webkit.org
Date
2018-07-25 17:34:10 -0700 (Wed, 25 Jul 2018)

Log Message

Systems with no NSScreens hitting assertion in rendererIDForDisplay when creating WebGL context
https://bugs.webkit.org/show_bug.cgi?id=188023
<rdar://problem/42476622>

Patch by Justin Fan <justin_...@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):

Modified Paths

Diff

Modified: trunk/Source/WebCore/ChangeLog (234223 => 234224)


--- trunk/Source/WebCore/ChangeLog	2018-07-26 00:29:56 UTC (rev 234223)
+++ trunk/Source/WebCore/ChangeLog	2018-07-26 00:34:10 UTC (rev 234224)
@@ -1,3 +1,19 @@
+2018-07-25  Justin Fan  <justin_...@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  <za...@apple.com>
 
         Build fix after r234215. Unreviewed.

Modified: trunk/Source/WebCore/platform/mac/PlatformScreenMac.mm (234223 => 234224)


--- trunk/Source/WebCore/platform/mac/PlatformScreenMac.mm	2018-07-26 00:29:56 UTC (rev 234223)
+++ trunk/Source/WebCore/platform/mac/PlatformScreenMac.mm	2018-07-26 00:34:10 UTC (rev 234224)
@@ -204,7 +204,6 @@
 #else
     return rendererIDForDisplayMask(CGDisplayIDToOpenGLDisplayMask(displayID));
 #endif
-    ASSERT_NOT_REACHED();
     return 0;
 }
 
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to