Diff
Modified: trunk/LayoutTests/ChangeLog (285397 => 285398)
--- trunk/LayoutTests/ChangeLog 2021-11-08 11:34:57 UTC (rev 285397)
+++ trunk/LayoutTests/ChangeLog 2021-11-08 12:48:52 UTC (rev 285398)
@@ -1,3 +1,12 @@
+2021-11-08 Philippe Normand <[email protected]>
+
+ [GStreamer] fast/mediastream/media-stream-video-track-interrupted.html is failing since added in 242093@main
+ https://bugs.webkit.org/show_bug.cgi?id=231057
+
+ Reviewed by Xabier Rodriguez-Calvar.
+
+ * platform/glib/TestExpectations: Unflag now-passing test.
+
2021-11-08 Antoine Quint <[email protected]>
[Web Animations] Add support for composite operations for software animations
Modified: trunk/LayoutTests/platform/glib/TestExpectations (285397 => 285398)
--- trunk/LayoutTests/platform/glib/TestExpectations 2021-11-08 11:34:57 UTC (rev 285397)
+++ trunk/LayoutTests/platform/glib/TestExpectations 2021-11-08 12:48:52 UTC (rev 285398)
@@ -676,7 +676,6 @@
webkit.org/b/230415 fast/mediastream/RTCPeerConnection-iceconnectionstatechange-event.html [ Timeout ]
webkit.org/b/79203 fast/mediastream/RTCRtpSender-replaceTrack.html [ Failure ]
webkit.org/b/187603 fast/mediastream/media-stream-track-source-failure.html [ Timeout Failure Pass ]
-webkit.org/b/231057 fast/mediastream/media-stream-video-track-interrupted.html [ Failure ]
webkit.org/b/223508 imported/w3c/web-platform-tests/mediacapture-streams/MediaStream-MediaElement-srcObject.https.html [ Failure Pass ]
Modified: trunk/Source/WebKit/ChangeLog (285397 => 285398)
--- trunk/Source/WebKit/ChangeLog 2021-11-08 11:34:57 UTC (rev 285397)
+++ trunk/Source/WebKit/ChangeLog 2021-11-08 12:48:52 UTC (rev 285398)
@@ -1,3 +1,22 @@
+2021-11-08 Philippe Normand <[email protected]>
+
+ [GStreamer] fast/mediastream/media-stream-video-track-interrupted.html is failing since added in 242093@main
+ https://bugs.webkit.org/show_bug.cgi?id=231057
+
+ Reviewed by Xabier Rodriguez-Calvar.
+
+ Wire up mock camera interruption IPC support in WPE/GTK.
+
+ * UIProcess/API/C/WKPage.cpp:
+ (WKPageSetMockCameraIsInterrupted):
+ * UIProcess/WebPageProxy.cpp:
+ (WebKit::WebPageProxy::setMockCameraIsInterrupted):
+ * UIProcess/WebPageProxy.h:
+ * WebProcess/WebPage/WebPage.cpp:
+ (WebKit::WebPage::setMockCameraIsInterrupted):
+ * WebProcess/WebPage/WebPage.h:
+ * WebProcess/WebPage/WebPage.messages.in:
+
2021-11-06 Simon Fraser <[email protected]>
WheelEventDeltaFilter::shouldApplyFilteringForEvent can be a static function
Modified: trunk/Source/WebKit/UIProcess/API/C/WKPage.cpp (285397 => 285398)
--- trunk/Source/WebKit/UIProcess/API/C/WKPage.cpp 2021-11-08 11:34:57 UTC (rev 285397)
+++ trunk/Source/WebKit/UIProcess/API/C/WKPage.cpp 2021-11-08 12:48:52 UTC (rev 285398)
@@ -3134,6 +3134,9 @@
auto& gpuProcess = toImpl(pageRef)->process().processPool().ensureGPUProcess();
gpuProcess.setMockCameraIsInterrupted(isInterrupted);
#endif
+#if ENABLE(MEDIA_STREAM) && USE(GSTREAMER)
+ toImpl(pageRef)->setMockCameraIsInterrupted(isInterrupted);
+#endif
}
void WKPageLoadedSubresourceDomains(WKPageRef pageRef, WKPageLoadedSubresourceDomainsFunction callback, void* callbackContext)
Modified: trunk/Source/WebKit/UIProcess/WebPageProxy.cpp (285397 => 285398)
--- trunk/Source/WebKit/UIProcess/WebPageProxy.cpp 2021-11-08 11:34:57 UTC (rev 285397)
+++ trunk/Source/WebKit/UIProcess/WebPageProxy.cpp 2021-11-08 12:48:52 UTC (rev 285398)
@@ -10678,6 +10678,13 @@
#endif
}
+#if ENABLE(MEDIA_STREAM) && USE(GSTREAMER)
+void WebPageProxy::setMockCameraIsInterrupted(bool isInterrupted)
+{
+ send(Messages::WebPage::SetMockCameraIsInterrupted(isInterrupted));
+}
+#endif
+
#if ENABLE(INTELLIGENT_TRACKING_PREVENTION)
void WebPageProxy::getLoadedSubresourceDomains(CompletionHandler<void(Vector<RegistrableDomain>&&)>&& completionHandler)
{
Modified: trunk/Source/WebKit/UIProcess/WebPageProxy.h (285397 => 285398)
--- trunk/Source/WebKit/UIProcess/WebPageProxy.h 2021-11-08 11:34:57 UTC (rev 285397)
+++ trunk/Source/WebKit/UIProcess/WebPageProxy.h 2021-11-08 12:48:52 UTC (rev 285398)
@@ -1838,6 +1838,10 @@
void setOrientationForMediaCapture(uint64_t);
+#if ENABLE(MEDIA_STREAM) && USE(GSTREAMER)
+ void setMockCameraIsInterrupted(bool);
+#endif
+
bool isHandlingPreventableTouchStart() const { return m_handlingPreventableTouchStartCount; }
bool isHandlingPreventableTouchEnd() const { return m_handlingPreventableTouchEndCount; }
Modified: trunk/Source/WebKit/WebProcess/WebPage/WebPage.cpp (285397 => 285398)
--- trunk/Source/WebKit/WebProcess/WebPage/WebPage.cpp 2021-11-08 11:34:57 UTC (rev 285397)
+++ trunk/Source/WebKit/WebProcess/WebPage/WebPage.cpp 2021-11-08 12:48:52 UTC (rev 285398)
@@ -347,6 +347,10 @@
#include <WebCore/MediaPlayerRequestInstallMissingPluginsCallback.h>
#endif
+#if ENABLE(MEDIA_STREAM) && USE(GSTREAMER)
+#include <WebCore/MockRealtimeMediaSourceCenter.h>
+#endif
+
#if ENABLE(WEB_AUTHN)
#include "WebAuthenticatorCoordinator.h"
#include <WebCore/AuthenticatorCoordinator.h>
@@ -4789,6 +4793,11 @@
document.orientationChanged(rotation);
});
}
+
+void WebPage::setMockCameraIsInterrupted(bool isInterrupted)
+{
+ MockRealtimeMediaSourceCenter::setMockCameraIsInterrupted(isInterrupted);
+}
#endif // USE(GSTREAMER)
#endif // ENABLE(MEDIA_STREAM)
Modified: trunk/Source/WebKit/WebProcess/WebPage/WebPage.h (285397 => 285398)
--- trunk/Source/WebKit/WebProcess/WebPage/WebPage.h 2021-11-08 11:34:57 UTC (rev 285397)
+++ trunk/Source/WebKit/WebProcess/WebPage/WebPage.h 2021-11-08 12:48:52 UTC (rev 285398)
@@ -1226,6 +1226,7 @@
#endif
#if ENABLE(MEDIA_STREAM) && USE(GSTREAMER)
void setOrientationForMediaCapture(uint64_t rotation);
+ void setMockCameraIsInterrupted(bool);
#endif
void addUserScript(String&& source, InjectedBundleScriptWorld&, WebCore::UserContentInjectedFrames, WebCore::UserScriptInjectionTime);
Modified: trunk/Source/WebKit/WebProcess/WebPage/WebPage.messages.in (285397 => 285398)
--- trunk/Source/WebKit/WebProcess/WebPage/WebPage.messages.in 2021-11-08 11:34:57 UTC (rev 285397)
+++ trunk/Source/WebKit/WebProcess/WebPage/WebPage.messages.in 2021-11-08 12:48:52 UTC (rev 285398)
@@ -386,6 +386,7 @@
CaptureDevicesChanged()
#if USE(GSTREAMER)
SetOrientationForMediaCapture(int rotation)
+ SetMockCameraIsInterrupted(bool isInterrupted)
#endif
#endif
