Changeset 272728 in webkit

Timestamp:

Feb 11, 2021, 8:09:10 AM (4 years ago)

Author:

Simon Fraser

Message:

Crash when UI-side compositing is enabled on macOS
​https://bugs.webkit.org/show_bug.cgi?id=221740

Reviewed by Tim Horton.

When UI-side compositing is enabled on macOS, WebProcess::updatePageScreenProperties()
crashes because allOf(m_pageMap.values(), ...) return a null WebPage. We're inside
WebProcess::createWebPage() here, so haven't set the HashMap value yet.

• WebProcess/cocoa/WebProcessCocoa.mm:

(WebKit::WebProcess::updatePageScreenProperties):

Location:

trunk/Source/WebKit

Files:

• ChangeLog (modified) (1 diff)
• WebProcess/cocoa/WebProcessCocoa.mm (modified) (1 diff)

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2021-02-11  Simon Fraser  <simon.fraser@apple.com>
+
+        Crash when UI-side compositing is enabled on macOS
+        https://bugs.webkit.org/show_bug.cgi?id=221740
+
+        Reviewed by Tim Horton.
+
+        When UI-side compositing is enabled on macOS, WebProcess::updatePageScreenProperties()
+        crashes because allOf(m_pageMap.values(), ...) return a null WebPage. We're inside 
+        WebProcess::createWebPage() here, so haven't set the HashMap value yet.
+
+        * WebProcess/cocoa/WebProcessCocoa.mm:
+        (WebKit::WebProcess::updatePageScreenProperties):
+
 2021-02-11  Per Arne  <pvollan@apple.com>
 

trunk/Source/WebKit/WebProcess/cocoa/WebProcessCocoa.mm

@@ -1167 +1167 @@
 
     bool allPagesAreOnHDRScreens = allOf(m_pageMap.values(), [] (auto& page) {
-        return screenSupportsHighDynamicRange(page->mainFrameView());
+        return page && screenSupportsHighDynamicRange(page->mainFrameView());
     });
     setShouldOverrideScreenSupportsHighDynamicRange(true, allPagesAreOnHDRScreens);