Changeset 267599 in webkit

Timestamp:

Sep 25, 2020, 3:09:29 PM (6 years ago)

Author:

Peng Liu

Message:

Replace the usages of (IPC::Attachment fencePort) with IPC::MachPort
​https://bugs.webkit.org/show_bug.cgi?id=207683

Reviewed by Daniel Bates.

No new tests, no functional change.

• UIProcess/Cocoa/VideoFullscreenManagerProxy.mm:

(WebKit::VideoFullscreenManagerProxy::setVideoLayerFrame): Replace the
IPC::Attachment argument with a MachSendRight.

• WebProcess/cocoa/VideoFullscreenManager.h:
• WebProcess/cocoa/VideoFullscreenManager.messages.in:
• WebProcess/cocoa/VideoFullscreenManager.mm:

(WebKit::VideoFullscreenManager::setVideoLayerFrameFenced):
r232451 adds a check for mach port disposition, which is not necessary now.
Because ArgumentCoder<MachSendRight>::decode() provides the check.

• UIProcess/WebPageProxy.cpp:

(WebKit::WebPageProxy::setTopContentInset): Replace the IPC::Attachment
argument with a MachSendRight.

• WebProcess/WebPage/WebPage.cpp:

(WebKit::WebPage::setTopContentInsetFenced): Ditto.
r232451 adds a check for mach port disposition, which is not necessary now.
Because ArgumentCoder<MachSendRight>::decode() provides the check.

• WebProcess/WebPage/WebPage.h:
• WebProcess/WebPage/WebPage.messages.in:

Location:

trunk/Source/WebKit

Files:

• ChangeLog (modified) (1 diff)
• UIProcess/Cocoa/VideoFullscreenManagerProxy.mm (modified) (1 diff)
• UIProcess/WebPageProxy.cpp (modified) (1 diff)
• WebProcess/WebPage/WebPage.cpp (modified) (1 diff)
• WebProcess/WebPage/WebPage.h (modified) (1 diff)
• WebProcess/WebPage/WebPage.messages.in (modified) (1 diff)
• WebProcess/cocoa/VideoFullscreenManager.h (modified) (2 diffs)
• WebProcess/cocoa/VideoFullscreenManager.messages.in (modified) (1 diff)
• WebProcess/cocoa/VideoFullscreenManager.mm (modified) (2 diffs)

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2020-09-25  Peng Liu  <peng.liu6@apple.com>
+
+        Replace the usages of (IPC::Attachment fencePort) with IPC::MachPort
+        https://bugs.webkit.org/show_bug.cgi?id=207683
+
+        Reviewed by Daniel Bates.
+
+        No new tests, no functional change.
+
+        * UIProcess/Cocoa/VideoFullscreenManagerProxy.mm:
+        (WebKit::VideoFullscreenManagerProxy::setVideoLayerFrame): Replace the
+        IPC::Attachment argument with a MachSendRight.
+        * WebProcess/cocoa/VideoFullscreenManager.h:
+        * WebProcess/cocoa/VideoFullscreenManager.messages.in:
+        * WebProcess/cocoa/VideoFullscreenManager.mm:
+        (WebKit::VideoFullscreenManager::setVideoLayerFrameFenced):
+        r232451 adds a check for mach port disposition, which is not necessary now.
+        Because ArgumentCoder<MachSendRight>::decode() provides the check.
+
+        * UIProcess/WebPageProxy.cpp:
+        (WebKit::WebPageProxy::setTopContentInset): Replace the IPC::Attachment
+        argument with a MachSendRight.
+        * WebProcess/WebPage/WebPage.cpp:
+        (WebKit::WebPage::setTopContentInsetFenced): Ditto.
+        r232451 adds a check for mach port disposition, which is not necessary now.
+        Because ArgumentCoder<MachSendRight>::decode() provides the check.
+        * WebProcess/WebPage/WebPage.h:
+        * WebProcess/WebPage/WebPage.messages.in:
+
 2020-09-25  Wenson Hsieh  <wenson_hsieh@apple.com>
 

trunk/Source/WebKit/UIProcess/Cocoa/VideoFullscreenManagerProxy.mm

@@ -789 +789 @@
 void VideoFullscreenManagerProxy::setVideoLayerFrame(PlaybackSessionContextIdentifier contextId, WebCore::FloatRect frame)
 {
-    @autoreleasepool {
-#if PLATFORM(IOS_FAMILY)
-        mach_port_name_t fencePort = [UIWindow _synchronizeDrawingAcrossProcesses];
-#else
-        MachSendRight fenceSendRight;
-        if (DrawingAreaProxy* drawingArea = m_page->drawingArea())
-            fenceSendRight = drawingArea->createFence();
-        mach_port_name_t fencePort = fenceSendRight.leakSendRight();
-#endif
-
-        m_page->send(Messages::VideoFullscreenManager::SetVideoLayerFrameFenced(contextId, frame, IPC::Attachment(fencePort, MACH_MSG_TYPE_MOVE_SEND)));
-    }
+#if PLATFORM(IOS_FAMILY)
+    auto fenceSendRight = MachSendRight::adopt([UIWindow _synchronizeDrawingAcrossProcesses]);
+#else
+    MachSendRight fenceSendRight;
+    if (DrawingAreaProxy* drawingArea = m_page->drawingArea())
+        fenceSendRight = drawingArea->createFence();
+#endif
+
+    m_page->send(Messages::VideoFullscreenManager::SetVideoLayerFrameFenced(contextId, frame, fenceSendRight));
 }
 

