Attachment 342288 Details for Bug 186379 – Patch for landing

[patch] Patch for landing

patch186379.txt (text/plain), 6.46 KB, created by Per Arne Vollan on 2018-06-08 10:36:10 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Per Arne Vollan

Created: 2018-06-08 10:36:10 PDT

Size: 6.46 KB

patch

obsolete

>Index: Source/WebKit/ChangeLog
>===================================================================
>--- Source/WebKit/ChangeLog	(revision 232627)
>+++ Source/WebKit/ChangeLog	(working copy)
>@@ -1,3 +1,22 @@
>+2018-06-08  Per Arne Vollan  <pvollan@apple.com>
>+
>+        Run display links in the UI process when ENABLE(WEBPROCESS_WINDOWSERVER_BLOCKING) is true.
>+        https://bugs.webkit.org/show_bug.cgi?id=186379
>+
>+        Reviewed by Brent Fulgham.
>+
>+        Replace __MAC_OS_X_VERSION_MIN_REQUIRED >= 101400 with ENABLE(WEBPROCESS_WINDOWSERVER_BLOCKING).
>+
>+        * UIProcess/WebPageProxy.cpp:
>+        (WebKit::WebPageProxy::dispatchActivityStateChange):
>+        * UIProcess/WebPageProxy.h:
>+        * UIProcess/WebPageProxy.messages.in:
>+        * UIProcess/mac/DisplayLink.cpp:
>+        * UIProcess/mac/DisplayLink.h:
>+        * UIProcess/mac/WebPageProxyMac.mm:
>+        * WebProcess/WebPage/DrawingArea.cpp:
>+        * WebProcess/WebPage/mac/DrawingAreaMac.cpp:
>+
> 2018-06-07  Chris Dumez  <cdumez@apple.com>
> 
>         Add base class to get WeakPtrFactory member and avoid some boilerplate code
>Index: Source/WebKit/UIProcess/WebPageProxy.cpp
>===================================================================
>--- Source/WebKit/UIProcess/WebPageProxy.cpp	(revision 232626)
>+++ Source/WebKit/UIProcess/WebPageProxy.cpp	(working copy)
>@@ -1598,7 +1598,7 @@
>     if (changed & ActivityState::IsVisible) {
>         if (isViewVisible()) {
>             m_visiblePageToken = m_process->visiblePageToken();
>-#if PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101400
>+#if PLATFORM(MAC) && ENABLE(WEBPROCESS_WINDOWSERVER_BLOCKING)
>             if (m_displayLink)
>                 m_displayLink->resume();
> #endif
>@@ -1610,7 +1610,7 @@
>             // state, it might not send back a reply (since it won't paint anything if the web page is hidden) so we
>             // stop the unresponsiveness timer here.
>             m_process->responsivenessTimer().stop();
>-#if PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101400
>+#if PLATFORM(MAC) && ENABLE(WEBPROCESS_WINDOWSERVER_BLOCKING)
>             if (m_displayLink)
>                 m_displayLink->pause();
> #endif
>Index: Source/WebKit/UIProcess/WebPageProxy.h
>===================================================================
>--- Source/WebKit/UIProcess/WebPageProxy.h	(revision 232626)
>+++ Source/WebKit/UIProcess/WebPageProxy.h	(working copy)
>@@ -122,7 +122,7 @@
> #include <WebCore/WebMediaSessionManagerClient.h>
> #endif
> 
>-#if PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101400
>+#if PLATFORM(MAC) && ENABLE(WEBPROCESS_WINDOWSERVER_BLOCKING)
> #include "DisplayLink.h"
> #endif
> 
>@@ -1765,7 +1765,7 @@
>     void didRemoveAttachment(const String& identifier);
> #endif
> 
>-#if PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101400
>+#if PLATFORM(MAC) && ENABLE(WEBPROCESS_WINDOWSERVER_BLOCKING)
>     void startDisplayLink(unsigned observerID);
>     void stopDisplayLink(unsigned observerID);
> #endif
>@@ -2163,7 +2163,7 @@
>     HashMap<String, Ref<WebURLSchemeHandler>> m_urlSchemeHandlersByScheme;
>     HashMap<uint64_t, Ref<WebURLSchemeHandler>> m_urlSchemeHandlersByIdentifier;
>         
>-#if PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101400
>+#if PLATFORM(MAC) && ENABLE(WEBPROCESS_WINDOWSERVER_BLOCKING)
>     std::unique_ptr<DisplayLink> m_displayLink;
> #endif
> 
>Index: Source/WebKit/UIProcess/WebPageProxy.messages.in
>===================================================================
>--- Source/WebKit/UIProcess/WebPageProxy.messages.in	(revision 232626)
>+++ Source/WebKit/UIProcess/WebPageProxy.messages.in	(working copy)
>@@ -524,7 +524,7 @@
>     DidRemoveAttachment(String identifier)
> #endif
> 
>-#if PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101400
>+#if PLATFORM(MAC) && ENABLE(WEBPROCESS_WINDOWSERVER_BLOCKING)
>     StartDisplayLink(unsigned observerID)
>     StopDisplayLink(unsigned observerID)
> #endif
>Index: Source/WebKit/UIProcess/mac/DisplayLink.cpp
>===================================================================
>--- Source/WebKit/UIProcess/mac/DisplayLink.cpp	(revision 232626)
>+++ Source/WebKit/UIProcess/mac/DisplayLink.cpp	(working copy)
>@@ -26,7 +26,7 @@
> #include "config.h"
> #include "DisplayLink.h"
> 
>-#if PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101400
>+#if ENABLE(WEBPROCESS_WINDOWSERVER_BLOCKING)
> 
> #include "DrawingAreaMessages.h"
> #include "WebPageProxy.h"
>Index: Source/WebKit/UIProcess/mac/DisplayLink.h
>===================================================================
>--- Source/WebKit/UIProcess/mac/DisplayLink.h	(revision 232626)
>+++ Source/WebKit/UIProcess/mac/DisplayLink.h	(working copy)
>@@ -25,7 +25,7 @@
> 
> #pragma once
> 
>-#if PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101400
>+#if ENABLE(WEBPROCESS_WINDOWSERVER_BLOCKING)
> 
> #include <CoreVideo/CVDisplayLink.h>
> 
>Index: Source/WebKit/UIProcess/mac/WebPageProxyMac.mm
>===================================================================
>--- Source/WebKit/UIProcess/mac/WebPageProxyMac.mm	(revision 232626)
>+++ Source/WebKit/UIProcess/mac/WebPageProxyMac.mm	(working copy)
>@@ -681,7 +681,7 @@
> }
> #endif
> 
>-#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 101400
>+#if ENABLE(WEBPROCESS_WINDOWSERVER_BLOCKING)
> void WebPageProxy::startDisplayLink(unsigned observerID)
> {
>     ASSERT(hasProcessPrivilege(ProcessPrivilege::CanCommunicateWithWindowServer));
>Index: Source/WebKit/WebProcess/WebPage/DrawingArea.cpp
>===================================================================
>--- Source/WebKit/WebProcess/WebPage/DrawingArea.cpp	(revision 232626)
>+++ Source/WebKit/WebProcess/WebPage/DrawingArea.cpp	(working copy)
>@@ -88,7 +88,7 @@
>     function();
> }
> 
>-#if USE(REQUEST_ANIMATION_FRAME_DISPLAY_MONITOR) && !(PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101400)
>+#if USE(REQUEST_ANIMATION_FRAME_DISPLAY_MONITOR) && !(PLATFORM(MAC) && ENABLE(WEBPROCESS_WINDOWSERVER_BLOCKING))
> RefPtr<WebCore::DisplayRefreshMonitor> DrawingArea::createDisplayRefreshMonitor(PlatformDisplayID)
> {
>     return nullptr;
>Index: Source/WebKit/WebProcess/WebPage/mac/DrawingAreaMac.cpp
>===================================================================
>--- Source/WebKit/WebProcess/WebPage/mac/DrawingAreaMac.cpp	(revision 232626)
>+++ Source/WebKit/WebProcess/WebPage/mac/DrawingAreaMac.cpp	(working copy)
>@@ -38,7 +38,7 @@
> 
> namespace WebKit {
> 
>-#if USE(REQUEST_ANIMATION_FRAME_DISPLAY_MONITOR) && PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101400
>+#if USE(REQUEST_ANIMATION_FRAME_DISPLAY_MONITOR) && ENABLE(WEBPROCESS_WINDOWSERVER_BLOCKING)
> 
> class DisplayRefreshMonitorMac : public DisplayRefreshMonitor {
> public:

Actions: View | Formatted Diff | Diff

Attachments on bug 186379: 342106 | 342108 | 342110 | 342112 | 342288