Changeset 265003 in webkit

Timestamp:

Jul 28, 2020 1:22:03 PM (4 years ago)

Author:

Fujii Hironori

Message:

[WinCairo] ANGLE D3D renderer can crash when PlatformDisplayWin is destructed in IPC thread
​https://bugs.webkit.org/show_bug.cgi?id=214241

Reviewed by Don Olmstead.

Web process calls _exit() in IPC thread when the IPC connection is
closed. PlatformDisplay::sharedDisplay has a static variable of
std::unique_ptr<PlatformDisplay> to ensure it will be destructed
on the process termination. This rarely causes crashes in ANGLE
because ANGLE D3D renderer isn't thread-safe at the moment.

• platform/graphics/PlatformDisplay.cpp:

(WebCore::PlatformDisplay::sharedDisplay): Don't destruct
PlatformDisplay for PLATFORM(WIN). Use unique_ptr::release to leak it.

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/graphics/PlatformDisplay.cpp (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2020-07-28  Fujii Hironori  <Hironori.Fujii@sony.com>
+
+        [WinCairo] ANGLE D3D renderer can crash when PlatformDisplayWin is destructed in IPC thread
+        https://bugs.webkit.org/show_bug.cgi?id=214241
+
+        Reviewed by Don Olmstead.
+
+        Web process calls _exit() in IPC thread when the IPC connection is
+        closed. PlatformDisplay::sharedDisplay has a static variable of
+        std::unique_ptr<PlatformDisplay> to ensure it will be destructed
+        on the process termination. This rarely causes crashes in ANGLE
+        because ANGLE D3D renderer isn't thread-safe at the moment.
+
+        * platform/graphics/PlatformDisplay.cpp:
+        (WebCore::PlatformDisplay::sharedDisplay): Don't destruct
+        PlatformDisplay for PLATFORM(WIN). Use unique_ptr::release to leak it.
+
 2020-07-28  Clark Wang  <clark_wang@apple.com>
 

trunk/Source/WebCore/platform/graphics/PlatformDisplay.cpp

@@ -127 +127 @@
 PlatformDisplay& PlatformDisplay::sharedDisplay()
 {
+#if PLATFORM(WIN)
+    // ANGLE D3D renderer isn't thread-safe. Don't destruct it on non-main threads which calls _exit().
+    ASSERT(isMainThread());
+    static PlatformDisplay* display = createPlatformDisplay().release();
+    return *display;
+#else
     static std::once_flag onceFlag;
     IGNORE_CLANG_WARNINGS_BEGIN("exit-time-destructors")
@@ -135 +141 @@
     });
     return *display;
+#endif
 }