Changeset 262811 in webkit

Timestamp:

Jun 9, 2020 2:19:49 PM (4 years ago)

Author:

dino@apple.com

Message:

REGRESSION: [Safari Mojave for High Sierra] Accessing some of the featured pages on apple.com causes the webpage to crash
​https://bugs.webkit.org/show_bug.cgi?id=212940
Source/WebCore:

rdar://63839405

Reviewed by Tim Horton.

The code to use the singleton for a SwitchingGPUClient was assuming it
has always been set, which was not the case when
ENABLE(WEBPROCESS_WINDOWSERVER_BLOCKING) was not true.

• platform/graphics/opengl/GraphicsContextGLOpenGLManager.cpp: Check the state of the

singleton before calling it.
(WebCore::GraphicsContextGLOpenGLManager::updateHighPerformanceState):
(WebCore::GraphicsContextGLOpenGLManager::disableHighPerformanceGPUTimerFired):

• platform/graphics/mac/SwitchingGPUClient.h: Return a pointer to the singleton which

will allow the code to check for its existence.
(WebCore::SwitchingGPUClient::singletonIfExists):

Source/WebKit:

Reviewed by Tim Horton.

The code to use the singleton for a SwitchingGPUClient was assuming it
has always been set, which was not the case when
ENABLE(WEBPROCESS_WINDOWSERVER_BLOCKING) was not true.

• WebProcess/cocoa/WebProcessCocoa.mm: Set the singleton unconditionally.

(WebKit::WebProcess::platformInitializeProcess):

Location:

trunk/Source

Files:

• WebCore/ChangeLog (modified) (1 diff)
• WebCore/platform/graphics/mac/SwitchingGPUClient.cpp (modified) (1 diff)
• WebCore/platform/graphics/mac/SwitchingGPUClient.h (modified) (1 diff)
• WebCore/platform/graphics/opengl/GraphicsContextGLOpenGLManager.cpp (modified) (2 diffs)
• WebKit/ChangeLog (modified) (1 diff)
• WebKit/WebProcess/cocoa/WebProcessCocoa.mm (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2020-06-09  Dean Jackson  <dino@apple.com>
+
+        REGRESSION: [Safari Mojave for High Sierra] Accessing some of the featured pages on apple.com causes the webpage to crash
+        https://bugs.webkit.org/show_bug.cgi?id=212940
+        rdar://63839405
+
+        Reviewed by Tim Horton.
+
+        The code to use the singleton for a SwitchingGPUClient was assuming it
+        has always been set, which was not the case when
+        ENABLE(WEBPROCESS_WINDOWSERVER_BLOCKING) was not true.
+
+        * platform/graphics/opengl/GraphicsContextGLOpenGLManager.cpp: Check the state of the
+        singleton before calling it.
+        (WebCore::GraphicsContextGLOpenGLManager::updateHighPerformanceState):
+        (WebCore::GraphicsContextGLOpenGLManager::disableHighPerformanceGPUTimerFired):
+        * platform/graphics/mac/SwitchingGPUClient.h: Return a pointer to the singleton which
+        will allow the code to check for its existence.
+        (WebCore::SwitchingGPUClient::singletonIfExists):
+
 2020-06-09  Sam Weinig  <weinig@apple.com>
 

trunk/Source/WebCore/platform/graphics/mac/SwitchingGPUClient.cpp

@@ -31 +31 @@
 SwitchingGPUClient* SwitchingGPUClient::m_singleton = nullptr;
 
-SwitchingGPUClient& SwitchingGPUClient::singleton()
+SwitchingGPUClient* SwitchingGPUClient::singletonIfExists()
 {
-    ASSERT(m_singleton);
-    return *m_singleton;
+    return m_singleton;
 }
 

trunk/Source/WebCore/platform/graphics/mac/SwitchingGPUClient.h

@@ -30 +30 @@
 class SwitchingGPUClient {
 public:
-    WEBCORE_EXPORT static SwitchingGPUClient& singleton();
+    WEBCORE_EXPORT static SwitchingGPUClient* singletonIfExists();
     WEBCORE_EXPORT static void setSingleton(SwitchingGPUClient&);
 

trunk/Source/WebCore/platform/graphics/opengl/GraphicsContextGLOpenGLManager.cpp

@@ -237 +237 @@
             m_requestingHighPerformance = true;
 #if PLATFORM(MAC)
-            SwitchingGPUClient::singleton().requestHighPerformanceGPU();
+            if (auto* singleton = SwitchingGPUClient::singletonIfExists())
+                singleton->requestHighPerformanceGPU();
 #endif
         }
@@ -263 +264 @@
     m_requestingHighPerformance = false;
 #if PLATFORM(MAC) && (USE(OPENGL) || USE(ANGLE))
-    SwitchingGPUClient::singleton().releaseHighPerformanceGPU();
+    if (auto* singleton = SwitchingGPUClient::singletonIfExists())
+        singleton->releaseHighPerformanceGPU();
 #endif
 }

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2020-06-09  Dean Jackson  <dino@apple.com>
+
+        REGRESSION: [Safari Mojave for High Sierra] Accessing some of the featured pages on apple.com causes the webpage to crash
+        https://bugs.webkit.org/show_bug.cgi?id=212940
+
+        Reviewed by Tim Horton.
+
+        The code to use the singleton for a SwitchingGPUClient was assuming it
+        has always been set, which was not the case when
+        ENABLE(WEBPROCESS_WINDOWSERVER_BLOCKING) was not true.
+
+        * WebProcess/cocoa/WebProcessCocoa.mm: Set the singleton unconditionally.
+        (WebKit::WebProcess::platformInitializeProcess):
+
 2020-06-09  Wenson Hsieh  <wenson_hsieh@apple.com>
 

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

@@ -503 +503 @@
     // Make sure that we close any WindowServer connections after checking in with Launch Services.
     CGSShutdownServerConnections();
-
-    SwitchingGPUClient::setSingleton(WebSwitchingGPUClient::singleton());
 #else
 
@@ -513 +511 @@
     }
 #endif // ENABLE(WEBPROCESS_WINDOWSERVER_BLOCKING)
+
+    SwitchingGPUClient::setSingleton(WebSwitchingGPUClient::singleton());
 #endif // PLATFORM(MAC)