<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[281305] trunk</title>
</head>
<body>

<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt;  }
#msg dl a { font-weight: bold}
#msg dl a:link    { color:#fc3; }
#msg dl a:active  { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff  {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/281305">281305</a></dd>
<dt>Author</dt> <dd>philn@webkit.org</dd>
<dt>Date</dt> <dd>2021-08-20 03:16:50 -0700 (Fri, 20 Aug 2021)</dd>
</dl>

<h3>Log Message</h3>
<pre>REGRESSION(<a href="http://trac.webkit.org/projects/webkit/changeset/280732">r280732</a>) [GStreamer] fast/mediastream/getDisplayMedia-max-constraints1.html and other are failing
https://bugs.webkit.org/show_bug.cgi?id=228941

Reviewed by Youenn Fablet.

Source/WebCore:

The GStreamer mock display capture source is now wrapped in another RealtimeMediaSource in
order to avoid a spurious setSize() call from the RealtimeVideoSource constructor that would
then prevent the mock source to ensure its size matches the intrinsic size.

For the non-mock display capture source, we now ensure the size matches the intrinsic size
whenever the capture settings have changed.

* platform/mediastream/RealtimeVideoCaptureSource.h:
* platform/mediastream/gstreamer/GStreamerVideoCaptureSource.cpp:
(WebCore::GStreamerVideoCaptureSource::settingsDidChange):
* platform/mediastream/gstreamer/MockRealtimeVideoSourceGStreamer.cpp:
(WebCore::MockDisplayCaptureSourceGStreamer::create):
(WebCore::MockDisplayCaptureSourceGStreamer::capabilities):
(WebCore::MockDisplayCaptureSourceGStreamer::settings):
* platform/mediastream/gstreamer/MockRealtimeVideoSourceGStreamer.h:
* platform/mock/MockRealtimeMediaSourceCenter.cpp:
* platform/mock/MockRealtimeVideoSource.cpp:
(WebCore::MockRealtimeVideoSource::generateFrame):

LayoutTests:

