Changeset 260614 in webkit

Timestamp:

Apr 23, 2020 6:08:37 PM (4 years ago)

Author:

Simon Fraser

Message:

Bounce displayWasRefreshed() via EventDispatcher
​https://bugs.webkit.org/show_bug.cgi?id=208778

Reviewed by Antti Koivisto.

Allow the WebContent process to be notified of display refresh off the main thread, so other
threads like the scrolling thread can respond without being blocked. Achieve this
by having EventDispatcher receive the IPC message, then bounce it to the main thread.

• UIProcess/mac/DisplayLink.cpp:

(WebKit::DisplayLink::displayLinkCallback):

• WebProcess/WebPage/EventDispatcher.cpp:

(WebKit::EventDispatcher::displayWasRefreshed):

• WebProcess/WebPage/EventDispatcher.h:
• WebProcess/WebPage/EventDispatcher.messages.in:
• WebProcess/WebProcess.h:
• WebProcess/cocoa/WebProcessCocoa.mm:

(WebKit::WebProcess::displayWasRefreshed):

Location:

trunk/Source/WebKit

Files:

• ChangeLog (modified) (1 diff)
• UIProcess/mac/DisplayLink.cpp (modified) (3 diffs)
• WebProcess/WebPage/EventDispatcher.cpp (modified) (2 diffs)
• WebProcess/WebPage/EventDispatcher.h (modified) (2 diffs)
• WebProcess/WebPage/EventDispatcher.messages.in (modified) (1 diff)
• WebProcess/WebProcess.h (modified) (1 diff)
• WebProcess/WebProcess.messages.in (modified) (1 diff)
• WebProcess/cocoa/WebProcessCocoa.mm (modified) (1 diff)

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2020-04-23  Simon Fraser  <simon.fraser@apple.com>
+
+        Bounce displayWasRefreshed() via EventDispatcher
+        https://bugs.webkit.org/show_bug.cgi?id=208778
+
+        Reviewed by Antti Koivisto.
+
+        Allow the WebContent process to be notified of display refresh off the main thread, so other
+        threads like the scrolling thread can respond without being blocked. Achieve this
+        by having EventDispatcher receive the IPC message, then bounce it to the main thread.
+
+        * UIProcess/mac/DisplayLink.cpp:
+        (WebKit::DisplayLink::displayLinkCallback):
+        * WebProcess/WebPage/EventDispatcher.cpp:
+        (WebKit::EventDispatcher::displayWasRefreshed):
+        * WebProcess/WebPage/EventDispatcher.h:
+        * WebProcess/WebPage/EventDispatcher.messages.in:
+        * WebProcess/WebProcess.h:
+        * WebProcess/cocoa/WebProcessCocoa.mm:
+        (WebKit::WebProcess::displayWasRefreshed):
+
 2020-04-23  David Kilzer  <ddkilzer@apple.com>
 

trunk/Source/WebKit/UIProcess/mac/DisplayLink.cpp

@@ -29 +29 @@
 #if ENABLE(WEBPROCESS_WINDOWSERVER_BLOCKING)
 
-#include "WebProcessMessages.h"
+#include "EventDispatcherMessages.h"
 #include <wtf/ProcessPrivilege.h>
 
@@ -125 +125 @@
     LockHolder locker(displayLink->m_observersLock);
     for (auto& connection : displayLink->m_observers.keys())
-        connection->send(Messages::WebProcess::DisplayWasRefreshed(displayLink->m_displayID), 0);
+        connection->send(Messages::EventDispatcher::DisplayWasRefreshed(displayLink->m_displayID), 0);
     return kCVReturnSuccess;
 }
@@ -131 +131 @@
 } // namespace WebKit
 
-#endif
+#endif // ENABLE(WEBPROCESS_WINDOWSERVER_BLOCKING)

trunk/Source/WebKit/WebProcess/WebPage/EventDispatcher.cpp

@@ -43 +43 @@
 #endif
 
+#if ENABLE(WEBPROCESS_WINDOWSERVER_BLOCKING)
+#include <WebCore/DisplayRefreshMonitorManager.h>
+#endif
+
 #if ENABLE(SCROLLING_THREAD)
 #include <WebCore/ScrollingThread.h>
@@ -259 +263 @@
 #endif
 
+#if ENABLE(WEBPROCESS_WINDOWSERVER_BLOCKING)
+void EventDispatcher::displayWasRefreshed(PlatformDisplayID displayID)
+{
+    RunLoop::main().dispatch([displayID]() {
+        DisplayRefreshMonitorManager::sharedManager().displayWasUpdated(displayID);
+    });
+}
+#endif
+
 } // namespace WebKit

trunk/Source/WebKit/WebProcess/WebPage/EventDispatcher.h

@@ -44 +44 @@
 namespace WebCore {
 class ThreadedScrollingTree;
+using PlatformDisplayID = uint32_t;
 }
 
@@ -98 +99 @@
 #endif
 
+#if ENABLE(WEBPROCESS_WINDOWSERVER_BLOCKING)
+    void displayWasRefreshed(WebCore::PlatformDisplayID);
+#endif
+
     Ref<WorkQueue> m_queue;
 

trunk/Source/WebKit/WebProcess/WebPage/EventDispatcher.messages.in

@@ -29 +29 @@
     GestureEvent(WebCore::PageIdentifier pageID, WebKit::WebGestureEvent event)
 #endif
+#if ENABLE(WEBPROCESS_WINDOWSERVER_BLOCKING)
+    DisplayWasRefreshed(uint32_t displayID)
+#endif
 }

trunk/Source/WebKit/WebProcess/WebProcess.h

@@ -476 +476 @@
     void scrollerStylePreferenceChanged(bool useOverlayScrollbars);
     void displayConfigurationChanged(CGDirectDisplayID, CGDisplayChangeSummaryFlags);
-    void displayWasRefreshed(CGDirectDisplayID);
 #endif
 

trunk/Source/WebKit/WebProcess/WebProcess.messages.in

@@ -120 +120 @@
     ScrollerStylePreferenceChanged(bool useOvelayScrollbars)
     DisplayConfigurationChanged(CGDirectDisplayID displayID, CGDisplayChangeSummaryFlags flags)
-    DisplayWasRefreshed(uint32_t displayID)
 #endif
 

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

@@ -876 +876 @@
     GraphicsContextGLOpenGLManager::displayWasReconfigured(displayID, flags, nullptr);
 }
-    
-void WebProcess::displayWasRefreshed(CGDirectDisplayID displayID)
-{
-    DisplayRefreshMonitorManager::sharedManager().displayWasUpdated(displayID);
-}
 #endif