Changeset 283291 in webkit

Timestamp:

Sep 29, 2021, 5:57:38 PM (5 years ago)

Author:

Alan Coon

Message:

Cherry-pick r283172. rdar://problem/83697127

REGRESSION (r283102): [ MacOS Debug ] TestWebKitAPI.WebKit2.CaptureIndicatorDelay is failing
​https://bugs.webkit.org/show_bug.cgi?id=230847
<rdar://problem/83577251>

Reviewed by Saam Barati.

As identified by Saam, the promise resolution callback is racing with the stop function.
To prevent this, we check in a loop whether the page has a stream and call stop when that is the case.

• TestWebKitAPI/Tests/WebKit/GetUserMedia.mm: (TestWebKitAPI::TEST):
• TestWebKitAPI/Tests/WebKit/getUserMedia.html:

git-svn-id: ​https://svn.webkit.org/repository/webkit/trunk@283172 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Location:

branches/safari-613.1.3-branch/Tools

Files:

• ChangeLog (modified) (1 diff)
• TestWebKitAPI/Tests/WebKit/GetUserMedia.mm (modified) (1 diff)

branches/safari-613.1.3-branch/Tools/ChangeLog

@@ +1 @@
+2021-09-29  Alan Coon  <alancoon@apple.com>
+
+        Cherry-pick r283172. rdar://problem/83697127
+
+    REGRESSION (r283102): [ MacOS Debug ] TestWebKitAPI.WebKit2.CaptureIndicatorDelay is failing
+    https://bugs.webkit.org/show_bug.cgi?id=230847
+    <rdar://problem/83577251>
+    
+    Reviewed by Saam Barati.
+    
+    As identified by Saam, the promise resolution callback is racing with the stop function.
+    To prevent this, we check in a loop whether the page has a stream and call stop when that is the case.
+    
+    * TestWebKitAPI/Tests/WebKit/GetUserMedia.mm:
+    (TestWebKitAPI::TEST):
+    * TestWebKitAPI/Tests/WebKit/getUserMedia.html:
+    
+    
+    git-svn-id: https://svn.webkit.org/repository/webkit/trunk@283172 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+    2021-09-28  Youenn Fablet  <youenn@apple.com>
+
+            REGRESSION (r283102): [ MacOS Debug ] TestWebKitAPI.WebKit2.CaptureIndicatorDelay is failing
+            https://bugs.webkit.org/show_bug.cgi?id=230847
+            <rdar://problem/83577251>
+
+            Reviewed by Saam Barati.
+
+            As identified by Saam, the promise resolution callback is racing with the stop function.
+            To prevent this, we check in a loop whether the page has a stream and call stop when that is the case.
+
+            * TestWebKitAPI/Tests/WebKit/GetUserMedia.mm:
+            (TestWebKitAPI::TEST):
+            * TestWebKitAPI/Tests/WebKit/getUserMedia.html:
+
 2021-09-25  Lauro Moura  <lmoura@igalia.com>
 

branches/safari-613.1.3-branch/Tools/TestWebKitAPI/Tests/WebKit/GetUserMedia.mm

@@ -394 +394 @@
     EXPECT_TRUE(waitUntilCaptureState(webView.get(), _WKMediaCaptureStateDeprecatedActiveCamera));
 
-    [delegate waitUntilPrompted];
+    int retryCount = 1000;
+    while (--retryCount && ![webView stringByEvaluatingJavaScript:@"haveStream()"].boolValue)
+        TestWebKitAPI::Util::spinRunLoop(10);
+    EXPECT_TRUE(!!retryCount);
 
     [webView stringByEvaluatingJavaScript:@"stop()"];