Attachment 391294 Details for Bug 208009 – Patch

[patch] Patch

bug-208009-20200220091104.patch (text/plain), 3.67 KB, created by youenn fablet on 2020-02-20 09:11:04 PST

(hide)

Description:

Filename:

MIME Type:

Creator: youenn fablet

Created: 2020-02-20 09:11:04 PST

Size: 3.67 KB

patch

obsolete

>Subversion Revision: 256925
>diff --git a/Source/WebKit/ChangeLog b/Source/WebKit/ChangeLog
>index 5a342b5fd0f00415996906be2ed8e5494c04cb8a..3d7d0ce4c32988566232d85598fd4fe855870ed9 100644
>--- a/Source/WebKit/ChangeLog
>+++ b/Source/WebKit/ChangeLog
>@@ -1,3 +1,19 @@
>+2020-02-20  Youenn Fablet  <youenn@apple.com>
>+
>+        [iOS] GPUProcess needs to provide the parent PID before starting camera capture
>+        https://bugs.webkit.org/show_bug.cgi?id=208009
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        Like we do when capturing in WebProcess, we need to provide the parent PID before starting camera capture.
>+        Implement this in GPU process whenever creating a camera source.
>+
>+        * GPUProcess/GPUConnectionToWebProcess.cpp:
>+        * UIProcess/Cocoa/UserMediaCaptureManagerProxy.cpp:
>+        (WebKit::UserMediaCaptureManagerProxy::createMediaSourceForCaptureDeviceWithConstraints):
>+        * UIProcess/Cocoa/UserMediaCaptureManagerProxy.h:
>+        (WebKit::UserMediaCaptureManagerProxy::ConnectionProxy::willStartCameraCapture):
>+
> 2020-02-19  Youenn Fablet  <youenn@apple.com>
> 
>         Add support for AudioSession handling in GPUProcess for capture
>diff --git a/Source/WebKit/GPUProcess/GPUConnectionToWebProcess.cpp b/Source/WebKit/GPUProcess/GPUConnectionToWebProcess.cpp
>index f2381199c203191a13e14446ea77d2c84f10c1a8..a394e09431e02768fa10747cecf2b93e9df91625 100644
>--- a/Source/WebKit/GPUProcess/GPUConnectionToWebProcess.cpp
>+++ b/Source/WebKit/GPUProcess/GPUConnectionToWebProcess.cpp
>@@ -79,6 +79,7 @@ private:
>     void removeMessageReceiver(IPC::StringReference messageReceiverName) final { }
>     IPC::Connection& connection() final { return m_process.connection(); }
>     PlatformMediaSessionManager& sessionManager() final { return m_process.sessionManager(); }
>+    void willStartCameraCapture() final { sessionManager().prepareToSendUserMediaPermissionRequest(); }
> 
>     GPUConnectionToWebProcess& m_process;
> };
>diff --git a/Source/WebKit/UIProcess/Cocoa/UserMediaCaptureManagerProxy.cpp b/Source/WebKit/UIProcess/Cocoa/UserMediaCaptureManagerProxy.cpp
>index 9256858685cae4d32d4f03a94b2c74a6099a2b8e..bdafa53eabed86cca319b2ab38bc411c8dda05e3 100644
>--- a/Source/WebKit/UIProcess/Cocoa/UserMediaCaptureManagerProxy.cpp
>+++ b/Source/WebKit/UIProcess/Cocoa/UserMediaCaptureManagerProxy.cpp
>@@ -193,8 +193,10 @@ void UserMediaCaptureManagerProxy::createMediaSourceForCaptureDeviceWithConstrai
>         break;
>     case WebCore::CaptureDevice::DeviceType::Camera:
>         sourceOrError = RealtimeMediaSourceCenter::singleton().videoCaptureFactory().createVideoCaptureSource(device, WTFMove(hashSalt), &constraints);
>-        if (sourceOrError)
>+        if (sourceOrError) {
>             sourceOrError.captureSource->monitorOrientation(m_orientationNotifier);
>+            m_connectionProxy->willStartCameraCapture();
>+        }
>         break;
>     case WebCore::CaptureDevice::DeviceType::Screen:
>     case WebCore::CaptureDevice::DeviceType::Window:
>diff --git a/Source/WebKit/UIProcess/Cocoa/UserMediaCaptureManagerProxy.h b/Source/WebKit/UIProcess/Cocoa/UserMediaCaptureManagerProxy.h
>index 60d39e185ec82b66af8f1e4822eeeae251b928b1..27bc770c0d9c9167a49a7d290faffd3992864892 100644
>--- a/Source/WebKit/UIProcess/Cocoa/UserMediaCaptureManagerProxy.h
>+++ b/Source/WebKit/UIProcess/Cocoa/UserMediaCaptureManagerProxy.h
>@@ -54,6 +54,7 @@ public:
>         virtual void removeMessageReceiver(IPC::StringReference) = 0;
>         virtual IPC::Connection& connection() = 0;
>         virtual WebCore::PlatformMediaSessionManager& sessionManager() = 0;
>+        virtual void willStartCameraCapture() { }
>     };
>     explicit UserMediaCaptureManagerProxy(UniqueRef<ConnectionProxy>&&);
>     ~UserMediaCaptureManagerProxy();

Actions: View | Formatted Diff | Diff

Attachments on bug 208009: 391294