* platform/glib/TestExpectations: Unflag tests now passing.</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsplatformglibTestExpectations">trunk/LayoutTests/platform/glib/TestExpectations</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreplatformmediastreamRealtimeVideoCaptureSourceh">trunk/Source/WebCore/platform/mediastream/RealtimeVideoCaptureSource.h</a></li>
<li><a href="#trunkSourceWebCoreplatformmediastreamgstreamerGStreamerVideoCaptureSourcecpp">trunk/Source/WebCore/platform/mediastream/gstreamer/GStreamerVideoCaptureSource.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformmediastreamgstreamerMockRealtimeVideoSourceGStreamercpp">trunk/Source/WebCore/platform/mediastream/gstreamer/MockRealtimeVideoSourceGStreamer.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformmediastreamgstreamerMockRealtimeVideoSourceGStreamerh">trunk/Source/WebCore/platform/mediastream/gstreamer/MockRealtimeVideoSourceGStreamer.h</a></li>
<li><a href="#trunkSourceWebCoreplatformmockMockRealtimeMediaSourceCentercpp">trunk/Source/WebCore/platform/mock/MockRealtimeMediaSourceCenter.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformmockMockRealtimeVideoSourcecpp">trunk/Source/WebCore/platform/mock/MockRealtimeVideoSource.cpp</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (281304 => 281305)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog      2021-08-20 09:22:42 UTC (rev 281304)
+++ trunk/LayoutTests/ChangeLog 2021-08-20 10:16:50 UTC (rev 281305)
</span><span class="lines">@@ -1,3 +1,12 @@
</span><ins>+2021-08-20  Philippe Normand  <pnormand@igalia.com>
+
+        REGRESSION(r280732) [GStreamer] fast/mediastream/getDisplayMedia-max-constraints1.html and other are failing
+        https://bugs.webkit.org/show_bug.cgi?id=228941
+
+        Reviewed by Youenn Fablet.
+
+        * platform/glib/TestExpectations: Unflag tests now passing.
+
</ins><span class="cx"> 2021-08-20  Youenn Fablet  <youenn@apple.com>
</span><span class="cx"> 
</span><span class="cx">         Add support for RTCPeerConnection.canTrickleIceCandidates
</span></span></pre></div>
<a id="trunkLayoutTestsplatformglibTestExpectations"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/glib/TestExpectations (281304 => 281305)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/glib/TestExpectations 2021-08-20 09:22:42 UTC (rev 281304)
+++ trunk/LayoutTests/platform/glib/TestExpectations    2021-08-20 10:16:50 UTC (rev 281305)
</span><span class="lines">@@ -626,9 +626,6 @@
</span><span class="cx"> webkit.org/b/227934 media/media-source/media-webm-vorbis-partial.html [ Failure ]
</span><span class="cx"> webkit.org/b/227934 media/media-source/media-webm-opus-partial.html [ Failure ]
</span><span class="cx"> 
</span><del>-webkit.org/b/228941 fast/mediastream/getDisplayMedia-max-constraints1.html [ Timeout Failure ]
-webkit.org/b/228941 fast/mediastream/getDisplayMedia-max-constraints2.html [ Timeout Failure ]
-
</del><span class="cx"> #////////////////////////////////////////////////////////////////////////////////////////
</span><span class="cx"> # End of GStreamer-related bugs
</span><span class="cx"> #////////////////////////////////////////////////////////////////////////////////////////
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (281304 => 281305)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog   2021-08-20 09:22:42 UTC (rev 281304)
+++ trunk/Source/WebCore/ChangeLog      2021-08-20 10:16:50 UTC (rev 281305)
</span><span class="lines">@@ -1,3 +1,29 @@
</span><ins>+2021-08-20  Philippe Normand  <pnormand@igalia.com>
+
+        REGRESSION(r280732) [GStreamer] fast/mediastream/getDisplayMedia-max-constraints1.html and other are failing
+        https://bugs.webkit.org/show_bug.cgi?id=228941
+
+        Reviewed by Youenn Fablet.
+
+        The GStreamer mock display capture source is now wrapped in another RealtimeMediaSource in
+        order to avoid a spurious setSize() call from the RealtimeVideoSource constructor that would
+        then prevent the mock source to ensure its size matches the intrinsic size.
+
+        For the non-mock display capture source, we now ensure the size matches the intrinsic size
+        whenever the capture settings have changed.
+
+        * platform/mediastream/RealtimeVideoCaptureSource.h:
+        * platform/mediastream/gstreamer/GStreamerVideoCaptureSource.cpp:
+        (WebCore::GStreamerVideoCaptureSource::settingsDidChange):
+        * platform/mediastream/gstreamer/MockRealtimeVideoSourceGStreamer.cpp:
+        (WebCore::MockDisplayCaptureSourceGStreamer::create):
+        (WebCore::MockDisplayCaptureSourceGStreamer::capabilities):
+        (WebCore::MockDisplayCaptureSourceGStreamer::settings):
+        * platform/mediastream/gstreamer/MockRealtimeVideoSourceGStreamer.h:
+        * platform/mock/MockRealtimeMediaSourceCenter.cpp:
+        * platform/mock/MockRealtimeVideoSource.cpp:
+        (WebCore::MockRealtimeVideoSource::generateFrame):
+
</ins><span class="cx"> 2021-08-20  Myles C. Maxfield  <mmaxfield@apple.com>
</span><span class="cx"> 
</span><span class="cx">         GlyphBuffer can become inconsistent with its backing string
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformmediastreamRealtimeVideoCaptureSourceh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/mediastream/RealtimeVideoCaptureSource.h (281304 => 281305)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/mediastream/RealtimeVideoCaptureSource.h   2021-08-20 09:22:42 UTC (rev 281304)
+++ trunk/Source/WebCore/platform/mediastream/RealtimeVideoCaptureSource.h      2021-08-20 10:16:50 UTC (rev 281305)
</span><span class="lines">@@ -51,6 +51,8 @@
</span><span class="cx">     double observedFrameRate() const { return m_observedFrameRate; }
</span><span class="cx">     Vector<VideoPresetData> presetsData();
</span><span class="cx"> 
</span><ins>+    void ensureIntrinsicSizeMaintainsAspectRatio();
+
</ins><span class="cx"> protected:
</span><span class="cx">     RealtimeVideoCaptureSource(String&& name, String&& id, String&& hashSalt);
</span><span class="cx"> 
</span><span class="lines">@@ -73,8 +75,6 @@
</span><span class="cx">     void dispatchMediaSampleToObservers(MediaSample&);
</span><span class="cx">     const Vector<IntSize>& standardVideoSizes();
</span><span class="cx"> 
</span><del>-    void ensureIntrinsicSizeMaintainsAspectRatio();
-
</del><span class="cx"> private:
</span><span class="cx">     struct CaptureSizeAndFrameRate {
</span><span class="cx">         RefPtr<VideoPreset> encodingPreset;
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformmediastreamgstreamerGStreamerVideoCaptureSourcecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/mediastream/gstreamer/GStreamerVideoCaptureSource.cpp (281304 => 281305)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/mediastream/gstreamer/GStreamerVideoCaptureSource.cpp      2021-08-20 09:22:42 UTC (rev 281304)
+++ trunk/Source/WebCore/platform/mediastream/gstreamer/GStreamerVideoCaptureSource.cpp 2021-08-20 10:16:50 UTC (rev 281305)
</span><span class="lines">@@ -153,8 +153,13 @@
</span><span class="cx"> 
</span><span class="cx"> void GStreamerVideoCaptureSource::settingsDidChange(OptionSet<RealtimeMediaSourceSettings::Flag> settings)
</span><span class="cx"> {
</span><del>-    if (settings.containsAny({ RealtimeMediaSourceSettings::Flag::Width, RealtimeMediaSourceSettings::Flag::Height }))
</del><ins>+    if (settings.containsAny({ RealtimeMediaSourceSettings::Flag::Width, RealtimeMediaSourceSettings::Flag::Height })) {
+        if (m_deviceType == CaptureDevice::DeviceType::Window || m_deviceType == CaptureDevice::DeviceType::Screen)
+            ensureIntrinsicSizeMaintainsAspectRatio();
+
</ins><span class="cx">         m_capturer->setSize(size().width(), size().height());
</span><ins>+    }
+
</ins><span class="cx">     if (settings.contains(RealtimeMediaSourceSettings::Flag::FrameRate))
</span><span class="cx">         m_capturer->setFrameRate(frameRate());
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformmediastreamgstreamerMockRealtimeVideoSourceGStreamercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/mediastream/gstreamer/MockRealtimeVideoSourceGStreamer.cpp (281304 => 281305)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/mediastream/gstreamer/MockRealtimeVideoSourceGStreamer.cpp 2021-08-20 09:22:42 UTC (rev 281304)
+++ trunk/Source/WebCore/platform/mediastream/gstreamer/MockRealtimeVideoSourceGStreamer.cpp    2021-08-20 10:16:50 UTC (rev 281305)
</span><span class="lines">@@ -50,22 +50,61 @@
</span><span class="cx">     return CaptureSourceOrError(RealtimeVideoSource::create(WTFMove(source)));
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-CaptureSourceOrError MockRealtimeVideoSourceGStreamer::createMockDisplayCaptureSource(String&& deviceID, String&& name, String&& hashSalt, const MediaConstraints* constraints)
</del><ins>+CaptureSourceOrError MockDisplayCaptureSourceGStreamer::create(const CaptureDevice& device, const MediaConstraints* constraints)
</ins><span class="cx"> {
</span><del>-    auto source = MockRealtimeVideoSourceGStreamer::createForMockDisplayCapturer(WTFMove(deviceID), WTFMove(name), WTFMove(hashSalt));
</del><ins>+    auto mockSource = adoptRef(*new MockRealtimeVideoSourceGStreamer(String { device.persistentId() }, String { device.label() }, { }));
+
</ins><span class="cx">     if (constraints) {
</span><del>-        if (auto error = source->applyConstraints(*constraints))
</del><ins>+        if (auto error = mockSource->applyConstraints(*constraints))
</ins><span class="cx">             return WTFMove(error.value().badConstraint);
</span><span class="cx">     }
</span><span class="cx"> 
</span><del>-    return CaptureSourceOrError(RealtimeVideoSource::create(WTFMove(source)));
</del><ins>+    auto source = adoptRef(*new MockDisplayCaptureSourceGStreamer(WTFMove(mockSource), device.type()));
+    return CaptureSourceOrError(WTFMove(source));
</ins><span class="cx"> }
</span><span class="cx"> 
</span><del>-Ref<MockRealtimeVideoSource> MockRealtimeVideoSourceGStreamer::createForMockDisplayCapturer(String&& deviceID, String&& name, String&& hashSalt)
</del><ins>+const RealtimeMediaSourceCapabilities& MockDisplayCaptureSourceGStreamer::capabilities()
</ins><span class="cx"> {
</span><del>-    return adoptRef(*new MockRealtimeVideoSourceGStreamer(WTFMove(deviceID), WTFMove(name), WTFMove(hashSalt)));
</del><ins>+    if (!m_capabilities) {
+        RealtimeMediaSourceCapabilities capabilities(settings().supportedConstraints());
+
+        // FIXME: what should these be?
+        capabilities.setWidth(CapabilityValueOrRange(1, 3840));
+        capabilities.setHeight(CapabilityValueOrRange(1, 2160));
+        capabilities.setFrameRate(CapabilityValueOrRange(.01, 30.0));
+
+        m_capabilities = WTFMove(capabilities);
+    }
+    return m_capabilities.value();
</ins><span class="cx"> }
</span><span class="cx"> 
</span><ins>+const RealtimeMediaSourceSettings& MockDisplayCaptureSourceGStreamer::settings()
+{
+    if (!m_currentSettings) {
+        RealtimeMediaSourceSettings settings;
+        settings.setFrameRate(frameRate());
+
+        m_source->ensureIntrinsicSizeMaintainsAspectRatio();
+        auto size = m_source->size();
+        settings.setWidth(size.width());
+        settings.setHeight(size.height());
+
+        settings.setLogicalSurface(false);
+
+        RealtimeMediaSourceSupportedConstraints supportedConstraints;
+        supportedConstraints.setSupportsFrameRate(true);
+        supportedConstraints.setSupportsWidth(true);
+        supportedConstraints.setSupportsHeight(true);
+        supportedConstraints.setSupportsDisplaySurface(true);
+        supportedConstraints.setSupportsLogicalSurface(true);
+
+        settings.setSupportedConstraints(supportedConstraints);
+
+        m_currentSettings = WTFMove(settings);
+    }
+    return m_currentSettings.value();
+}
+
</ins><span class="cx"> MockRealtimeVideoSourceGStreamer::MockRealtimeVideoSourceGStreamer(String&& deviceID, String&& name, String&& hashSalt)
</span><span class="cx">     : MockRealtimeVideoSource(WTFMove(deviceID), WTFMove(name), WTFMove(hashSalt))
</span><span class="cx"> {
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformmediastreamgstreamerMockRealtimeVideoSourceGStreamerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/mediastream/gstreamer/MockRealtimeVideoSourceGStreamer.h (281304 => 281305)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/mediastream/gstreamer/MockRealtimeVideoSourceGStreamer.h   2021-08-20 09:22:42 UTC (rev 281304)
+++ trunk/Source/WebCore/platform/mediastream/gstreamer/MockRealtimeVideoSourceGStreamer.h      2021-08-20 10:16:50 UTC (rev 281305)
</span><span class="lines">@@ -30,20 +30,46 @@
</span><span class="cx"> 
</span><span class="cx"> class MockRealtimeVideoSourceGStreamer final : public MockRealtimeVideoSource {
</span><span class="cx"> public:
</span><del>-    static Ref<MockRealtimeVideoSource> createForMockDisplayCapturer(String&& deviceID, String&& name, String&& hashSalt);
-
-    static CaptureSourceOrError createMockDisplayCaptureSource(String&& deviceID, String&& name, String&& hashSalt, const MediaConstraints*);
-
</del><ins>+    MockRealtimeVideoSourceGStreamer(String&& deviceID, String&& name, String&& hashSalt);
</ins><span class="cx">     ~MockRealtimeVideoSourceGStreamer() = default;
</span><span class="cx"> 
</span><span class="cx"> private:
</span><span class="cx">     friend class MockRealtimeVideoSource;
</span><del>-    MockRealtimeVideoSourceGStreamer(String&& deviceID, String&& name, String&& hashSalt);
</del><span class="cx"> 
</span><span class="cx">     void updateSampleBuffer() final;
</span><span class="cx">     bool canResizeVideoFrames() const final { return true; }
</span><span class="cx"> };
</span><span class="cx"> 
</span><ins>+class MockDisplayCaptureSourceGStreamer final : public RealtimeMediaSource {
+public:
+    static CaptureSourceOrError create(const CaptureDevice&, const MediaConstraints*);
+
+private:
+    MockDisplayCaptureSourceGStreamer(Ref<MockRealtimeVideoSourceGStreamer>&& source, CaptureDevice::DeviceType type)
+        : RealtimeMediaSource(Type::Video, source->name().isolatedCopy())
+        , m_source(WTFMove(source))
+        , m_type(type) { }
+
+    friend class MockRealtimeVideoSourceGStreamer;
+
+    void startProducingData() final { m_source->start(); }
+    void stopProducingData() final { m_source->stop(); }
+    void settingsDidChange(OptionSet<RealtimeMediaSourceSettings::Flag>) final { m_currentSettings = { }; }
+    bool isCaptureSource() const final { return true; }
+    const RealtimeMediaSourceCapabilities& capabilities() final;
+    const RealtimeMediaSourceSettings& settings() final;
+    CaptureDevice::DeviceType deviceType() const { return m_type; }
+
+#if !RELEASE_LOG_DISABLED
+    const char* logClassName() const final { return "MockDisplayCaptureSourceGStreamer"; }
+#endif
+
+    Ref<MockRealtimeVideoSourceGStreamer> m_source;
+    CaptureDevice::DeviceType m_type;
+    std::optional<RealtimeMediaSourceCapabilities> m_capabilities;
+    std::optional<RealtimeMediaSourceSettings> m_currentSettings;
+};
+
</ins><span class="cx"> } // namespace WebCore
</span><span class="cx"> 
</span><span class="cx"> #endif // ENABLE(MEDIA_STREAM) && USE(GSTREAMER)
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformmockMockRealtimeMediaSourceCentercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/mock/MockRealtimeMediaSourceCenter.cpp (281304 => 281305)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/mock/MockRealtimeMediaSourceCenter.cpp     2021-08-20 09:22:42 UTC (rev 281304)
+++ trunk/Source/WebCore/platform/mock/MockRealtimeMediaSourceCenter.cpp        2021-08-20 10:16:50 UTC (rev 281305)
</span><span class="lines">@@ -165,7 +165,7 @@
</span><span class="cx"> #if PLATFORM(MAC)
</span><span class="cx">             return DisplayCaptureSourceCocoa::create(UniqueRef<DisplayCaptureSourceCocoa::Capturer>(makeUniqueRef<MockDisplayCapturer>(device)), device, constraints);
</span><span class="cx"> #elif USE(GSTREAMER)
</span><del>-            return MockRealtimeVideoSourceGStreamer::createMockDisplayCaptureSource(String { device.persistentId() }, String { device.label() }, String { }, constraints);
</del><ins>+            return MockDisplayCaptureSourceGStreamer::create(device, constraints);
</ins><span class="cx"> #else
</span><span class="cx">             return MockRealtimeVideoSource::create(String { device.persistentId() }, String { device.label() }, String { }, constraints);
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformmockMockRealtimeVideoSourcecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/mock/MockRealtimeVideoSource.cpp (281304 => 281305)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/mock/MockRealtimeVideoSource.cpp   2021-08-20 09:22:42 UTC (rev 281304)
+++ trunk/Source/WebCore/platform/mock/MockRealtimeVideoSource.cpp      2021-08-20 10:16:50 UTC (rev 281305)
</span><span class="lines">@@ -432,9 +432,6 @@
</span><span class="cx">         m_delayUntil = MonotonicTime();
</span><span class="cx">     }
</span><span class="cx"> 
</span><del>-    if (mockDisplay() && !m_frameNumber)
-        ensureIntrinsicSizeMaintainsAspectRatio();
-
</del><span class="cx">     ImageBuffer* buffer = imageBuffer();
</span><span class="cx">     if (!buffer)
</span><span class="cx">         return;
</span></span></pre>
</div>
</div>

</body>
</html>