Changeset 256377 in webkit

Timestamp:

Feb 11, 2020 2:53:08 PM (4 years ago)

Author:

youenn@apple.com

Message:

Regression: RTCRtpSender.getCapabilities("video") returns null on iOS 13.4 (17E5223h)
​https://bugs.webkit.org/show_bug.cgi?id=207325
<rdar://problem/59224810>

Reviewed by Eric Carlson.

Source/WebCore:

Manually tested and covered by API test.

• platform/mediastream/libwebrtc/LibWebRTCProviderCocoa.cpp:

(WebCore::LibWebRTCProvider::webRTCAvailable):
Return true unconditionally on iOS since libwebrtc.dylib is always available.

Tools:

• TestWebKitAPI/Tests/WebKit/GetUserMedia.mm:

(TestWebKitAPI::TEST):
Add a test validating that RTCRtpSender.getCapabilities does not return null.

• TestWebKitAPI/Tests/WebKit/getUserMedia.html:

Location:

trunk

Files:

• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/platform/mediastream/libwebrtc/LibWebRTCProviderCocoa.cpp (modified) (1 diff)
• Tools/ChangeLog (modified) (1 diff)
• Tools/TestWebKitAPI/Tests/WebKit/GetUserMedia.mm (modified) (1 diff)
• Tools/TestWebKitAPI/Tests/WebKit/getUserMedia.html (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2020-02-11  Youenn Fablet  <youenn@apple.com>
+
+        Regression: RTCRtpSender.getCapabilities("video") returns null on iOS 13.4 (17E5223h)
+        https://bugs.webkit.org/show_bug.cgi?id=207325
+        <rdar://problem/59224810>
+
+        Reviewed by Eric Carlson.
+
+        Manually tested and covered by API test.
+
+        * platform/mediastream/libwebrtc/LibWebRTCProviderCocoa.cpp:
+        (WebCore::LibWebRTCProvider::webRTCAvailable):
+        Return true unconditionally on iOS since libwebrtc.dylib is always available.
+
 2020-02-11  Peng Liu  <peng.liu6@apple.com>
 

trunk/Source/WebCore/platform/mediastream/libwebrtc/LibWebRTCProviderCocoa.cpp

@@ -74 +74 @@
 bool LibWebRTCProvider::webRTCAvailable()
 {
+#if PLATFORM(IOS)
+    return true;
+#else
     return !isNullFunctionPointer(rtc::LogMessage::LogToDebug);
+#endif
 }
 

trunk/Tools/ChangeLog

@@ +1 @@
+2020-02-11  Youenn Fablet  <youenn@apple.com>
+
+        Regression: RTCRtpSender.getCapabilities("video") returns null on iOS 13.4 (17E5223h)
+        https://bugs.webkit.org/show_bug.cgi?id=207325
+        <rdar://problem/59224810>
+
+        Reviewed by Eric Carlson.
+
+        * TestWebKitAPI/Tests/WebKit/GetUserMedia.mm:
+        (TestWebKitAPI::TEST):
+        Add a test validating that RTCRtpSender.getCapabilities does not return null.
+        * TestWebKitAPI/Tests/WebKit/getUserMedia.html:
+
 2020-02-11  Wenson Hsieh  <wenson_hsieh@apple.com>
 

trunk/Tools/TestWebKitAPI/Tests/WebKit/GetUserMedia.mm

@@ -202 +202 @@
 }
 
+TEST(WebKit2, GetCapabilities)
+{
+    auto configuration = adoptNS([[WKWebViewConfiguration alloc] init]);
+    auto processPoolConfig = adoptNS([[_WKProcessPoolConfiguration alloc] init]);
+    auto preferences = [configuration preferences];
+    preferences._mediaCaptureRequiresSecureConnection = NO;
+    preferences._mediaDevicesEnabled = YES;
+    preferences._mockCaptureDevicesEnabled = YES;
+
+    auto messageHandler = adoptNS([[GUMMessageHandler alloc] init]);
+    [[configuration.get() userContentController] addScriptMessageHandler:messageHandler.get() name:@"gum"];
+
+    auto webView = [[TestWKWebView alloc] initWithFrame:CGRectMake(0, 0, 320, 500) configuration:configuration.get() processPoolConfiguration:processPoolConfig.get()];
+    auto delegate = adoptNS([[GetUserMediaCaptureUIDelegate alloc] init]);
+    webView.UIDelegate = delegate.get();
+
+    wasPrompted = false;
+
+    [webView loadTestPageNamed:@"getUserMedia"];
+    EXPECT_TRUE(waitUntilCaptureState(webView, _WKMediaCaptureStateActiveCamera));
+
+    TestWebKitAPI::Util::run(&wasPrompted);
+
+    done = false;
+    [webView stringByEvaluatingJavaScript:@"checkGetCapabilities()"];
+
+    TestWebKitAPI::Util::run(&done);
+}
+
 #if WK_HAVE_C_SPI
 TEST(WebKit, WebAudioAndGetUserMedia)

trunk/Tools/TestWebKitAPI/Tests/WebKit/getUserMedia.html

@@ -88 +88 @@
                 }, 5000);
             }
+
+            function checkGetCapabilities() {
+                window.webkit.messageHandlers.gum.postMessage(RTCRtpSender.getCapabilities('video') != null ? "PASS" : "FAIL");
+            }
+
         </script>
     <head>