trunk/Source/WebKit/UIProcess/WebPageProxy.cpp

@@ -1822 +1822 @@
         return;
 #if PLATFORM(COCOA)
-    MachSendRight fence = m_drawingArea->createFence();
-
-    auto fenceAttachment = IPC::Attachment(fence.leakSendRight(), MACH_MSG_TYPE_MOVE_SEND);
-    send(Messages::WebPage::SetTopContentInsetFenced(contentInset, fenceAttachment));
+    send(Messages::WebPage::SetTopContentInsetFenced(contentInset, m_drawingArea->createFence()));
 #else
     send(Messages::WebPage::SetTopContentInset(contentInset));

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

@@ -3174 +3174 @@
 
 #if PLATFORM(COCOA)
-void WebPage::setTopContentInsetFenced(float contentInset, IPC::Attachment fencePort)
-{
-    if (fencePort.disposition() != MACH_MSG_TYPE_MOVE_SEND) {
-        LOG(Layers, "WebPage::setTopContentInsetFenced(%g, fencePort) Received an invalid fence port: %d, disposition: %d", contentInset, fencePort.port(), fencePort.disposition());
-        return;
-    }
-
-    m_drawingArea->addFence(MachSendRight::create(fencePort.port()));
-
+void WebPage::setTopContentInsetFenced(float contentInset, const WTF::MachSendRight& machSendRight)
+{
+    m_drawingArea->addFence(machSendRight);
     setTopContentInset(contentInset);
-
-    deallocateSendRightSafely(fencePort.port());
 }
 #endif

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

@@ -1532 +1532 @@
 
 #if PLATFORM(COCOA)
-    void setTopContentInsetFenced(float, IPC::Attachment);
+    void setTopContentInsetFenced(float, const WTF::MachSendRight&);
 #endif
     void setTopContentInset(float);

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

@@ -35 +35 @@
 
 #if PLATFORM(COCOA)
-    SetTopContentInsetFenced(float contentInset, IPC::Attachment fencePort)
+    SetTopContentInsetFenced(float contentInset, MachSendRight machSendRight)
 #endif
     SetTopContentInset(float contentInset)

trunk/Source/WebKit/WebProcess/cocoa/VideoFullscreenManager.h

@@ -41 +41 @@
 
 namespace IPC {
-class Attachment;
 class Connection;
 class Decoder;
 class MessageReceiver;
+}
+
+namespace WTF {
+class MachSendRight;
 }
 
@@ -152 +155 @@
     void didEnterFullscreen(PlaybackSessionContextIdentifier, Optional<WebCore::FloatSize>);
     void didCleanupFullscreen(PlaybackSessionContextIdentifier);
-    void setVideoLayerFrameFenced(PlaybackSessionContextIdentifier, WebCore::FloatRect bounds, IPC::Attachment fencePort);
+    void setVideoLayerFrameFenced(PlaybackSessionContextIdentifier, WebCore::FloatRect bounds, const WTF::MachSendRight&);
     void setVideoLayerGravityEnum(PlaybackSessionContextIdentifier, unsigned gravity);
     void fullscreenModeChanged(PlaybackSessionContextIdentifier, WebCore::HTMLMediaElementEnums::VideoFullscreenMode);

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

@@ -32 +32 @@
     DidEnterFullscreen(WebKit::PlaybackSessionContextIdentifier contextId, Optional<WebCore::FloatSize> size)
     DidCleanupFullscreen(WebKit::PlaybackSessionContextIdentifier contextId)
-    SetVideoLayerFrameFenced(WebKit::PlaybackSessionContextIdentifier contextId, WebCore::FloatRect bounds, IPC::Attachment fencePort)
+    SetVideoLayerFrameFenced(WebKit::PlaybackSessionContextIdentifier contextId, WebCore::FloatRect bounds, MachSendRight machSendRight)
     SetVideoLayerGravityEnum(WebKit::PlaybackSessionContextIdentifier contextId, unsigned gravity)
     FullscreenModeChanged(WebKit::PlaybackSessionContextIdentifier contextId, WebCore::HTMLMediaElementEnums::VideoFullscreenMode videoFullscreenMode)

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

@@ -544 +544 @@
 }
     
-void VideoFullscreenManager::setVideoLayerFrameFenced(PlaybackSessionContextIdentifier contextId, WebCore::FloatRect bounds, IPC::Attachment fencePort)
+void VideoFullscreenManager::setVideoLayerFrameFenced(PlaybackSessionContextIdentifier contextId, WebCore::FloatRect bounds, const WTF::MachSendRight& machSendRight)
 {
     LOG(Fullscreen, "VideoFullscreenManager::setVideoLayerFrameFenced(%p, %x)", this, contextId);
-
-    if (fencePort.disposition() != MACH_MSG_TYPE_MOVE_SEND) {
-        LOG(Fullscreen, "VideoFullscreenManager::setVideoLayerFrameFenced(%p, %x) Received an invalid fence port: %d, disposition: %d", this, contextId, fencePort.port(), fencePort.disposition());
-        return;
-    }
 
     auto [model, interface] = ensureModelAndInterface(contextId);
@@ -561 +556 @@
     
     if (auto* context = interface->layerHostingContext())
-        context->setFencePort(fencePort.port());
+        context->setFencePort(machSendRight.sendRight());
     model->setVideoLayerFrame(bounds);
-    deallocateSendRightSafely(fencePort.port());
 }