Changeset 240830 in webkit

Timestamp:

Jan 31, 2019 4:45:19 PM (5 years ago)

Author:

youenn@apple.com

Message:

Add an API test to cover UIClient checkUserMediaPermissionForOrigin being nullptr
​https://bugs.webkit.org/show_bug.cgi?id=194106
<rdar://problem/47676333>

Reviewed by Ryosuke Niwa.

• TestWebKitAPI/Tests/WebKit/UserMedia.cpp:

(TestWebKitAPI::didFinishNavigation):
(TestWebKitAPI::TEST):

• TestWebKitAPI/Tests/WebKit/getUserMedia.html:

Location:

trunk/Tools

Files:

• ChangeLog (modified) (1 diff)
• TestWebKitAPI/Tests/WebKit/UserMedia.cpp (modified) (1 diff)
• TestWebKitAPI/Tests/WebKit/getUserMedia.html (modified) (1 diff)

trunk/Tools/ChangeLog

@@ +1 @@
+2019-01-31  Youenn Fablet  <youenn@apple.com>
+
+        Add an API test to cover UIClient checkUserMediaPermissionForOrigin being nullptr
+        https://bugs.webkit.org/show_bug.cgi?id=194106
+        <rdar://problem/47676333>
+
+        Reviewed by Ryosuke Niwa.
+
+        * TestWebKitAPI/Tests/WebKit/UserMedia.cpp:
+        (TestWebKitAPI::didFinishNavigation):
+        (TestWebKitAPI::TEST):
+        * TestWebKitAPI/Tests/WebKit/getUserMedia.html:
+
 2019-01-31  Chris Dumez  <cdumez@apple.com>
 

trunk/Tools/TestWebKitAPI/Tests/WebKit/UserMedia.cpp

@@ -158 +158 @@
 }
 
+static bool didReceiveMessage;
+static void didFinishNavigation(WKPageRef, WKNavigationRef, WKTypeRef, const void*)
+{
+    didReceiveMessage = true;
+}
+
+TEST(WebKit, EnumerateDevicesCrash)
+{
+    auto context = adoptWK(WKContextCreateWithConfiguration(nullptr));
+
+    WKRetainPtr<WKPageGroupRef> pageGroup(AdoptWK, WKPageGroupCreateWithIdentifier(Util::toWK("GetUserMedia").get()));
+    WKPreferencesRef preferences = WKPageGroupGetPreferences(pageGroup.get());
+    WKPreferencesSetMediaDevicesEnabled(preferences, true);
+    WKPreferencesSetFileAccessFromFileURLsAllowed(preferences, true);
+    WKPreferencesSetMediaCaptureRequiresSecureConnection(preferences, false);
+    WKPreferencesSetMockCaptureDevicesEnabled(preferences, true);
+
+    WKPageUIClientV6 uiClient;
+    // We want uiClient.checkUserMediaPermissionForOrigin to be null.
+    memset(&uiClient, 0, sizeof(uiClient));
+    uiClient.base.version = 6;
+
+    WKPageNavigationClientV3 loaderClient;
+    memset(&loaderClient, 0, sizeof(loaderClient));
+    loaderClient.base.version = 3;
+    loaderClient.didFinishNavigation = didFinishNavigation;
+
+    PlatformWebView webView(context.get(), pageGroup.get());
+    WKPageSetPageUIClient(webView.page(), &uiClient.base);
+    WKPageSetPageNavigationClient(webView.page(), &loaderClient.base);
+
+    // Load a page doing enumerateDevices.
+    didReceiveMessage = false;
+    auto url = adoptWK(Util::createURLForResource("getUserMedia", "html"));
+    WKPageLoadURL(webView.page(), url.get());
+    Util::run(&didReceiveMessage);
+}
+
 } // namespace TestWebKitAPI
 

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

@@ -6 +6 @@
             let stream = null;
 
-            function promptForCapture()
+            async function promptForCapture()
             {
-                navigator.mediaDevices.getUserMedia({ audio: false, video: true })
-                .then((s) => {
-                      stream = s;
-                      video.srcObject = stream;
-                      console.log("Got user media");
-                })
-                .catch((error) => console.log(`Failed with error: ${error}`));
+                try {
+                    await navigator.mediaDevices.enumerateDevices();
+                    const stream = await navigator.mediaDevices.getUserMedia({ audio: false, video: true })
+                    video.srcObject = stream;
+                    console.log("Got user media");
+                } catch(error) {
+                    console.log(`Failed with error: ${error}`);
+                }
             }