Attachment 358577 Details for Bug 193230 – Patch

[patch] Patch

bug-193230-20190108195504.patch (text/plain), 18.82 KB, created by Eric Carlson on 2019-01-07 22:55:06 PST

(hide)

Description:

Filename:

MIME Type:

Creator: Eric Carlson

Created: 2019-01-07 22:55:06 PST

Size: 18.82 KB

patch

obsolete

>Subversion Revision: 239676
>diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
>index 3b718d102b27c05fb479747b9368f58f924e93e2..0afac46af4e95609ad24be921c738a67a91fc1ee 100644
>--- a/Source/WebCore/ChangeLog
>+++ b/Source/WebCore/ChangeLog
>@@ -1,3 +1,27 @@
>+2019-01-07  Eric Carlson  <eric.carlson@apple.com>
>+
>+        Define page media state flags for display capture.
>+        https://bugs.webkit.org/show_bug.cgi?id=193230
>+        <rdar://problem/47095142>
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        Test: fast/mediastream/get-display-media-muted.html
>+
>+        * Modules/mediastream/MediaStreamTrack.cpp:
>+        (WebCore::MediaStreamTrack::mediaState const):
>+        * page/MediaProducer.h:
>+        * platform/mediastream/RealtimeIncomingVideoSource.cpp:
>+        (WebCore::RealtimeIncomingVideoSource::RealtimeIncomingVideoSource):
>+        * platform/mediastream/RealtimeMediaSource.h:
>+        * platform/mediastream/mac/AVVideoCaptureSource.h:
>+        * platform/mediastream/mac/ScreenDisplayCaptureSourceMac.h:
>+        * platform/mediastream/mac/WindowDisplayCaptureSourceMac.h:
>+        * platform/mock/MockRealtimeAudioSource.h:
>+        * platform/mock/MockRealtimeVideoSource.h:
>+        * testing/Internals.cpp:
>+        (WebCore::Internals::pageMediaState):
>+
> 2019-01-07  Zalan Bujtas  <zalan@apple.com>
> 
>         [LFC][BFC] Margin collapsing should not be limited to in-flow non-replaced boxes.
>diff --git a/Source/WebKit/ChangeLog b/Source/WebKit/ChangeLog
>index 4c199aaaae5acbb24d144cde08b4b8dd13b49b07..4780a881859fe729ab11d0f3be179552ba9ef559 100644
>--- a/Source/WebKit/ChangeLog
>+++ b/Source/WebKit/ChangeLog
>@@ -1,3 +1,18 @@
>+2019-01-07  Eric Carlson  <eric.carlson@apple.com>
>+
>+        Define page media state flags for display capture.
>+        https://bugs.webkit.org/show_bug.cgi?id=193230
>+        <rdar://problem/47095142>
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        * UIProcess/API/C/WKPage.cpp:
>+        (WKPageGetMediaState):
>+        * UIProcess/API/C/WKPagePrivate.h:
>+        * WebProcess/cocoa/UserMediaCaptureManager.cpp:
>+        (WebKit::UserMediaCaptureManager::Source::Source):
>+        (WebKit::UserMediaCaptureManager::createCaptureSource):
>+
> 2019-01-07  Alex Christensen  <achristensen@webkit.org>
> 
>         Modernize CacheModel and disk cache fetching and clearing
>diff --git a/Source/WebCore/Modules/mediastream/MediaStreamTrack.cpp b/Source/WebCore/Modules/mediastream/MediaStreamTrack.cpp
>index 6a7f146ca1c4d7e515a154851df9bd37a053d183..f9821e5200ea329980ce45755a0fd8bcf67ac7c1 100644
>--- a/Source/WebCore/Modules/mediastream/MediaStreamTrack.cpp
>+++ b/Source/WebCore/Modules/mediastream/MediaStreamTrack.cpp
>@@ -386,12 +386,13 @@ MediaProducer::MediaStateFlags MediaStreamTrack::mediaState() const
>         if (m_private->isProducingData())
>             return HasActiveAudioCaptureDevice;
>     } else {
>+        auto deviceType = source().deviceType();
>         if (source().interrupted() && !pageCaptureMuted)
>-            return HasInterruptedVideoCaptureDevice;
>+            return deviceType == CaptureDevice::DeviceType::Camera ? HasInterruptedVideoCaptureDevice : HasInterruptedScreenCaptureDevice;
>         if (muted())
>-            return HasMutedVideoCaptureDevice;
>+            return deviceType == CaptureDevice::DeviceType::Camera ? HasMutedVideoCaptureDevice : HasMutedScreenCaptureDevice;
>         if (m_private->isProducingData())
>-            return HasActiveVideoCaptureDevice;
>+            return deviceType == CaptureDevice::DeviceType::Camera ? HasActiveVideoCaptureDevice : HasActiveScreenCaptureDevice;
>     }
> 
>     return IsNotPlaying;
>diff --git a/Source/WebCore/page/MediaProducer.h b/Source/WebCore/page/MediaProducer.h
>index 999a2fd31d6ae793fd66ababe32abf82d1b81b72..6400f925239c219e73891556033c8fd5cadc5c0b 100644
>--- a/Source/WebCore/page/MediaProducer.h
>+++ b/Source/WebCore/page/MediaProducer.h
>@@ -49,10 +49,14 @@ public:
>         HasInterruptedAudioCaptureDevice = 1 << 15,
>         HasInterruptedVideoCaptureDevice = 1 << 16,
>         HasUserInteractedWithMediaElement = 1 << 17,
>+        HasActiveScreenCaptureDevice = 1 << 18,
>+        HasMutedScreenCaptureDevice = 1 << 19,
>+        HasInterruptedScreenCaptureDevice = 1 << 20,
> 
>         AudioCaptureMask = HasActiveAudioCaptureDevice | HasMutedAudioCaptureDevice | HasInterruptedAudioCaptureDevice,
>         VideoCaptureMask = HasActiveVideoCaptureDevice | HasMutedVideoCaptureDevice | HasInterruptedVideoCaptureDevice,
>-        MediaCaptureMask = AudioCaptureMask | VideoCaptureMask,
>+        ScreenCaptureMask = HasActiveScreenCaptureDevice | HasMutedScreenCaptureDevice | HasInterruptedScreenCaptureDevice,
>+        MediaCaptureMask = AudioCaptureMask | VideoCaptureMask | ScreenCaptureMask,
>     };
>     typedef unsigned MediaStateFlags;
> 
>diff --git a/Source/WebCore/platform/mediastream/RealtimeIncomingVideoSource.cpp b/Source/WebCore/platform/mediastream/RealtimeIncomingVideoSource.cpp
>index 907b9b6182ca2bdf78bd0dfcd7d92f9ac28860a2..9c75281c0e164642ddb81de20f94f0e5de627479 100644
>--- a/Source/WebCore/platform/mediastream/RealtimeIncomingVideoSource.cpp
>+++ b/Source/WebCore/platform/mediastream/RealtimeIncomingVideoSource.cpp
>@@ -38,7 +38,7 @@
> namespace WebCore {
> 
> RealtimeIncomingVideoSource::RealtimeIncomingVideoSource(rtc::scoped_refptr<webrtc::VideoTrackInterface>&& videoTrack, String&& videoTrackId)
>-    : RealtimeMediaSource(RealtimeMediaSource::Type::Video, "remote video"_s, WTFMove(videoTrackId))
>+    : RealtimeMediaSource(Type::Video, "remote video"_s, WTFMove(videoTrackId))
>     , m_videoTrack(WTFMove(videoTrack))
> {
>     notifyMutedChange(!m_videoTrack);
>diff --git a/Source/WebCore/platform/mediastream/RealtimeMediaSource.h b/Source/WebCore/platform/mediastream/RealtimeMediaSource.h
>index 166c8df53f755e5fc4580d869e87e959ad3b749b..8e462c7e8869ed268a90496eb7f5bde078e9b5f4 100644
>--- a/Source/WebCore/platform/mediastream/RealtimeMediaSource.h
>+++ b/Source/WebCore/platform/mediastream/RealtimeMediaSource.h
>@@ -161,6 +161,7 @@ public:
>     virtual bool isIsolated() const { return false; }
> 
>     virtual bool isCaptureSource() const { return false; }
>+    virtual CaptureDevice::DeviceType deviceType() const { return CaptureDevice::DeviceType::Unknown; }
> 
>     virtual void monitorOrientation(OrientationNotifier&) { }
> 
>diff --git a/Source/WebCore/platform/mediastream/mac/AVVideoCaptureSource.h b/Source/WebCore/platform/mediastream/mac/AVVideoCaptureSource.h
>index 603817263deeb03849c87186418649c034f1fb0d..88febeabbe22bbed35d9f401110ce452242151b4 100644
>--- a/Source/WebCore/platform/mediastream/mac/AVVideoCaptureSource.h
>+++ b/Source/WebCore/platform/mediastream/mac/AVVideoCaptureSource.h
>@@ -86,6 +86,7 @@ private:
>     void beginConfiguration() final;
>     void commitConfiguration() final;
>     bool isCaptureSource() const final { return true; }
>+    CaptureDevice::DeviceType deviceType() const final { return CaptureDevice::DeviceType::Camera; }
>     bool interrupted() const final;
> 
>     void setSizeAndFrameRateWithPreset(IntSize, double, RefPtr<VideoPreset>) final;
>diff --git a/Source/WebCore/platform/mediastream/mac/ScreenDisplayCaptureSourceMac.h b/Source/WebCore/platform/mediastream/mac/ScreenDisplayCaptureSourceMac.h
>index 939304f58627e77c491b189fa84b595e7194dac4..04b8d8ca832989120084995891e419b8460456dc 100644
>--- a/Source/WebCore/platform/mediastream/mac/ScreenDisplayCaptureSourceMac.h
>+++ b/Source/WebCore/platform/mediastream/mac/ScreenDisplayCaptureSourceMac.h
>@@ -62,6 +62,7 @@ private:
>     void startProducingData() final;
>     void stopProducingData() final;
>     void commitConfiguration() final;
>+    CaptureDevice::DeviceType deviceType() const final { return CaptureDevice::DeviceType::Screen; }
> 
>     bool createDisplayStream();
>     void startDisplayStream();
>diff --git a/Source/WebCore/platform/mediastream/mac/WindowDisplayCaptureSourceMac.h b/Source/WebCore/platform/mediastream/mac/WindowDisplayCaptureSourceMac.h
>index 33d1b817e9a9e45abafe487de35f1d7a31723ae0..5f49f2b3d686259f29374a156fed118da5d63c1f 100644
>--- a/Source/WebCore/platform/mediastream/mac/WindowDisplayCaptureSourceMac.h
>+++ b/Source/WebCore/platform/mediastream/mac/WindowDisplayCaptureSourceMac.h
>@@ -51,6 +51,7 @@ private:
> 
>     DisplayCaptureSourceCocoa::DisplayFrameType generateFrame() final;
>     RealtimeMediaSourceSettings::DisplaySurfaceType surfaceType() const final { return RealtimeMediaSourceSettings::DisplaySurfaceType::Window; }
>+    CaptureDevice::DeviceType deviceType() const final { return CaptureDevice::DeviceType::Window; }
> 
>     RetainPtr<CGImageRef> windowImage();
> 
>diff --git a/Source/WebCore/platform/mock/MockRealtimeAudioSource.h b/Source/WebCore/platform/mock/MockRealtimeAudioSource.h
>index 819b3e8012a58e907a8b51582dee4ea3b0466973..a2f94b7ce7eeb66111239a526a79d60db5725682 100644
>--- a/Source/WebCore/platform/mock/MockRealtimeAudioSource.h
>+++ b/Source/WebCore/platform/mock/MockRealtimeAudioSource.h
>@@ -64,6 +64,7 @@ private:
>     void tick();
> 
>     bool isCaptureSource() const final { return true; }
>+    CaptureDevice::DeviceType deviceType() const final { return CaptureDevice::DeviceType::Microphone; }
> 
>     void delaySamples(Seconds) final;
> 
>diff --git a/Source/WebCore/platform/mock/MockRealtimeVideoSource.h b/Source/WebCore/platform/mock/MockRealtimeVideoSource.h
>index dd215b94ba8f3a6c6ee80a30444d642a9bd6b9e0..3c7e29e2325785e38a41f3bdb50b69e9b920fa0e 100644
>--- a/Source/WebCore/platform/mock/MockRealtimeVideoSource.h
>+++ b/Source/WebCore/platform/mock/MockRealtimeVideoSource.h
>@@ -68,6 +68,7 @@ private:
>     void startProducingData() final;
>     void stopProducingData() final;
>     bool isCaptureSource() const final { return true; }
>+    CaptureDevice::DeviceType deviceType() const final { return CaptureDevice::DeviceType::Camera; }
>     bool supportsSizeAndFrameRate(Optional<int> width, Optional<int> height, Optional<double>) final;
>     void setSizeAndFrameRate(Optional<int> width, Optional<int> height, Optional<double>) final;
>     void setSizeAndFrameRateWithPreset(IntSize, double, RefPtr<VideoPreset>) final;
>diff --git a/Source/WebCore/testing/Internals.cpp b/Source/WebCore/testing/Internals.cpp
>index 3c0a59f1d72f1d4a285a815a4172168d771e823a..6771c7009da019911426589daa9fc1b61ae30cf3 100644
>--- a/Source/WebCore/testing/Internals.cpp
>+++ b/Source/WebCore/testing/Internals.cpp
>@@ -4025,6 +4025,10 @@ String Internals::pageMediaState()
>         string.append("HasMutedVideoCaptureDevice,");
>     if (state & MediaProducer::HasUserInteractedWithMediaElement)
>         string.append("HasUserInteractedWithMediaElement,");
>+    if (state & MediaProducer::HasActiveScreenCaptureDevice)
>+        string.append("HasActiveScreenCaptureDevice,");
>+    if (state & MediaProducer::HasMutedScreenCaptureDevice)
>+        string.append("HasMutedScreenCaptureDevice,");
> 
>     if (string.isEmpty())
>         string.append("IsNotPlaying");
>diff --git a/Source/WebKit/UIProcess/API/C/WKPage.cpp b/Source/WebKit/UIProcess/API/C/WKPage.cpp
>index 63d51b1f15247a7a5c44f7d71ef77bf5b4ba91dd..a34f8a8c9c9f0d802d17ca432b6ae2a0a3e8af07 100644
>--- a/Source/WebKit/UIProcess/API/C/WKPage.cpp
>+++ b/Source/WebKit/UIProcess/API/C/WKPage.cpp
>@@ -2653,6 +2653,10 @@ WKMediaState WKPageGetMediaState(WKPageRef page)
>         state |= kWKMediaHasMutedAudioCaptureDevice;
>     if (coreState & WebCore::MediaProducer::HasMutedVideoCaptureDevice)
>         state |= kWKMediaHasMutedVideoCaptureDevice;
>+    if (coreState & WebCore::MediaProducer::HasActiveScreenCaptureDevice)
>+        state |= kWKMediaHasActiveScreenCaptureDevice;
>+    if (coreState & WebCore::MediaProducer::HasMutedScreenCaptureDevice)
>+        state |= kWKMediaHasMutedScreenCaptureDevice;
> 
>     return state;
> }
>diff --git a/Source/WebKit/UIProcess/API/C/WKPagePrivate.h b/Source/WebKit/UIProcess/API/C/WKPagePrivate.h
>index bb26de8abf15dd4da1a44108efef040251dee2aa..766d4353966f2bb10ee80f1eb41484ddd5eb1a32 100644
>--- a/Source/WebKit/UIProcess/API/C/WKPagePrivate.h
>+++ b/Source/WebKit/UIProcess/API/C/WKPagePrivate.h
>@@ -148,6 +148,8 @@ enum {
>     kWKMediaHasActiveVideoCaptureDevice = 1 << 3,
>     kWKMediaHasMutedAudioCaptureDevice = 1 << 4,
>     kWKMediaHasMutedVideoCaptureDevice = 1 << 5,
>+    kWKMediaHasActiveScreenCaptureDevice = 1 << 6,
>+    kWKMediaHasMutedScreenCaptureDevice = 1 << 7,
> };
> typedef uint32_t WKMediaState;
> 
>diff --git a/Source/WebKit/WebProcess/cocoa/UserMediaCaptureManager.cpp b/Source/WebKit/WebProcess/cocoa/UserMediaCaptureManager.cpp
>index de25c69e9129d5d3181dd7bab7fd54b3ffaf948e..8c363b4c69eae285a30ff5d3f1a450952a86ca30 100644
>--- a/Source/WebKit/WebProcess/cocoa/UserMediaCaptureManager.cpp
>+++ b/Source/WebKit/WebProcess/cocoa/UserMediaCaptureManager.cpp
>@@ -56,10 +56,11 @@ static uint64_t nextSessionID()
> 
> class UserMediaCaptureManager::Source : public RealtimeMediaSource {
> public:
>-    Source(String&& sourceID, Type type, String&& name, String&& hashSalt, uint64_t id, UserMediaCaptureManager& manager)
>+    Source(String&& sourceID, Type type, CaptureDevice::DeviceType deviceType, String&& name, String&& hashSalt, uint64_t id, UserMediaCaptureManager& manager)
>         : RealtimeMediaSource(type, WTFMove(name), WTFMove(sourceID), WTFMove(hashSalt))
>         , m_id(id)
>         , m_manager(manager)
>+        , m_deviceType(deviceType)
>     {
>         if (type == Type::Audio)
>             m_ringBuffer = std::make_unique<CARingBuffer>(makeUniqueRef<SharedRingBufferStorage>(nullptr));
>@@ -178,6 +179,7 @@ private:
>     void startProducingData() final { m_manager.startProducingData(m_id); }
>     void stopProducingData() final { m_manager.stopProducingData(m_id); }
>     bool isCaptureSource() const final { return true; }
>+    CaptureDevice::DeviceType deviceType() const final { return m_deviceType; }
> 
>     // RealtimeMediaSource
>     void beginConfiguration() final { }
>@@ -197,6 +199,7 @@ private:
>     std::unique_ptr<CARingBuffer> m_ringBuffer;
> 
>     std::unique_ptr<ImageTransferSessionVT> m_imageTransferSession;
>+    CaptureDevice::DeviceType m_deviceType { CaptureDevice::DeviceType::Unknown };
> 
>     struct ApplyConstraintsCallback {
>         SuccessHandler successHandler;
>@@ -251,7 +254,7 @@ WebCore::CaptureSourceOrError UserMediaCaptureManager::createCaptureSource(const
>         return WTFMove(errorMessage);
> 
>     auto type = device.type() == CaptureDevice::DeviceType::Microphone ? WebCore::RealtimeMediaSource::Type::Audio : WebCore::RealtimeMediaSource::Type::Video;
>-    auto source = adoptRef(*new Source(String::number(id), type, String { settings.label() }, WTFMove(hashSalt), id, *this));
>+    auto source = adoptRef(*new Source(String::number(id), type, device.type(), String { settings.label() }, WTFMove(hashSalt), id, *this));
>     source->setSettings(WTFMove(settings));
>     m_sources.set(id, source.copyRef());
>     return WebCore::CaptureSourceOrError(WTFMove(source));
>diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
>index 1486382618788f2984e185d879169f8de3964695..84f08d5870b9463ba9d9af8869606b42d0f5905b 100644
>--- a/LayoutTests/ChangeLog
>+++ b/LayoutTests/ChangeLog
>@@ -1,3 +1,14 @@
>+2019-01-07  Eric Carlson  <eric.carlson@apple.com>
>+
>+        Define page media state flags for display capture.
>+        https://bugs.webkit.org/show_bug.cgi?id=193230
>+        <rdar://problem/47095142>
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        * fast/mediastream/get-display-media-muted-expected.txt: Added.
>+        * fast/mediastream/get-display-media-muted.html: Added.
>+
> 2019-01-07  Claudio Saavedra  <csaavedra@igalia.com>
> 
>         [WPE][GTK] Skip css-painting-api tests
>diff --git a/LayoutTests/fast/mediastream/get-display-media-muted-expected.txt b/LayoutTests/fast/mediastream/get-display-media-muted-expected.txt
>new file mode 100644
>index 0000000000000000000000000000000000000000..f9c632224de3488ad291b67fb2d0a5d3a70c0d3d
>--- /dev/null
>+++ b/LayoutTests/fast/mediastream/get-display-media-muted-expected.txt
>@@ -0,0 +1,3 @@
>+
>+PASS Mute video track during screen capture 
>+
>diff --git a/LayoutTests/fast/mediastream/get-display-media-muted.html b/LayoutTests/fast/mediastream/get-display-media-muted.html
>new file mode 100644
>index 0000000000000000000000000000000000000000..2a1b64c37c211dcfd0af76686e80c818dbe0f044
>--- /dev/null
>+++ b/LayoutTests/fast/mediastream/get-display-media-muted.html
>@@ -0,0 +1,71 @@
>+<!DOCTYPE html>
>+<html>
>+<head>
>+    <meta charset="utf-8">
>+    <title>Mute screen capture, make sure page state updates correctly.</title>
>+    <script src="../../resources/testharness.js"></script>
>+    <script src="../../resources/testharnessreport.js"></script>
>+    <script>
>+
>+    if (window.testRunner)
>+        testRunner.setUserMediaPermission(true);
>+
>+    function waitForPageStateChange(numberOfTries, originalState, resolve, reject)
>+    {
>+        let newState = internals.pageMediaState();
>+        if (newState != originalState) {
>+            resolve(newState);
>+            return;
>+        }
>+
>+        if (numberOfTries <= 0) {
>+            reject('Page state did not change in time.');
>+            return;
>+        }
>+
>+        setTimeout(() => { waitForPageStateChange(--numberOfTries, originalState, resolve, reject); }, 10);
>+    }
>+
>+    promise_test(async () => {
>+        stream = await navigator.mediaDevices.getDisplayMedia({ video: true });
>+        let track = stream.getVideoTracks()[0];
>+
>+        if (window.internals) {
>+            let pageMediaState = internals.pageMediaState();
>+            assert_false(pageMediaState.includes('HasMutedScreenCaptureDevice'), 'page state does not include HasMutedScreenCaptureDevice 1');
>+            assert_false(pageMediaState.includes('HasMutedVideoCaptureDevice'), 'page state does not include HasMutedVideoCaptureDevice');
>+            assert_false(pageMediaState.includes('HasMutedAudioCaptureDevice'), 'page state does not include HasMutedAudioCaptureDevice');
>+        }
>+
>+        return new Promise((resolve, reject) => {
>+            track.onunmute = () => reject("Got 'unmute' event unexpectedly!");
>+            track.onmute = () => {
>+                new Promise((innerResolve, innerReject) => {
>+                    waitForPageStateChange(10, internals.pageMediaState(), innerResolve, innerReject)
>+                }).then((pageMediaState) => {
>+
>+                    track.onunmute = (evt) => {
>+                        waitForPageStateChange(10, internals.pageMediaState(), resolve, reject);
>+                    }
>+
>+                    if (window.internals) {
>+                        assert_true(pageMediaState.includes('HasMutedScreenCaptureDevice'), 'page state includes HasMutedScreenCaptureDevice');
>+                        assert_false(pageMediaState.includes('HasActiveScreenCaptureDevice'), 'page state does not include HasActiveScreenCaptureDevice');
>+                        internals.setMediaStreamTrackMuted(track, false)
>+                    }
>+                })
>+            }
>+
>+            if (window.internals)
>+                internals.setMediaStreamTrackMuted(track, true);
>+            setTimeout(() => reject("Muted state did not change in .5 second"), 500);
>+        });
>+
>+    }, "Mute video track during screen capture");
>+
>+
>+    </script>
>+</head>
>+<body>
>+</body>
>+</html>

Actions: View | Formatted Diff | Diff

Attachments on bug 193230: 358577 | 358809