Title: [251341] branches/safari-608-branch/Source/WebKit
Revision
251341
Author
bshaf...@apple.com
Date
2019-10-20 10:33:05 -0700 (Sun, 20 Oct 2019)

Log Message

Cherry-pick r250751. rdar://problem/56280731

    Unreviewed, build fix after r250729

    * UIProcess/API/Cocoa/_WKWebAuthenticationPanel.mm:
    * UIProcess/API/Cocoa/_WKWebAuthenticationPanelInternal.h:

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

Modified Paths

Diff

Modified: branches/safari-608-branch/Source/WebKit/ChangeLog (251340 => 251341)


--- branches/safari-608-branch/Source/WebKit/ChangeLog	2019-10-20 17:33:02 UTC (rev 251340)
+++ branches/safari-608-branch/Source/WebKit/ChangeLog	2019-10-20 17:33:05 UTC (rev 251341)
@@ -1,5 +1,23 @@
 2019-10-15  Kocsen Chung  <kocsen_ch...@apple.com>
 
+        Cherry-pick r250751. rdar://problem/56280731
+
+    Unreviewed, build fix after r250729
+    
+    * UIProcess/API/Cocoa/_WKWebAuthenticationPanel.mm:
+    * UIProcess/API/Cocoa/_WKWebAuthenticationPanelInternal.h:
+    
+    git-svn-id: https://svn.webkit.org/repository/webkit/trunk@250751 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+    2019-10-04  Jiewen Tan  <jiewen_...@apple.com>
+
+            Unreviewed, build fix after r250729
+
+            * UIProcess/API/Cocoa/_WKWebAuthenticationPanel.mm:
+            * UIProcess/API/Cocoa/_WKWebAuthenticationPanelInternal.h:
+
+2019-10-15  Kocsen Chung  <kocsen_ch...@apple.com>
+
         Cherry-pick r250729. rdar://problem/56280731
 
     [WebAuthn] Implement _WKWebAuthenticationPanel SPI

Modified: branches/safari-608-branch/Source/WebKit/UIProcess/API/Cocoa/_WKWebAuthenticationPanel.mm (251340 => 251341)


--- branches/safari-608-branch/Source/WebKit/UIProcess/API/Cocoa/_WKWebAuthenticationPanel.mm	2019-10-20 17:33:02 UTC (rev 251340)
+++ branches/safari-608-branch/Source/WebKit/UIProcess/API/Cocoa/_WKWebAuthenticationPanel.mm	2019-10-20 17:33:05 UTC (rev 251341)
@@ -30,9 +30,13 @@
 #import <wtf/RetainPtr.h>
 
 @implementation _WKWebAuthenticationPanel {
+#if ENABLE(WEB_AUTHN)
     WeakPtr<WebKit::WebAuthenticationPanelClient> _client;
+#endif
 }
 
+#if ENABLE(WEB_AUTHN)
+
 - (void)dealloc
 {
     _panel->~WebAuthenticationPanel();
@@ -59,10 +63,13 @@
     _panel->setClient(WTFMove(client));
 }
 
+#endif // ENABLE(WEB_AUTHN)
+
 - (void)cancel
 {
 }
 
+#if ENABLE(WEB_AUTHN)
 #pragma mark WKObject protocol implementation
 
 - (API::Object&)_apiObject
@@ -69,5 +76,6 @@
 {
     return *_panel;
 }
+#endif
 
 @end

Modified: branches/safari-608-branch/Source/WebKit/UIProcess/API/Cocoa/_WKWebAuthenticationPanelInternal.h (251340 => 251341)


--- branches/safari-608-branch/Source/WebKit/UIProcess/API/Cocoa/_WKWebAuthenticationPanelInternal.h	2019-10-20 17:33:02 UTC (rev 251340)
+++ branches/safari-608-branch/Source/WebKit/UIProcess/API/Cocoa/_WKWebAuthenticationPanelInternal.h	2019-10-20 17:33:05 UTC (rev 251341)
@@ -27,6 +27,8 @@
 
 #import "_WKWebAuthenticationPanel.h"
 
+#if ENABLE(WEB_AUTHN)
+
 #import "APIWebAuthenticationPanel.h"
 #import "WKObject.h"
 
@@ -43,3 +45,5 @@
     API::ObjectStorage<API::WebAuthenticationPanel> _panel;
 }
 @end
+
+#endif // ENABLE(WEB_AUTHN)
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to