Title: [291642] branches/safari-613-branch/Source/WebKit
Revision
291642
Author
alanc...@apple.com
Date
2022-03-22 10:55:10 -0700 (Tue, 22 Mar 2022)

Log Message

Cherry-pick r290744. rdar://problem/81609371

    [WebAuthn] Ensure presenter gets dismissed on iOS
    https://bugs.webkit.org/show_bug.cgi?id=237336
    rdar://81609371

    Reviewed by Brent Fulgham.

    Always call [m_presenter dismissWithError] to ensure presenter gets dismissed.

    * UIProcess/WebAuthentication/Cocoa/AuthenticatorPresenterCoordinator.mm:
    (WebKit::AuthenticatorPresenterCoordinator::dimissPresenter):

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

Modified Paths

Diff

Modified: branches/safari-613-branch/Source/WebKit/ChangeLog (291641 => 291642)


--- branches/safari-613-branch/Source/WebKit/ChangeLog	2022-03-22 17:55:07 UTC (rev 291641)
+++ branches/safari-613-branch/Source/WebKit/ChangeLog	2022-03-22 17:55:10 UTC (rev 291642)
@@ -1,5 +1,36 @@
 2022-03-21  Alan Coon  <alanc...@apple.com>
 
+        Cherry-pick r290744. rdar://problem/81609371
+
+    [WebAuthn] Ensure presenter gets dismissed on iOS
+    https://bugs.webkit.org/show_bug.cgi?id=237336
+    rdar://81609371
+    
+    Reviewed by Brent Fulgham.
+    
+    Always call [m_presenter dismissWithError] to ensure presenter gets dismissed.
+    
+    * UIProcess/WebAuthentication/Cocoa/AuthenticatorPresenterCoordinator.mm:
+    (WebKit::AuthenticatorPresenterCoordinator::dimissPresenter):
+    
+    
+    git-svn-id: https://svn.webkit.org/repository/webkit/trunk@290744 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+    2022-03-02  J Pascoe  <j_pas...@apple.com>
+
+            [WebAuthn] Ensure presenter gets dismissed on iOS
+            https://bugs.webkit.org/show_bug.cgi?id=237336
+            rdar://81609371
+
+            Reviewed by Brent Fulgham.
+
+            Always call [m_presenter dismissWithError] to ensure presenter gets dismissed.
+
+            * UIProcess/WebAuthentication/Cocoa/AuthenticatorPresenterCoordinator.mm:
+            (WebKit::AuthenticatorPresenterCoordinator::dimissPresenter):
+
+2022-03-21  Alan Coon  <alanc...@apple.com>
+
         Cherry-pick r290676. rdar://problem/83831093
 
     [Cocoa] HLS stream currentTime sometimes jumps backwards

Modified: branches/safari-613-branch/Source/WebKit/UIProcess/WebAuthentication/Cocoa/AuthenticatorPresenterCoordinator.mm (291641 => 291642)


--- branches/safari-613-branch/Source/WebKit/UIProcess/WebAuthentication/Cocoa/AuthenticatorPresenterCoordinator.mm	2022-03-22 17:55:07 UTC (rev 291641)
+++ branches/safari-613-branch/Source/WebKit/UIProcess/WebAuthentication/Cocoa/AuthenticatorPresenterCoordinator.mm	2022-03-22 17:55:10 UTC (rev 291642)
@@ -244,7 +244,6 @@
         // FIXME(219767): Replace the ASCAppleIDCredential with the upcoming WebAuthn credentials one.
         // This is just a place holder to tell the UI that the ceremony succeeds.
         m_credentialRequestHandler(adoptNS([WebKit::allocASCAppleIDCredentialInstance() initWithUser:@"" identityToken:adoptNS([[NSData alloc] init]).get() state:nil]).get(), nil);
-        return;
     }
 
     [m_presenter dismissWithError:nil];
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to